2026-03-11 08:54:49 +00:00
484 changed files with 6411 additions and 43869 deletions
--- a/.do/deploy.template.yaml
+++ b/.do/deploy.template.yaml
@ -0,0 +1,43 @@
+spec:
+  name: bewcloud
+  envs:
+    - key: BASE_URL
+      scope: RUN_AND_BUILD_TIME
+      value: ${app.PUBLIC_URL}
+  services:
+    - name: app
+      dockerfile_path: Dockerfile
+      git:
+        branch: main
+      http_port: 8000
+      instance_count: 1
+      instance_size_slug: basic-xs
+      routes:
+        - path: /
+      health_check:
+        http_path: /
+      source_dir: /
+      envs:
+        - key: POSTGRESQL_HOST
+          scope: RUN_AND_BUILD_TIME
+          value: ${db.HOSTNAME}
+        - key: POSTGRESQL_USER
+          scope: RUN_AND_BUILD_TIME
+          value: ${db.USERNAME}
+        - key: POSTGRESQL_PASSWORD
+          scope: RUN_AND_BUILD_TIME
+          value: ${db.PASSWORD}
+        - key: POSTGRESQL_DBNAME
+          scope: RUN_AND_BUILD_TIME
+          value: ${db.DATABASE}
+        - key: POSTGRESQL_PORT
+          scope: RUN_AND_BUILD_TIME
+          value: ${db.PORT}
+        - key: POSTGRESQL_CAFILE
+          scope: RUN_AND_BUILD_TIME
+          value: ''
+  databases:
+    - name: db
+      engine: PG
+      production: false
+      version: '15'
--- a/.dockerignore
+++ b/.dockerignore
@ -1,11 +1,14 @@
+.do
 .github
 .git
 .gitignore
 docker-compose*
 Dockerfile
+render.yaml
 LICENSE
 README.md
 .env.sample
 node_modules
+_fresh
 data-files
 bewcloud.config.sample.ts
--- a/.dvmrc
+++ b/.dvmrc
@ -1 +1 @@
-2.6.10
+2.3.3
--- a/.env.sample
+++ b/.env.sample
@ -16,5 +16,4 @@ MFA_SALT="fake" # optional, if you want to enable multi-factor authentication
 OIDC_CLIENT_ID="fake" # optional, if you want to enable SSO (Single Sign-On)
 OIDC_CLIENT_SECRET="fake" # optional, if you want to enable SSO (Single Sign-On)

-#SMTP_USERNAME=""  # optional, if you want to use signup email verification or multi-factor with an email service requiring authentication
-#SMTP_PASSWORD=""  # optional, if you want to use signup email verification or multi-factor with an email service requiring authentication
+BREVO_API_KEY="fake" # optional, if you want to enable signup email verification
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,7 +1,7 @@
 github: [bewcloud, BrunoBernardino]
 custom:
  [
-    'https://payment-links.mollie.com/payment/wUS9dvewvjEPvseZVHEi5',
+    'https://donate.stripe.com/bIYeWBbw00Ape5iaFi',
    'https://paypal.me/brunobernardino',
    'https://gist.github.com/BrunoBernardino/ff5b54c13dd96ac7f9fee6fbfd825b09',
  ]
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@ -22,7 +22,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Log in to the Container registry
        uses: docker/login-action@v3
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@ -10,7 +10,7 @@ jobs:
  deploy:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Configure SSH
        run: |
          mkdir -p ~/.ssh/
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -6,7 +6,7 @@ jobs:
  test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - uses: denoland/setup-deno@v2
        with:
          deno-version-file: .dvmrc
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,6 @@
+# Fresh build directory
+_fresh/
+
 # npm dependencies
 node_modules/

@ -12,6 +15,3 @@ data-files/

 # Config
 bewcloud.config.ts
-
-# Radicale files
-data-radicale/
--- a/18
+++ b/18
@ -1,25 +1,25 @@
-FROM denoland/deno:ubuntu-2.6.10
+FROM denoland/deno:ubuntu-2.3.3

 EXPOSE 8000

-RUN apt-get update && apt-get install -y make zip coreutils
+RUN apt-get update && apt-get install -y make

 WORKDIR /app

+# These steps will be re-run upon each file change in your working directory:
 ADD . /app

-# Prepare for any npm modules required "on the fly"
-RUN mkdir -p /app/node_modules/.deno
+RUN rm -fr node_modules _fresh 

-RUN chown -R deno:deno /app
+# Build fresh
+RUN deno task build
+
+RUN chown -R deno:deno /app /deno-dir

 # Prefer not to run as root.
 USER deno

-# Build frontend components and CSS
-RUN deno task build
-
 # Compile the main app so that it doesn't need to be compiled each startup/entry.
 RUN deno cache --reload main.ts

-CMD ["task", "preview"]
+CMD ["run", "--allow-all", "main.ts"]
--- a/FAQ.md
+++ b/FAQ.md
@ -1,221 +0,0 @@
-# bewCloud - FAQ (Frequently Asked Questions)
-
-## How does Contacts/CardDav and Calendar/CalDav work?
-
-CalDav/CardDav is now available since [v2.3.0](https://github.com/bewcloud/bewcloud/releases/tag/v2.3.0), using [Radicale](https://radicale.org/v3.html) via Docker, which is already _very_ efficient (and battle-tested). The "Contacts" client for CardDav is available since [v2.4.0](https://github.com/bewcloud/bewcloud/releases/tag/v2.3.0) and the "Calendar" client for CalDav is available since [v2.5.0](https://github.com/bewcloud/bewcloud/releases/tag/v2.5.0). [Check this tag/release for custom-made server code where it was all mostly working, except for many edge cases, if you're interested](https://github.com/bewcloud/bewcloud/releases/tag/v0.0.1-self-made-carddav-caldav).
-
-In order to share a calendar, you can either have a shared user, or you can symlink the calendar to the user's own calendar (simply `ln -s /<absolute-path-to-data-radicale>/collections/collection-root/<owner-user-id>/<calendar-to-share> /<absolute-path-to-data-radicale>/collections/collection-root/<user-id-to-share-with>/`).
-
-> [!NOTE]
-> If you're running radicale with docker, the symlink needs to point to the container's directory, usually starting with `/data` if you didn't change the `radicale-config/config`, otherwise the container will fail to load the linked directory.
-
-## How does private file sharing work?
-
-Public file sharing is now possible since [v2.2.0](https://github.com/bewcloud/bewcloud/releases/tag/v2.2.0). [Check this PR for advanced sharing with internal and external users, with read and write access that was being done and almost working, if you're interested](https://github.com/bewcloud/bewcloud/pull/4). I ditched all that complexity for simply using [symlinks](https://en.wikipedia.org/wiki/Symbolic_link) for internal sharing, as it served my use case (I have multiple data backups and trust the people I provide accounts to, with the symlinks).
-
-You can simply `ln -s /<absolute-path-to-data-files>/<owner-user-id>/<directory-to-share> /<absolute-path-to-data-files>/<user-id-to-share-with>/` to create a shared directory between two users, and the same directory can have different names, now.
-
-> [!NOTE]
-> If you're running the app with docker, the symlink needs to point to the container's directory, usually starting with `/app` if you didn't change the `Dockerfile`, otherwise the container will fail to load the linked directory.
-
-## How can I use .env for configuration?
-
-During [v1](https://github.com/bewcloud/bewcloud/releases/tag/v1.0.0), bewCloud was entirely configured with a `.env` file, but since [v2](https://github.com/bewcloud/bewcloud/releases/tag/v2.0.0) it was swapped to being used exclusively for "secrets", and having a more robust `bewcloud.config.ts` file for configuration. While it's unlikely `.env`-only configuration will be supported again in the future, the advantage of a `bewcloud.config.ts` file is that it's more dynamic and powerful, which means you can "hack" your way into using a `.env` file for configuration, like how it was suggested [in this comment](https://github.com/bewcloud/bewcloud/issues/90#issuecomment-3450344972). It's copied below for reference, and it's a bit outdated, but should serve as a good starting point, and you can make a PR to update it:
-
-> [!NOTE]
-> This is not recommended and should only be done if you know what you're doing.
-
-<details>
-<summary>
-bewcloud.config.ts
-</summary>
-
-```ts
-import { Config, OptionalApp, PartialDeep } from './lib/types.ts';
-
-// Check the Config type for all the possible options and instructions.
-function requireValue<T>(value: T | undefined, key: string): T {
-  if (value === undefined || value === '') {
-    throw new Error(`Environment variable ${key} is required but not set`);
-  }
-  return value;
-}
-
-function getEnvString(key: string, defaultValue: string): string {
-  return Deno.env.get(key) ?? defaultValue;
-}
-
-function getEnvBoolean(key: string, defaultValue: boolean): boolean {
-  const value = Deno.env.get(key);
-  if (value === undefined) {
-    return defaultValue;
-  }
-  return value.toLowerCase() === 'true' || value === '1';
-}
-
-function getEnvNumber(key: string, defaultValue: number): number {
-  const value = Deno.env.get(key);
-  if (value === undefined) {
-    return defaultValue;
-  }
-  const parsed = parseInt(value, 10);
-  return isNaN(parsed) ? defaultValue : parsed;
-}
-
-function getEnvStringArray(key: string, defaultValue: string[]): string[] {
-  const value = Deno.env.get(key);
-  if (value === undefined) {
-    return defaultValue;
-  }
-  return value
-    .split(',')
-    .map((item) => item.trim())
-    .filter((item) => item.length > 0);
-}
-const config: PartialDeep<Config> = {
-  auth: {
-    baseUrl: getEnvString('BEWCLOUD_AUTH_BASE_URL', 'http://localhost:8000'),
-    allowSignups: getEnvBoolean('BEWCLOUD_AUTH_ALLOW_SIGNUPS', false),
-    enableEmailVerification: getEnvBoolean(
-      'BEWCLOUD_AUTH_ENABLE_EMAIL_VERIFICATION',
-      false,
-    ),
-    enableForeverSignup: getEnvBoolean(
-      'BEWCLOUD_AUTH_ENABLE_FOREVER_SIGNUP',
-      true,
-    ),
-    enableMultiFactor: getEnvBoolean(
-      'BEWCLOUD_AUTH_ENABLE_MULTI_FACTOR',
-      false,
-    ),
-    allowedCookieDomains: getEnvStringArray(
-      'BEWCLOUD_AUTH_ALLOWED_COOKIE_DOMAINS',
-      [],
-    ),
-    skipCookieDomainSecurity: getEnvBoolean(
-      'BEWCLOUD_AUTH_SKIP_COOKIE_DOMAIN_SECURITY',
-      false,
-    ),
-    enableSingleSignOn: getEnvBoolean(
-      'BEWCLOUD_AUTH_ENABLE_SINGLE_SIGN_ON',
-      false,
-    ),
-    singleSignOnUrl: getEnvString('BEWCLOUD_AUTH_SINGLE_SIGN_ON_URL', ''),
-    singleSignOnEmailAttribute: getEnvString(
-      'BEWCLOUD_AUTH_SINGLE_SIGN_ON_EMAIL_ATTRIBUTE',
-      'email',
-    ),
-    singleSignOnScopes: getEnvStringArray(
-      'BEWCLOUD_AUTH_SINGLE_SIGN_ON_SCOPES',
-      ['openid', 'email'],
-    ),
-  },
-  files: {
-    rootPath: getEnvString('BEWCLOUD_FILES_ROOT_PATH', 'data-files'),
-    allowPublicSharing: getEnvBoolean(
-      'BEWCLOUD_FILES_ALLOW_PUBLIC_SHARING',
-      false,
-    ),
-  },
-  core: {
-    enabledApps: getEnvStringArray('BEWCLOUD_CORE_ENABLED_APPS', [
-      'dashboard',
-      'files',
-      'news',
-      'notes',
-      'photos',
-      'expenses',
-    ]) as OptionalApp[],
-  },
-  visuals: {
-    title: getEnvString('BEWCLOUD_VISUALS_TITLE', ''),
-    description: getEnvString('BEWCLOUD_VISUALS_DESCRIPTION', ''),
-    helpEmail: getEnvString('BEWCLOUD_VISUALS_HELP_EMAIL', 'help@bewcloud.com'),
-  },
-  email: {
-    from: getEnvString('BEWCLOUD_EMAIL_FROM', 'help@bewcloud.com'),
-    host: getEnvString('BEWCLOUD_EMAIL_HOST', 'localhost'),
-    port: getEnvNumber('BEWCLOUD_EMAIL_PORT', 465),
-  },
-  contacts: {
-    enableCardDavServer: getEnvBoolean(
-      'BEWCLOUD_CONTACTS_ENABLE_CARDDAV_SERVER',
-      true,
-    ),
-    cardDavUrl: getEnvString(
-      'BEWCLOUD_CONTACTS_CARDDAV_URL',
-      'http://127.0.0.1:5232',
-    ),
-  },
-  calendar: {
-    enableCalDavServer: getEnvBoolean(
-      'BEWCLOUD_CALENDAR_ENABLE_CALDAV_SERVER',
-      true,
-    ),
-    calDavUrl: getEnvString(
-      'BEWCLOUD_CALENDAR_CALDAV_URL',
-      'http://127.0.0.1:5232',
-    ),
-  },
-};
-
-export default config;
-```
-
-</details>
-
-Append the following to your `.env` file
-
-<details>
-<summary> .env </summary>
-
-```env
-# Auth Configuration
-BEWCLOUD_AUTH_BASE_URL=http://localhost:8000
-BEWCLOUD_AUTH_ALLOW_SIGNUPS=false
-BEWCLOUD_AUTH_ENABLE_EMAIL_VERIFICATION=false
-BEWCLOUD_AUTH_ENABLE_FOREVER_SIGNUP=true
-BEWCLOUD_AUTH_ENABLE_MULTI_FACTOR=false
-# Comma-separated list of allowed cookie domains
-BEWCLOUD_AUTH_ALLOWED_COOKIE_DOMAINS=
-BEWCLOUD_AUTH_SKIP_COOKIE_DOMAIN_SECURITY=false
-
-# Single Sign-On Configuration
-BEWCLOUD_AUTH_ENABLE_SINGLE_SIGN_ON=false
-BEWCLOUD_AUTH_SINGLE_SIGN_ON_URL=
-BEWCLOUD_AUTH_SINGLE_SIGN_ON_EMAIL_ATTRIBUTE=email
-# Comma-separated list of scopes
-BEWCLOUD_AUTH_SINGLE_SIGN_ON_SCOPES=openid,email
-
-# Files Configuration
-BEWCLOUD_FILES_ROOT_PATH=data-files
-BEWCLOUD_FILES_ALLOW_PUBLIC_SHARING=false
-
-# Core Configuration
-# Comma-separated list of enabled apps (dashboard and files cannot be disabled)
-BEWCLOUD_CORE_ENABLED_APPS=news,notes,photos,expenses,contacts,calendar
-
-# Visuals Configuration
-BEWCLOUD_VISUALS_TITLE=
-BEWCLOUD_VISUALS_DESCRIPTION=
-BEWCLOUD_VISUALS_HELP_EMAIL=help@bewcloud.com
-
-# Email/SMTP Configuration
-BEWCLOUD_EMAIL_FROM=help@bewcloud.com
-BEWCLOUD_EMAIL_HOST=localhost
-BEWCLOUD_EMAIL_PORT=465
-
-# Contacts Configuration
-BEWCLOUD_CONTACTS_ENABLE_CARDDAV_SERVER=true
-BEWCLOUD_CONTACTS_CARDDAV_URL=http://127.0.0.1:5232
-
-# Calendar Configuration
-BEWCLOUD_CALENDAR_ENABLE_CALDAV_SERVER=true
-BEWCLOUD_CALENDAR_CALDAV_URL=http://127.0.0.1:5232
-```
-
-</details>
-
-## Wasn't this made with Fresh?
-
-Up until [v4.0.0](https://github.com/bewcloud/bewcloud/releases/tag/v4.0.0), bewCloud was made with [Fresh](https://fresh.deno.dev/), but as per [#141](https://github.com/bewcloud/bewcloud/issues/141) it has since been rewritten in standard Deno to use a more web-standards-based backend, easier to maintain and extend, without requiring breaking updates.
--- a/38
+++ b/38
@ -1,5 +1,3 @@
-SHELL := /bin/bash
-
 .PHONY: start
 start:
 	deno task start
@ -15,40 +13,16 @@ test:

 .PHONY: build
 build:
-	make download-frontend-imports
-	make build-babel
-	make build-tailwind
-
-.PHONY: download-frontend-imports
-download-frontend-imports:
-	deno task download-frontend-imports
-
-.PHONY: build-babel
-build-babel:
-	deno run --allow-env --allow-ffi --allow-sys --allow-read --allow-write=public/components npm:@babel/cli@7.28.6/babel ./components --out-dir ./public/components --extensions ".ts,.tsx"
-
-.PHONY: watch-babel
-watch-babel:
-	deno run --allow-env --allow-ffi --allow-sys --allow-read --allow-write=public/components npm:@babel/cli@7.28.6/babel ./components --out-dir ./public/components --extensions ".ts,.tsx" --watch
+	deno task build

 .PHONY: migrate-db
 migrate-db:
-	deno task migrate-db
+	deno run --allow-net --allow-read --allow-env migrate-db.ts
+
+.PHONY: crons/cleanup
+crons/cleanup:
+	deno run --allow-net --allow-read --allow-env crons/cleanup.ts

 .PHONY: exec-db
 exec-db:
 	docker exec -it -u postgres $(shell basename $(CURDIR))-postgresql-1 psql
-
-.PHONY: build-tailwind
-build-tailwind:
-	deno install --allow-scripts npm:tailwindcss@4.2.0 npm:@tailwindcss/cli@4.2.0
-	deno run --allow-env --allow-read --allow-sys --allow-ffi --vendor --unstable-detect-cjs --allow-write=public/css,/var/folders --allow-scripts npm:@tailwindcss/cli@4.2.0 -i ./public/css/tailwind-input.css -o ./public/css/tailwind.css
-
-.PHONY: watch-tailwind
-watch-tailwind:
-	deno install --allow-scripts npm:tailwindcss@4.2.0 npm:@tailwindcss/cli@4.2.0
-	deno run --allow-env --allow-read --allow-sys --allow-ffi --vendor --unstable-detect-cjs --allow-write=public/css,/var/folders --allow-scripts npm:@tailwindcss/cli@4.2.0 -w -i ./public/css/tailwind-input.css -o ./public/css/tailwind.css
-
-.PHONY: preview
-preview:
-	deno task preview
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 [![](https://github.com/bewcloud/bewcloud/workflows/Run%20Tests/badge.svg)](https://github.com/bewcloud/bewcloud/actions?workflow=Run+Tests)

-This is the [bewCloud app](https://bewcloud.com) built with [Deno](https://deno.land/) and deployed using [docker compose](https://docs.docker.com/compose/).
+This is the [bewCloud app](https://bewcloud.com) built using [Fresh](https://fresh.deno.dev) and deployed using [docker compose](https://docs.docker.com/compose/).

 If you're looking for the desktop sync app, it's at [`bewcloud-desktop`](https://github.com/bewcloud/bewcloud-desktop).

@ -10,49 +10,28 @@ If you're looking for the mobile app, it's at [`bewcloud-mobile`](https://github

 ## Self-host it!

-[![Buy managed cloud (1 year)](https://img.shields.io/badge/Buy%20managed%20cloud%20(1%20year)-51a4fb?style=for-the-badge)](https://payment-links.mollie.com/payment/AiEHa5EpD6wkZN5r6Vs3c)
+[![Deploy to DigitalOcean](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/bewcloud/bewcloud)

-Or, to run on your own machine, start with these commands:
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/bewcloud/bewcloud)
+
+Or on your own machine:
+
+Download/copy [`docker-compose.yml`](/docker-compose.yml), [`.env.sample`](/.env.sample) as `.env`, and [`bewcloud.config.sample.ts`](/bewcloud.config.sample.ts) as `bewcloud.config.ts`.

 ```sh
-mkdir data-files data-radicale radicale-config # local directories for storing user-uploaded files, radicale data, and radicale config (these last two are necessary only if you're using CalDav/CardDav/Contacts)
+$ mkdir data-files #  local directory for storing user-uploaded files
+$ sudo chown -R 1993:1993 data-files # solves permission-related issues in the container with uploading files
+$ docker compose up -d # makes the app available at http://localhost:8000
+$ docker compose run --rm website bash -c "cd /app && make migrate-db" # initializes/updates the database (only needs to be executed the first time and on any data updates)
 ```

-Now, download/copy the following configuration files (and tweak their contents as necessary, though no changes should yield a working — but very unsafe — setup):
-
- [`docker-compose.yml`](/docker-compose.yml)
- [`.env.sample`](/.env.sample) and save it as `.env`
- [`bewcloud.config.sample.ts`](/bewcloud.config.sample.ts) and save it as `bewcloud.config.ts`
- [`radicale-config/config`](/radicale-config/config) and save it as `radicale-config/config` (necessary only if you're using CalDav/CardDav/Contacts)
-
-Finally, run these commands:
-
-```sh
-docker compose up -d # makes the app available at http://localhost:8000
-docker compose run --rm website bash -c "cd /app && make migrate-db" # initializes/updates the database (only needs to be executed the first time and on any data updates)
-```
-
-> [!NOTE]
-> If you run into permission issues, you can try running `sudo chown -R 1993:1993 data-files` to fix them.
->
-> `1993:1993` above comes from deno's [docker image](https://github.com/denoland/deno_docker/blob/2abfe921484bdc79d11c7187a9d7b59537457c31/ubuntu.dockerfile#L20-L22) where `1993` is the default user id in it. It might change in the future since I don't control it.
-
-If you're interested in building/contributing (or just running the app locally), check the [Development section below](#development).
-
-See the [Community Links](#community-links) section for alternative ways of running bewCloud yourself.
+Alternatively, check the [Development section below](#development).

 > [!IMPORTANT]
 > Even with signups disabled (`config.auth.allowSignups=false`), the first signup will work and become an admin.

-## Sponsors
-
-These are the amazing entities or individuals who are sponsoring this project for this current month. If you'd like to show up here, [check the GitHub Sponsors page](https://github.com/sponsors/bewcloud) or [make a donation](https://payment-links.mollie.com/payment/wUS9dvewvjEPvseZVHEi5) above $50 ($100 to show up on the website)!
-
-<p align="center" width="100%">
-  <a href="https://nlnet.nl/project/bewCloud/" title="NLnet Foundation">
-    <img src="https://nlnet.nl/logo/banner.svg" alt="NLnet Foundation" width="256" />
-  </a>
-</p>
+> [!NOTE]
+> `1993:1993` above comes from deno's [docker image](https://github.com/denoland/deno_docker/blob/2abfe921484bdc79d11c7187a9d7b59537457c31/ubuntu.dockerfile#L20-L22) where `1993` is the default user id in it. It might change in the future since I don't control it.

 ## Development

@ -68,27 +47,26 @@ These are the amazing entities or individuals who are sponsoring this project fo
 ### Commands

 ```sh
-docker compose -f docker-compose.dev.yml up # (optional) runs docker with postgres, locally
-make migrate-db # runs any missing database migrations
-make start # runs the app in development mode (watches for CSS file changes and recompiles the CSS)
-make format # (optional) formats the code (if you're interested in contributing)
-make test # (optional) runs tests (if you're interested in contributing)
-make build # (optional) generates CSS for production, if you've made changes
+$ docker compose -f docker-compose.dev.yml up # (optional) runs docker with postgres, locally
+$ make migrate-db # runs any missing database migrations
+$ make start # runs the app
+$ make format # formats the code
+$ make test # runs tests
 ```

-### Other less-used commands (mostly for development)
+### Other less-used commands

 ```sh
-make preview # runs the app in production mode (serves the app from the built files)
-make exec-db # runs psql inside the postgres container, useful for running direct development queries like `DROP DATABASE "bewcloud"; CREATE DATABASE "bewcloud";`
+$ make exec-db # runs psql inside the postgres container, useful for running direct development queries like `DROP DATABASE "bewcloud"; CREATE DATABASE "bewcloud";`
+$ make build # generates all static files for production deploy
 ```

-## File/Directory Structure
+## Structure

- Backend routes are defined at `routes.ts`
- Publicly-available files are defined at `public/`
- Pages are defined at `pages/`.
- JSX/TSX components are defined at `components/`.
+- Routes defined at `routes/`.
+- Static files are defined at `static/`.
+- Frontend-only components are defined at `components/`.
+- Isomorphic components are defined at `islands/`.
 - Cron jobs are defined at `crons/`.
 - Reusable bits of code are defined at `lib/`.
 - Database migrations are defined at `db-migrations/`.
@ -97,20 +75,21 @@ make exec-db # runs psql inside the postgres container, useful for running direc

 Just push to the `main` branch.

-## FAQ (Frequently Asked Questions)
+## Where's Contacts/Calendar (CardDav/CalDav)?! Wasn't this supposed to be a core Nextcloud replacement?

-[Check the FAQ](/FAQ.md) for answers to common questions, like private calendar and file sharing, or `.env`-based configuration.
+[Check this tag/release for more info and the code where/when that was being done](https://github.com/bewcloud/bewcloud/releases/tag/v0.0.1-self-made-carddav-caldav). Contacts/CardDav worked and Calendar/CalDav mostly worked as well at that point.
+
+My focus was to get me to replace Nextcloud for me and my family ASAP, and it turns out it's not easy to do it all in a single, installable _thing_, so I focused on the Files UI, sync, and sharing, since [Radicale](https://radicale.org/v3.html) solved my other issues better than my own solution (and it's already _very_ efficient).
+
+## How does file sharing work?
+
+[Check this PR for advanced sharing with internal and external users, with read and write access that was being done and almost working](https://github.com/bewcloud/bewcloud/pull/4). I ditched all that complexity for simply using [symlinks](https://en.wikipedia.org/wiki/Symbolic_link), as it served my use case (I have multiple data backups and trust the people I provide accounts to, with the symlinks).
+
+You can simply `ln -s /<absolute-path-to-data-files>/<owner-user-id>/<directory-to-share> /<absolute-path-to-data-files>/<user-id-to-share-with>/` to create a shared directory between two users, and the same directory can have different names, now.
+
+> [!NOTE]
+> If you're running the app with docker, the symlink needs to point to the container's directory, usually starting with `/app` if you didn't change the `Dockerfile`, otherwise the container will fail to load the linked directory.

 ## How does it look?

 [Check the website](https://bewcloud.com) for screenshots or [the YouTube channel](https://www.youtube.com/@bewCloud) for 1-minute demos.
-
-## Community Links
-
-These are not officially endorsed, but are alternative ways of running bewCloud.
-
- [`bewcloud-nixos`](https://codeberg.org/ntninja/bewcloud-nixos/) by [@ntninja](https://codeberg.org/ntninja/) exposes bewCloud as an easy-to-use NixOS integration as an alternative to using Docker or running the app locally.
-  - For installation, please see the [README](https://codeberg.org/ntninja/bewcloud-nixos/src/branch/main/README.md).
- [`bewcloud-helm`](https://github.com/loboda4450/charts/tree/main/charts/bewcloud) by [@loboda4450](https://github.com/loboda4450/) exposes bewCloud as a Helm chart.
-  - For installation, please see the [README](https://github.com/loboda4450/charts/blob/main/charts/bewcloud/README.md)
-  - Supports automatic migrations, Radicale installation (as a dependency chart) and streamlined, fully yaml-based configuration.
--- a/babel.config.js
+++ b/babel.config.js
@ -1,56 +0,0 @@
-// Converts local TSX imports to JS imports, used in the components
-const rewriteLocalTsxImports = () => {
-  const isLocal = (value) => typeof value === 'string' && (value.startsWith('./') || value.startsWith('../'));
-  const isComponent = (value) => typeof value === 'string' && value.startsWith('/components/');
-
-  const rewrite = (source) => {
-    if (source && isLocal(source.value) && source.value.endsWith('.tsx')) {
-      source.value = source.value.replace('.tsx', '.js');
-    }
-
-    if (source && isComponent(source.value) && source.value.endsWith('.tsx')) {
-      source.value = source.value.replace('/components/', '/public/components/').replace('.tsx', '.js');
-    }
-  };
-
-  return {
-    visitor: {
-      ImportDeclaration(path) {
-        rewrite(path.node.source);
-      },
-      ExportAllDeclaration(path) {
-        rewrite(path.node.source);
-      },
-      ExportNamedDeclaration(path) {
-        if (path.node.source) rewrite(path.node.source);
-      },
-    },
-  };
-};
-
-const presets = [
-  ['@babel/preset-react'],
-  ['@babel/preset-typescript', { jsxPragma: 'h' }],
-];
-
-const plugins = [
-  rewriteLocalTsxImports,
-  [
-    '@babel/plugin-transform-react-jsx',
-    {
-      'pragma': 'h',
-      'pragmaFrag': 'Fragment',
-      'jsxImportSource': 'preact',
-    },
-  ],
-];
-
-export default {
-  sourceType: 'module',
-  targets: '> 0.5%, not dead',
-  presets,
-  plugins,
-  comments: false,
-  compact: false,
-  minified: false,
-};
--- a/bewcloud.config.sample.ts
+++ b/bewcloud.config.sample.ts
@ -3,49 +3,25 @@ import { Config, PartialDeep } from './lib/types.ts';
 /** Check the Config type for all the possible options and instructions. */
 const config: PartialDeep<Config> = {
  auth: {
-    baseUrl: 'http://localhost:8000', // The base URL of the application you use to access the app, i.e. "http://localhost:8000" or "https://cloud.example.com" (note authentication won't work without https:// except for localhost; SSO redirect, if enabled, will be this + /oidc/callback, so "https://cloud.example.com/oidc/callback")
+    baseUrl: 'http://localhost:8000', // The base URL of the application you use to access the app, i.e. "http://localhost:8000" or "https://cloud.example.com" (SSO redirect, if enabled, will be this + /oidc/callback, so "https://cloud.example.com/oidc/callback")
    allowSignups: false, // If true, anyone can sign up for an account. Note that it's always possible to sign up for the first user, and they will be an admin
-    enableEmailVerification: false, // If true, email verification will be required for signups (using SMTP settings below)
+    enableEmailVerification: false, // If true, email verification will be required for signups (using Brevo)
    enableForeverSignup: true, // If true, all signups become active for 100 years
-    enableMultiFactor: false, // If true, users can enable multi-factor authentication (TOTP, Passkeys, or Email if the SMTP settings below are set)
+    enableMultiFactor: false, // If true, users can enable multi-factor authentication (TOTP or Passkeys)
    // allowedCookieDomains: ['example.com', 'example.net'], // Can be set to allow more than the baseUrl's domain for session cookies
    // skipCookieDomainSecurity: true, // If true, the cookie domain will not be strictly set and checked against. This skipping slightly reduces security, but is usually necessary for reverse proxies like Cloudflare Tunnel
-    // enableSingleSignOn: false, // If true, single sign-on will be enabled
-    // allowSignupsViaSingleSignOn: false, // If true, signups via single sign-on will be allowed, overriding allowSignups
-    // singleSignOnUrl: '', // The Discovery URL (AKA Issuer) of the identity/single sign-on provider
-    // singleSignOnEmailAttribute: 'email', // The attribute to prefer as email of the identity/single sign-on provider
-    // singleSignOnScopes: ['openid', 'email'], // The scopes to request from the identity/single sign-on provider
  },
  // files: {
  //   rootPath: 'data-files',
-  //   allowPublicSharing: false, // If true, public file sharing will be allowed (still requires a user to enable sharing for a given file or directory)
-  //   allowDirectoryDownloads: false, // If true, directories can be downloaded as zip files
-  //   maxUploadSizeInMegabytes: 100, // The maximum upload size in megabytes. Overrides the core.maxRequestSizeInMegabytes setting on /dav and /api/files/upload endpoints.
  // },
  // core: {
-  //   enabledApps: ['dashboard', 'files', 'news', 'notes', 'photos', 'expenses', 'contacts', 'calendar'], // The apps to show, in order of appearance in the header. The first app will be the default one shown after logging in. At least one is required.
-  //   maxRequestSizeInMegabytes: 12, // The maximum request size in megabytes.
+  //   enabledApps: ['news', 'notes', 'photos', 'expenses'], // dashboard and files cannot be disabled
  // },
  // visuals: {
  //   title: 'My own cloud',
  //   description: 'This is my own cloud!',
  //   helpEmail: '',
  // },
-  // email: {
-  //   from: 'help@bewcloud.com',
-  //   host: 'localhost',
-  //   port: 465,
-  //   tlsMode: 'auto', // "auto" means "immediate" on port 465, "starttls" otherwise.
-  //   tlsVerify: true, // Whether to verify the TLS certificate. If a string is used the hostname will be verified using that name.
-  // },
-  // contacts: {
-  //   enableCardDavServer: true,
-  //   cardDavUrl: 'http://radicale:5232',
-  // },
-  // calendar: {
-  //   enableCalDavServer: true,
-  //   calDavUrl: 'http://radicale:5232',
-  // },
 };

 export default config;
--- a/components/Header.tsx
+++ b/components/Header.tsx
@ -1,9 +1,10 @@
+import { Head } from 'fresh/runtime.ts';
+
 import { OptionalApp, User } from '/lib/types.ts';
-import { capitalizeWord } from '/public/ts/utils/misc.ts';

 interface Data {
  route: string;
-  user?: User | null;
+  user?: User;
  enabledApps: OptionalApp[];
 }

@ -22,14 +23,44 @@ export default function Header({ route, user, enabledApps }: Data) {

  const iconWidthAndHeightInPixels = 20;

-  const potentialMenuItems: (MenuItem | null)[] = enabledApps.map((app) => ({
-    url: `/${app}`,
-    label: capitalizeWord(app),
-  }));
+  const potentialMenuItems: (MenuItem | null)[] = [
+    {
+      url: '/dashboard',
+      label: 'Dashboard',
+    },
+    enabledApps.includes('news')
+      ? {
+        url: '/news',
+        label: 'News',
+      }
+      : null,
+    {
+      url: '/files',
+      label: 'Files',
+    },
+    enabledApps.includes('notes')
+      ? {
+        url: '/notes',
+        label: 'Notes',
+      }
+      : null,
+    enabledApps.includes('photos')
+      ? {
+        url: '/photos',
+        label: 'Photos',
+      }
+      : null,
+    enabledApps.includes('expenses')
+      ? {
+        url: '/expenses',
+        label: 'Expenses',
+      }
+      : null,
+  ];

  const menuItems = potentialMenuItems.filter(Boolean) as MenuItem[];

-  if (user && !route.startsWith('/file-share')) {
+  if (user) {
    const activeMenu = menuItems.find((menu) => route.startsWith(menu.url));

    let pageLabel = activeMenu?.label || '404 - Page not found';
@ -46,27 +77,18 @@ export default function Header({ route, user, enabledApps }: Data) {
      pageLabel = 'Budgets & Expenses';
    }

-    if (route.startsWith('/contacts')) {
-      pageLabel = 'Contacts';
-    }
-
-    if (route.startsWith('/calendar')) {
-      pageLabel = 'Calendar';
-    }
-
    return (
      <>
+        <Head>
+          <title>{pageLabel} - bewCloud</title>
+        </Head>
        <nav class='bg-slate-950'>
          <div class='mx-auto max-w-7xl px-4 sm:px-6 lg:px-8'>
            <div class='flex h-16 items-center justify-between'>
              <div class='flex items-center'>
-                <div class='shrink-0'>
+                <div class='flex-shrink-0'>
                  <a href='/'>
-                    <img
-                      class='h-12 w-12 drop-shadow-md'
-                      src='/public/images/logomark.svg'
-                      alt='a stylized blue cloud'
-                    />
+                    <img class='h-12 w-12 drop-shadow-md' src='/images/logomark.svg' alt='a stylized blue cloud' />
                  </a>
                </div>
                <div class='hidden md:block'>
@ -74,7 +96,7 @@ export default function Header({ route, user, enabledApps }: Data) {
                    {menuItems.map((menu) => (
                      <a href={menu.url} class={route.startsWith(menu.url) ? activeClass : defaultClass}>
                        <img
-                          src={`/public/images${menu.url}${'.svg'}`}
+                          src={`/images${menu.url}${'.svg'}`}
                          alt={menu.label}
                          title={menu.label}
                          width={iconWidthAndHeightInPixels}
@ -95,7 +117,7 @@ export default function Header({ route, user, enabledApps }: Data) {
                    class={route.startsWith('/settings') ? activeClass : defaultClass}
                  >
                    <img
-                      src='/public/images/settings.svg'
+                      src='/images/settings.svg'
                      alt='Settings'
                      title='Settings'
                      width={iconWidthAndHeightInPixels}
@ -108,7 +130,7 @@ export default function Header({ route, user, enabledApps }: Data) {
                    class={defaultClass}
                  >
                    <img
-                      src='/public/images/logout.svg'
+                      src='/images/logout.svg'
                      alt='Logout'
                      title='Logout'
                      width={iconWidthAndHeightInPixels}
@ -144,11 +166,11 @@ export default function Header({ route, user, enabledApps }: Data) {
  }

  return (
-    <header class='px-4 pt-8 pb-2 max-w-3xl mx-auto flex flex-col items-center justify-center'>
+    <header class='px-4 pt-8 pb-2 max-w-screen-md mx-auto flex flex-col items-center justify-center'>
      <a href='/'>
        <img
          class='mt-6 mb-2 drop-shadow-md'
-          src='/public/images/logo-white.svg'
+          src='/images/logo-white.svg'
          width='250'
          height='50'
          alt='the bewCloud logo: a stylized logo'
--- a/components/Loading.ts
+++ b/components/Loading.ts
@ -1,25 +0,0 @@
-import { html } from '/public/ts/utils/misc.ts';
-
-export default function Loading() {
-  return html`
-    <section role="status" id="loading" class="flex justify-center items-center">
-      <svg
-        aria-hidden="true"
-        class="w-8 h-8 text-slate-700 animate-spin fill-sky-400"
-        viewBox="0 0 100 101"
-        fill="none"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-          fill="currentColor"
-        />
-        <path
-          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-          fill="currentFill"
-        />
-      </svg>
-      <span class="sr-only">Loading...</span>
-    </section>
-  `;
-}
--- a/components/Settings.ts
+++ b/components/Settings.ts
@ -1,295 +0,0 @@
-import { FormField, generateFieldHtml, getFormDataField } from '/public/ts/utils/form.ts';
-import { convertObjectToFormData, currencyMap, escapeHtml, html } from '/public/ts/utils/misc.ts';
-import { SupportedCurrencySymbol, User } from '/lib/types.ts';
-import { getEnabledMultiFactorAuthMethodsFromUser } from '/public/ts/utils/multi-factor-auth.ts';
-import { getTimeZones } from '/public/ts/utils/calendar.ts';
-import Loading from '/components/Loading.ts';
-
-interface SettingsProps {
-  formData: Record<string, any>;
-  error?: {
-    title: string;
-    message: string;
-  };
-  notice?: {
-    title: string;
-    message: string;
-  };
-  currency?: SupportedCurrencySymbol;
-  timezoneId?: string;
-  isExpensesAppEnabled: boolean;
-  isMultiFactorAuthEnabled: boolean;
-  isCalendarAppEnabled: boolean;
-  helpEmail: string;
-  user: {
-    extra: Pick<User['extra'], 'multi_factor_auth_methods'>;
-  };
-}
-
-export type Action =
-  | 'change-email'
-  | 'verify-change-email'
-  | 'change-password'
-  | 'change-dav-password'
-  | 'delete-account'
-  | 'change-currency'
-  | 'change-timezone';
-
-export const actionWords = new Map<Action, string>([
-  ['change-email', 'change email'],
-  ['verify-change-email', 'change email'],
-  ['change-password', 'change password'],
-  ['change-dav-password', 'change WebDav password'],
-  ['delete-account', 'delete account'],
-  ['change-currency', 'change currency'],
-  ['change-timezone', 'change timezone'],
-]);
-
-function formFields(action: Action, formData: FormData, currency?: SupportedCurrencySymbol, timezoneId?: string) {
-  const fields: FormField[] = [
-    {
-      name: 'action',
-      label: '',
-      type: 'hidden',
-      value: action,
-      overrideValue: action,
-      required: true,
-      readOnly: true,
-    },
-  ];
-
-  if (action === 'change-email') {
-    fields.push({
-      name: 'email',
-      label: 'Email',
-      type: 'email',
-      placeholder: 'jane.doe@example.com',
-      value: getFormDataField(formData, 'email'),
-      required: true,
-    });
-  } else if (action === 'verify-change-email') {
-    fields.push({
-      name: 'email',
-      label: 'Email',
-      type: 'email',
-      placeholder: 'jane.doe@example.com',
-      value: getFormDataField(formData, 'email'),
-      required: true,
-    }, {
-      name: 'verification-code',
-      label: 'Verification Code',
-      description: `The verification code to validate your new email.`,
-      type: 'text',
-      placeholder: '000000',
-      required: true,
-    });
-  } else if (action === 'change-password') {
-    fields.push({
-      name: 'current-password',
-      label: 'Current Password',
-      type: 'password',
-      placeholder: 'super-SECRET-passphrase',
-      required: true,
-    }, {
-      name: 'new-password',
-      label: 'New Password',
-      type: 'password',
-      placeholder: 'super-SECRET-passphrase',
-      required: true,
-    });
-  } else if (action === 'change-dav-password') {
-    fields.push({
-      name: 'new-dav-password',
-      label: 'New WebDav Password',
-      type: 'password',
-      placeholder: 'super-SECRET-passphrase',
-      required: true,
-      description: 'Alternative password used for WebDav access and/or HTTP Basic Auth.',
-    });
-  } else if (action === 'delete-account') {
-    fields.push({
-      name: 'current-password',
-      label: 'Password',
-      type: 'password',
-      placeholder: 'super-SECRET-passphrase',
-      description: 'You need to input your password in order to delete your account.',
-      required: true,
-    });
-  } else if (action === 'change-currency') {
-    fields.push({
-      name: 'currency',
-      label: 'Currency',
-      type: 'select',
-      options: Array.from(currencyMap.keys()).map((currencySymbol) => ({
-        value: currencySymbol,
-        label: `${currencySymbol} (${currencyMap.get(currencySymbol)})`,
-      })),
-      value: getFormDataField(formData, 'currency') || currency,
-      required: true,
-    });
-  } else if (action === 'change-timezone') {
-    const timezones = getTimeZones();
-
-    fields.push({
-      name: 'timezone',
-      label: 'Timezone',
-      type: 'select',
-      options: timezones.map((timezone) => ({
-        value: timezone.id,
-        label: timezone.label,
-      })),
-      value: getFormDataField(formData, 'timezone') || timezoneId,
-      required: true,
-    });
-  }
-  return fields;
-}
-
-export default function Settings(
-  {
-    formData: formDataObject,
-    error,
-    notice,
-    currency,
-    timezoneId,
-    isExpensesAppEnabled,
-    isMultiFactorAuthEnabled,
-    isCalendarAppEnabled,
-    helpEmail,
-    user,
-  }: SettingsProps,
-): string {
-  const formData = convertObjectToFormData(formDataObject);
-
-  const multiFactorAuthMethods = getEnabledMultiFactorAuthMethodsFromUser(user);
-
-  return html`
-    <section class="mx-auto max-w-7xl my-8">
-      ${error
-        ? html`
-          <section class="notification-error">
-            <h3>${escapeHtml(error.title)}</h3>
-            <p>${escapeHtml(error.message)}</p>
-          </section>
-        `
-        : ''} ${notice
-        ? html`
-          <section class="notification-success">
-            <h3>${escapeHtml(notice.title)}</h3>
-            <p>${escapeHtml(notice.message)}</p>
-          </section>
-        `
-        : ''}
-
-      <h2 class="text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96">Change your email</h2>
-
-      <form method="POST" class="mb-12">
-        ${formFields('change-email', formData).map((field) => generateFieldHtml(field, formData)).join('')}
-        <section class="flex justify-end mt-8 mb-4">
-          <button class="button-secondary" type="submit">Change email</button>
-        </section>
-      </form>
-
-      <h2 class="text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96">Change your password</h2>
-
-      <form method="POST" class="mb-12">
-        ${formFields('change-password', formData).map((field) => generateFieldHtml(field, formData)).join('')}
-        <section class="flex justify-end mt-8 mb-4">
-          <button class="button-secondary" type="submit">Change password</button>
-        </section>
-      </form>
-
-      <h2 class="text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96">Change your WebDav password</h2>
-
-      <form method="POST" class="mb-12">
-        ${formFields('change-dav-password', formData).map((field) => generateFieldHtml(field, formData)).join('')}
-        <section class="flex justify-end mt-8 mb-4">
-          <button class="button-secondary" type="submit">Change WebDav password</button>
-        </section>
-      </form>
-
-      ${isExpensesAppEnabled
-        ? html`
-          <h2 class="text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96">Change your currency</h2>
-          <p class="text-left mt-2 mb-6 px-4 max-w-3xl mx-auto lg:min-w-96">
-            This is only used in the expenses app, visually. It changes nothing about the stored data or values.
-          </p>
-
-          <form method="POST" class="mb-12">
-            ${formFields('change-currency', formData, currency, timezoneId).map((field) =>
-              generateFieldHtml(field, formData)
-            ).join('')}
-            <section class="flex justify-end mt-8 mb-4">
-              <button class="button-secondary" type="submit">Change currency</button>
-            </section>
-          </form>
-        `
-        : ''} ${isCalendarAppEnabled
-        ? html`
-          <h2 class="text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96">Change your timezone</h2>
-          <p class="text-left mt-2 mb-6 px-4 max-w-3xl mx-auto lg:min-w-96">
-            This is only used in the calendar app.
-          </p>
-
-          <form method="POST" class="mb-12">
-            ${formFields('change-timezone', formData, currency, timezoneId).map((field) =>
-              generateFieldHtml(field, formData)
-            ).join('')}
-            <section class="flex justify-end mt-8 mb-4">
-              <button class="button-secondary" type="submit">Change timezone</button>
-            </section>
-          </form>
-        `
-        : ''} ${isMultiFactorAuthEnabled
-        ? html`
-          <section id="multi-factor-auth-settings">
-            ${Loading()}
-          </section>
-        `
-        : ''}
-
-      <h2 class="text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96">Delete your account</h2>
-      <p class="text-left mt-2 mb-6 px-4 max-w-3xl mx-auto lg:min-w-96">
-        Deleting your account is instant and deletes all your data. ${helpEmail !== ''
-          ? html`
-            If you need help, please <a href="${`mailto:${helpEmail}`}">reach out</a>.
-          `
-          : ''}
-      </p>
-
-      <form method="POST" class="mb-12">
-        ${formFields('delete-account', formData).map((field) => generateFieldHtml(field, formData)).join('')}
-        <section class="flex justify-end mt-8 mb-4">
-          <button class="button-danger" type="submit">Delete account</button>
-        </section>
-      </form>
-    </section>
-
-    <script type="module">
-    import { h, render } from 'preact';
-
-    // Imported files need some preact globals to work
-    window.h = h;
-
-    import MultiFactorAuthSettings from '/public/components/auth/MultiFactorAuthSettings.js';
-
-    const multiFactorAuthSettingsElement = document.getElementById('multi-factor-auth-settings');
-
-    if (multiFactorAuthSettingsElement) {
-      const multiFactorAuthSettingsApp = h(MultiFactorAuthSettings, {
-        methods: ${JSON.stringify(multiFactorAuthMethods.map((method) => ({
-          type: method.type,
-          id: method.id,
-          name: method.name,
-          enabled: method.enabled,
-          backupCodesCount: method.metadata.totp?.hashed_backup_codes?.length,
-        })))},
-      });
-
-      render(multiFactorAuthSettingsApp, multiFactorAuthSettingsElement);
-
-      document.getElementById('loading')?.remove();
-    }
-    </script>
-  `;
-}
--- a/components/auth/MultiFactorAuthVerifyForm.tsx
+++ b/components/auth/MultiFactorAuthVerifyForm.tsx
@ -1,5 +1,5 @@
 import { MultiFactorAuthMethodType } from '/lib/types.ts';
-import PasswordlessPasskeyLogin from '/components/auth/PasswordlessPasskeyLogin.tsx';
+import PasswordlessPasskeyLogin from '/islands/auth/PasswordlessPasskeyLogin.tsx';

 interface MultiFactorAuthVerifyFormProps {
  email: string;
@ -13,10 +13,9 @@ export default function MultiFactorAuthVerifyForm(
 ) {
  const hasPasskey = availableMethods.includes('passkey');
  const hasTotp = availableMethods.includes('totp');
-  const hasEmail = availableMethods.includes('email');

  return (
-    <section class='max-w-md w-full mb-12 mx-auto'>
+    <section class='max-w-md w-full mb-12'>
      <section class='mb-6'>
        <h2 class='mt-6 text-center text-3xl font-extrabold text-white'>
          Multi-Factor Authentication
@ -28,51 +27,9 @@ export default function MultiFactorAuthVerifyForm(

      {error
        ? (
-          <section class='notification-error'>
-            <h3>{error.title}</h3>
-            <p>{error.message}</p>
-          </section>
-        )
-        : null}
-
-      {hasEmail
-        ? (
-          <form
-            class='mb-6'
-            method='POST'
-            action={`/mfa-verify?redirect=${encodeURIComponent(redirectUrl)}`}
-          >
-            <fieldset class='block mb-4'>
-              <label class='text-slate-300 block pb-1' for='token'>
-                Email Verification Code
-              </label>
-              <input
-                type='text'
-                id='code'
-                name='code'
-                placeholder='123456'
-                class='mt-1 input-field'
-                autocomplete='off'
-                required
-              />
-            </fieldset>
-
-            <section class='flex justify-center mt-8 mb-4'>
-              <button
-                type='submit'
-                class='button'
-              >
-                Verify Code
-              </button>
-            </section>
-          </form>
-        )
-        : null}
-
-      {hasEmail && hasTotp
-        ? (
-          <section class='text-center -mt-10 mb-6 block'>
-            <p class='text-gray-400 text-sm'>or</p>
+          <section class='bg-red-900 border border-red-700 text-red-100 px-4 py-3 rounded relative mb-4'>
+            <strong class='font-bold'>{error.title}:</strong>
+            <span class='block sm:inline'>{error.message}</span>
          </section>
        )
        : null}
@ -111,7 +68,7 @@ export default function MultiFactorAuthVerifyForm(
        )
        : null}

-      {(hasEmail || hasTotp) && hasPasskey
+      {hasTotp && hasPasskey
        ? (
          <section class='text-center -mt-10 mb-6 block'>
            <p class='text-gray-400 text-sm'>or</p>
--- a/components/auth/PasswordlessPasskeyLogin.tsx
+++ b/components/auth/PasswordlessPasskeyLogin.tsx
@ -1,29 +0,0 @@
-export interface PasswordlessPasskeyLoginProps {
-  email?: string;
-  redirectUrl?: string;
-}
-
-export default function PasswordlessPasskeyLogin({ email, redirectUrl }: PasswordlessPasskeyLoginProps) {
-  return (
-    <>
-      <section class='space-y-4'>
-        <section class='flex justify-center mt-2 mb-4'>
-          <button
-            id='passwordless-passkey-login-button'
-            type='button'
-            class='button-secondary'
-            data-email={email}
-            data-redirect-url={redirectUrl}
-          >
-            Login with Passkey
-          </button>
-        </section>
-
-        <section class='notification-error hidden' id='passwordless-passkey-login-error'></section>
-      </section>
-
-      <script src='/public/js/simplewebauthn.js'></script>
-      <script type='module' src='/public/ts/passwordless-passkey-login.ts'></script>
-    </>
-  );
-}
--- a/components/calendar/AddEventModal.tsx
+++ b/components/calendar/AddEventModal.tsx
@ -1,163 +0,0 @@
-import { useSignal } from '@preact/signals';
-import { useEffect } from 'preact/hooks';
-
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-
-interface AddEventModalProps {
-  isOpen: boolean;
-  initialStartDate?: Date;
-  initiallyAllDay?: boolean;
-  calendars: Calendar[];
-  onClickSave: (newEvent: CalendarEvent) => Promise<void>;
-  onClose: () => void;
-}
-
-export default function AddEventModal(
-  { isOpen, initialStartDate, initiallyAllDay, calendars, onClickSave, onClose }: AddEventModalProps,
-) {
-  const newEvent = useSignal<CalendarEvent | null>(null);
-
-  useEffect(() => {
-    if (!isOpen) {
-      newEvent.value = null;
-    } else {
-      const startDate = new Date(initialStartDate || new Date());
-
-      startDate.setUTCMinutes(0);
-      startDate.setUTCSeconds(0);
-      startDate.setUTCMilliseconds(0);
-
-      const endDate = new Date(startDate);
-      endDate.setUTCHours(startDate.getUTCHours() + 1);
-
-      if (initiallyAllDay) {
-        startDate.setUTCHours(9);
-        endDate.setUTCHours(18);
-      }
-
-      newEvent.value = {
-        uid: 'new',
-        url: '',
-        title: '',
-        calendarId: calendars[0]!.uid!,
-        startDate: startDate,
-        endDate: endDate,
-        isAllDay: initiallyAllDay || false,
-        organizerEmail: '',
-        transparency: 'opaque',
-      };
-    }
-  }, [isOpen]);
-
-  return (
-    <>
-      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
-      >
-      </section>
-
-      <section
-        class={`fixed ${
-          newEvent.value ? 'block' : 'hidden'
-        } z-50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 min-w-96 max-w-lg bg-slate-600 text-white rounded-md px-8 py-6 drop-shadow-lg overflow-y-scroll max-h-[80%]`}
-      >
-        <h1 class='text-2xl font-semibold my-5'>New Event</h1>
-        <section class='py-5 my-2 border-y border-slate-500'>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='event_title'>Title</label>
-            <input
-              class='input-field'
-              type='text'
-              name='event_title'
-              id='event_title'
-              value={newEvent.value?.title || ''}
-              onInput={(event) => newEvent.value = { ...newEvent.value!, title: event.currentTarget.value }}
-              placeholder='Dentist'
-            />
-          </fieldset>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='event_calendar'>Calendar</label>
-            <section class='flex items-center justify-between'>
-              <select
-                class='input-field mr-2 w-5/6!'
-                name='event_calendar'
-                id='event_calendar'
-                value={newEvent.value?.calendarId || ''}
-                onChange={(event) => newEvent.value = { ...newEvent.value!, calendarId: event.currentTarget.value }}
-              >
-                {calendars.map((calendar) => (
-                  <option key={calendar.uid} value={calendar.uid}>{calendar.displayName}</option>
-                ))}
-              </select>
-              <span
-                class={`w-5 h-5 block rounded-full`}
-                style={{
-                  backgroundColor: calendars.find((calendar) => calendar.uid === newEvent.value?.calendarId)
-                    ?.calendarColor,
-                }}
-                title={calendars.find((calendar) => calendar.uid === newEvent.value?.calendarId)?.calendarColor}
-              >
-              </span>
-            </section>
-          </fieldset>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='event_start_date'>Start date</label>
-            <input
-              class='input-field'
-              type='datetime-local'
-              name='event_start_date'
-              id='event_start_date'
-              value={newEvent.value?.startDate ? new Date(newEvent.value.startDate).toISOString().substring(0, 16) : ''}
-              onInput={(event) =>
-                newEvent.value = { ...newEvent.value!, startDate: new Date(event.currentTarget.value) }}
-            />
-            <aside class='text-sm text-slate-400 p-2 '>
-              Dates are set in the default calendar timezone, controlled by Radicale.
-            </aside>
-          </fieldset>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='event_end_date'>End date</label>
-            <input
-              class='input-field'
-              type='datetime-local'
-              name='event_end_date'
-              id='event_end_date'
-              value={newEvent.value?.endDate ? new Date(newEvent.value.endDate).toISOString().substring(0, 16) : ''}
-              onInput={(event) => newEvent.value = { ...newEvent.value!, endDate: new Date(event.currentTarget.value) }}
-            />
-            <aside class='text-sm text-slate-400 p-2 '>
-              Dates are set in the default calendar timezone, controlled by Radicale.
-            </aside>
-          </fieldset>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='event_is_all_day'>All-day?</label>
-            <input
-              type='checkbox'
-              name='event_is_all_day'
-              id='event_is_all_day'
-              value='true'
-              checked={newEvent.value?.isAllDay}
-              onChange={(event) => newEvent.value = { ...newEvent.value!, isAllDay: event.currentTarget.checked }}
-            />
-          </fieldset>
-        </section>
-        <footer class='flex justify-between'>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClickSave(newEvent.value!)}
-          >
-            Save
-          </button>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClose()}
-          >
-            Close
-          </button>
-        </footer>
-      </section>
-    </>
-  );
-}
--- a/components/calendar/CalendarViewDay.tsx
+++ b/components/calendar/CalendarViewDay.tsx
@ -1,229 +0,0 @@
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { getCalendarEventStyle } from '/public/ts/utils/calendar.ts';
-
-interface CalendarViewDayProps {
-  startDate: Date;
-  visibleCalendars: Calendar[];
-  calendarEvents: CalendarEvent[];
-  onClickAddEvent: (startDate?: Date, isAllDay?: boolean) => void;
-  onClickOpenEvent: (calendarEvent: CalendarEvent) => void;
-  timezoneId: string;
-}
-
-export default function CalendarViewDay(
-  { startDate, visibleCalendars, calendarEvents, onClickAddEvent, onClickOpenEvent, timezoneId }: CalendarViewDayProps,
-) {
-  const today = new Date().toISOString().substring(0, 10);
-
-  const hourFormat = new Intl.DateTimeFormat('en-GB', {
-    hour12: false,
-    hour: '2-digit',
-    minute: '2-digit',
-    timeZone: timezoneId, // Calendar dates are parsed are stored without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-  const dayFormat = new Intl.DateTimeFormat('en-GB', {
-    weekday: 'long',
-    day: 'numeric',
-    month: 'long',
-    year: 'numeric',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-
-  const allDayEvents: CalendarEvent[] = calendarEvents.filter((calendarEvent) => {
-    if (!calendarEvent.isAllDay) {
-      return false;
-    }
-
-    const startDayDate = new Date(startDate);
-    const endDayDate = new Date(startDate);
-    endDayDate.setUTCHours(23);
-    endDayDate.setUTCMinutes(59);
-    endDayDate.setUTCSeconds(59);
-    endDayDate.setUTCMilliseconds(999);
-
-    const eventStartDate = new Date(calendarEvent.startDate);
-    const eventEndDate = new Date(calendarEvent.endDate);
-
-    // Event starts and ends on this day
-    if (eventStartDate >= startDayDate && eventEndDate <= endDayDate) {
-      return true;
-    }
-
-    // Event starts before and ends after this day
-    if (eventStartDate <= startDayDate && eventEndDate >= endDayDate) {
-      return true;
-    }
-
-    // Event starts on and ends after this day
-    if (
-      eventStartDate >= startDayDate && eventStartDate <= endDayDate && eventEndDate >= endDayDate
-    ) {
-      return true;
-    }
-
-    // Event starts before and ends on this day
-    if (
-      eventStartDate <= startDayDate && eventEndDate >= startDayDate && eventEndDate <= endDayDate
-    ) {
-      return true;
-    }
-
-    return false;
-  });
-
-  const hours: { date: Date; isCurrentHour: boolean }[] = Array.from({ length: 24 }).map((_, index) => {
-    const hourNumber = index;
-
-    const date = new Date(startDate);
-    date.setUTCHours(hourNumber);
-
-    const shortIsoDate = date.toISOString().substring(0, 10);
-
-    const isCurrentHour = shortIsoDate === today && new Date().getUTCHours() === hourNumber;
-
-    return {
-      date,
-      isCurrentHour,
-    };
-  });
-
-  return (
-    <section class='shadow-md flex flex-auto flex-col rounded-md'>
-      <section class='border-b border-slate-500 bg-slate-700 text-center text-base font-semibold text-white flex-none rounded-t-md'>
-        <div class='flex justify-center bg-gray-900 py-2 rounded-t-md'>
-          <span>{dayFormat.format(startDate)}</span>
-        </div>
-      </section>
-      <section class='flex bg-slate-500 text-sm text-white flex-auto rounded-b-md'>
-        <section class='w-full rounded-b-md'>
-          {allDayEvents.length > 0
-            ? (
-              <section
-                class={`relative bg-slate-700 min-h-16 px-3 py-2 text-slate-100 border-b border-b-slate-600`}
-              >
-                <time
-                  datetime={new Date(startDate).toISOString().substring(0, 10)}
-                  onClick={() => onClickAddEvent(new Date(startDate), true)}
-                  class='cursor-pointer'
-                  title='Add a new all-day event'
-                >
-                  All-day
-                </time>
-                <ol class='mt-2'>
-                  {allDayEvents.map((calendarEvent) => (
-                    <li class='mb-1'>
-                      <a
-                        href='javascript:void(0);'
-                        class={`flex px-2 py-2 rounded-md hover:no-underline hover:opacity-60`}
-                        style={getCalendarEventStyle(calendarEvent, visibleCalendars)}
-                        onClick={() => onClickOpenEvent(calendarEvent)}
-                      >
-                        <p class='flex-auto truncate font-medium text-white'>
-                          {calendarEvent.title}
-                        </p>
-                      </a>
-                    </li>
-                  ))}
-                </ol>
-              </section>
-            )
-            : null}
-          {hours.map((hour, hourIndex) => {
-            const shortIsoDate = hour.date.toISOString().substring(0, 10);
-
-            const startHourDate = new Date(shortIsoDate);
-            startHourDate.setUTCHours(hour.date.getUTCHours());
-            const endHourDate = new Date(shortIsoDate);
-            endHourDate.setUTCHours(hour.date.getUTCHours());
-            endHourDate.setUTCMinutes(59);
-            endHourDate.setUTCSeconds(59);
-            endHourDate.setUTCMilliseconds(999);
-
-            const isLastHour = hourIndex === 23;
-
-            const hourEvents = calendarEvents.filter((calendarEvent) => {
-              if (calendarEvent.isAllDay) {
-                return false;
-              }
-
-              const eventStartDate = new Date(calendarEvent.startDate);
-              const eventEndDate = new Date(calendarEvent.endDate);
-              eventEndDate.setUTCSeconds(eventEndDate.getUTCSeconds() - 1); // Take one second back so events don't bleed into the next hour
-
-              // Event starts and ends on this hour
-              if (eventStartDate >= startHourDate && eventEndDate <= endHourDate) {
-                return true;
-              }
-
-              // Event starts before and ends after this hour
-              if (eventStartDate <= startHourDate && eventEndDate >= endHourDate) {
-                return true;
-              }
-
-              // Event starts on and ends after this hour
-              if (
-                eventStartDate >= startHourDate && eventStartDate <= endHourDate && eventEndDate >= endHourDate
-              ) {
-                return true;
-              }
-
-              // Event starts before and ends on this hour
-              if (
-                eventStartDate <= startHourDate && eventEndDate >= startHourDate && eventEndDate <= endHourDate
-              ) {
-                return true;
-              }
-
-              return false;
-            });
-
-            return (
-              <section
-                class={`relative ${hour.isCurrentHour ? 'bg-slate-600' : 'bg-slate-700'} ${
-                  hourIndex <= 6 ? 'min-h-8' : 'min-h-16'
-                } px-3 py-2 ${hour.isCurrentHour ? '' : 'text-slate-100'} ${
-                  isLastHour ? 'rounded-b-md' : ''
-                } border-b border-b-slate-600`}
-              >
-                <time
-                  datetime={startHourDate.toISOString()}
-                  onClick={() => onClickAddEvent(startHourDate)}
-                  class='cursor-pointer'
-                  title='Add a new event'
-                >
-                  {hourFormat.format(startHourDate)}
-                </time>
-                {hourEvents.length > 0
-                  ? (
-                    <ol class='mt-2'>
-                      {hourEvents.map((hourEvent) => (
-                        <li class='mb-1'>
-                          <a
-                            href='javascript:void(0);'
-                            class={`flex px-2 py-2 rounded-md hover:no-underline hover:opacity-60`}
-                            style={getCalendarEventStyle(hourEvent, visibleCalendars)}
-                            onClick={() => onClickOpenEvent(hourEvent)}
-                          >
-                            <time
-                              datetime={new Date(hourEvent.startDate).toISOString()}
-                              class='mr-2 flex-none text-slate-100 block'
-                            >
-                              {hourFormat.format(new Date(hourEvent.startDate))}
-                            </time>
-                            <p class='flex-auto truncate font-medium text-white'>
-                              {hourEvent.title}
-                            </p>
-                          </a>
-                        </li>
-                      ))}
-                    </ol>
-                  )
-                  : null}
-              </section>
-            );
-          })}
-        </section>
-      </section>
-    </section>
-  );
-}
--- a/components/calendar/CalendarViewMonth.tsx
+++ b/components/calendar/CalendarViewMonth.tsx
@ -1,166 +0,0 @@
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { getCalendarEventStyle, getWeeksForMonth } from '/public/ts/utils/calendar.ts';
-
-interface CalendarViewWeekProps {
-  startDate: Date;
-  visibleCalendars: Calendar[];
-  calendarEvents: CalendarEvent[];
-  onClickAddEvent: (startDate?: Date, isAllDay?: boolean) => void;
-  onClickOpenEvent: (calendarEvent: CalendarEvent) => void;
-  timezoneId: string;
-}
-
-export default function CalendarViewWeek(
-  { startDate, visibleCalendars, calendarEvents, onClickAddEvent, onClickOpenEvent, timezoneId }: CalendarViewWeekProps,
-) {
-  const today = new Date().toISOString().substring(0, 10);
-
-  const hourFormat = new Intl.DateTimeFormat('en-GB', {
-    hour12: false,
-    hour: '2-digit',
-    minute: '2-digit',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-
-  const weeks = getWeeksForMonth(new Date(startDate));
-
-  return (
-    <section class='shadow-md flex flex-auto flex-col rounded-md'>
-      <section class='grid grid-cols-7 gap-px border-b border-slate-500 bg-slate-700 text-center text-xs font-semibold text-white flex-none rounded-t-md'>
-        <div class='flex justify-center bg-gray-900 py-2 rounded-tl-md'>
-          <span>Mon</span>
-        </div>
-        <div class='flex justify-center bg-gray-900 py-2'>
-          <span>Tue</span>
-        </div>
-        <div class='flex justify-center bg-gray-900 py-2'>
-          <span>Wed</span>
-        </div>
-        <div class='flex justify-center bg-gray-900 py-2'>
-          <span>Thu</span>
-        </div>
-        <div class='flex justify-center bg-gray-900 py-2'>
-          <span>Fri</span>
-        </div>
-        <div class='flex justify-center bg-gray-900 py-2'>
-          <span>Sat</span>
-        </div>
-        <div class='flex justify-center bg-gray-900 py-2 rounded-tr-md'>
-          <span>Sun</span>
-        </div>
-      </section>
-      <section class='flex bg-slate-500 text-xs text-white flex-auto rounded-b-md'>
-        <section class='w-full grid grid-cols-7 grid-rows-5 gap-px rounded-b-md'>
-          {weeks.map((week, weekIndex) =>
-            week.map((day, dayIndex) => {
-              const shortIsoDate = day.date.toISOString().substring(0, 10);
-
-              const startDayDate = new Date(shortIsoDate);
-              const endDayDate = new Date(shortIsoDate);
-              endDayDate.setUTCHours(23);
-              endDayDate.setUTCMinutes(59);
-              endDayDate.setUTCSeconds(59);
-              endDayDate.setUTCMilliseconds(999);
-
-              const isBottomLeftDay = weekIndex === weeks.length - 1 && dayIndex === 0;
-              const isBottomRightDay = weekIndex === weeks.length - 1 && dayIndex === week.length - 1;
-
-              const isToday = today === shortIsoDate;
-
-              const dayEvents = calendarEvents.filter((calendarEvent) => {
-                const eventStartDate = new Date(calendarEvent.startDate);
-                const eventEndDate = new Date(calendarEvent.endDate);
-
-                // Event starts and ends on this day
-                if (eventStartDate >= startDayDate && eventEndDate <= endDayDate) {
-                  return true;
-                }
-
-                // Event starts before and ends after this day
-                if (eventStartDate <= startDayDate && eventEndDate >= endDayDate) {
-                  return true;
-                }
-
-                // Event starts on and ends after this day
-                if (
-                  eventStartDate >= startDayDate && eventStartDate <= endDayDate && eventEndDate >= endDayDate
-                ) {
-                  return true;
-                }
-
-                // Event starts before and ends on this day
-                if (
-                  eventStartDate <= startDayDate && eventEndDate >= startDayDate && eventEndDate <= endDayDate
-                ) {
-                  return true;
-                }
-
-                return false;
-              });
-
-              return (
-                <section
-                  class={`relative ${day.isSameMonth ? 'bg-slate-600' : 'bg-slate-700'} min-h-16 px-3 py-2 ${
-                    day.isSameMonth ? '' : 'text-slate-100'
-                  } ${isBottomLeftDay ? 'rounded-bl-md' : ''} ${isBottomRightDay ? 'rounded-br-md' : ''}`}
-                >
-                  <time
-                    datetime={shortIsoDate}
-                    class={`cursor-pointer ${
-                      isToday ? 'flex h-6 w-6 items-center justify-center rounded-full bg-[#51A4FB] font-semibold' : ''
-                    }`}
-                    onClick={() => onClickAddEvent(new Date(`${shortIsoDate}T09:00`))}
-                    title='Add a new event'
-                  >
-                    {day.date.getUTCDate()}
-                  </time>
-                  {dayEvents.length > 0
-                    ? (
-                      <ol class='mt-2'>
-                        {[...dayEvents].slice(0, 2).map((dayEvent) => (
-                          <li class='mb-1'>
-                            <a
-                              href='javascript:void(0);'
-                              class={`flex px-2 py-1 rounded-md hover:no-underline hover:opacity-60`}
-                              style={getCalendarEventStyle(dayEvent, visibleCalendars)}
-                              onClick={() => onClickOpenEvent(dayEvent)}
-                            >
-                              <time
-                                datetime={new Date(dayEvent.startDate).toISOString()}
-                                class='mr-2 flex-none text-slate-100 block'
-                              >
-                                {hourFormat.format(new Date(dayEvent.startDate))}
-                              </time>
-                              <p class='flex-auto truncate font-medium text-white'>
-                                {dayEvent.title}
-                              </p>
-                            </a>
-                          </li>
-                        ))}
-                        {dayEvents.length > 2
-                          ? (
-                            <li class='mb-1'>
-                              <a
-                                href={`/calendar/view=day&startDate=${shortIsoDate}`}
-                                class='flex bg-gray-700 px-2 py-1 rounded-md hover:no-underline hover:opacity-60'
-                                target='_blank'
-                              >
-                                <p class='flex-auto truncate font-medium text-white'>
-                                  ...{dayEvents.length - 2} more event{dayEvents.length - 2 === 1 ? '' : 's'}
-                                </p>
-                              </a>
-                            </li>
-                          )
-                          : null}
-                      </ol>
-                    )
-                    : null}
-                </section>
-              );
-            })
-          )}
-        </section>
-      </section>
-    </section>
-  );
-}
--- a/components/calendar/CalendarViewWeek.tsx
+++ b/components/calendar/CalendarViewWeek.tsx
@ -1,225 +0,0 @@
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { getCalendarEventStyle, getDaysForWeek } from '/public/ts/utils/calendar.ts';
-
-interface CalendarViewWeekProps {
-  startDate: Date;
-  visibleCalendars: Calendar[];
-  calendarEvents: CalendarEvent[];
-  onClickAddEvent: (startDate?: Date, isAllDay?: boolean) => void;
-  onClickOpenEvent: (calendarEvent: CalendarEvent) => void;
-  timezoneId: string;
-}
-
-export default function CalendarViewWeek(
-  { startDate, visibleCalendars, calendarEvents, onClickAddEvent, onClickOpenEvent, timezoneId }: CalendarViewWeekProps,
-) {
-  const today = new Date().toISOString().substring(0, 10);
-
-  const hourFormat = new Intl.DateTimeFormat('en-GB', {
-    hour12: false,
-    hour: '2-digit',
-    minute: '2-digit',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-  const weekDayFormat = new Intl.DateTimeFormat('en-GB', {
-    weekday: 'short',
-    day: 'numeric',
-    month: '2-digit',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-
-  const days = getDaysForWeek(new Date(startDate));
-
-  return (
-    <section class='shadow-md flex flex-auto flex-col rounded-md'>
-      <section class='w-full grid gap-px grid-flow-col rounded-md text-white text-xs bg-slate-600 calendar-week-view-days'>
-        {days.map((day, dayIndex) => {
-          const allDayEvents: CalendarEvent[] = calendarEvents.filter((calendarEvent) => {
-            if (!calendarEvent.isAllDay) {
-              return false;
-            }
-
-            const startDayDate = new Date(day.date);
-            const endDayDate = new Date(day.date);
-            endDayDate.setUTCHours(23);
-            endDayDate.setUTCMinutes(59);
-            endDayDate.setUTCSeconds(59);
-            endDayDate.setUTCMilliseconds(999);
-
-            const eventStartDate = new Date(calendarEvent.startDate);
-            const eventEndDate = new Date(calendarEvent.endDate);
-
-            // Event starts and ends on this day
-            if (eventStartDate >= startDayDate && eventEndDate <= endDayDate) {
-              return true;
-            }
-
-            // Event starts before and ends after this day
-            if (eventStartDate <= startDayDate && eventEndDate >= endDayDate) {
-              return true;
-            }
-
-            // Event starts on and ends after this day
-            if (
-              eventStartDate >= startDayDate && eventStartDate <= endDayDate && eventEndDate >= endDayDate
-            ) {
-              return true;
-            }
-
-            // Event starts before and ends on this day
-            if (
-              eventStartDate <= startDayDate && eventEndDate >= startDayDate && eventEndDate <= endDayDate
-            ) {
-              return true;
-            }
-
-            return false;
-          });
-
-          const isFirstDay = dayIndex === 0;
-          const isLastDay = dayIndex === 6;
-          const isToday = new Date(day.date).toISOString().substring(0, 10) === today;
-
-          return (
-            <>
-              <section
-                class={`flex justify-center ${isToday ? 'bg-[#51A4FB]' : 'bg-gray-900'} py-2 ${
-                  isFirstDay ? 'rounded-tl-md' : ''
-                } ${isLastDay ? 'rounded-tr-md' : ''} text-center text-xs font-semibold text-white`}
-              >
-                <span>{weekDayFormat.format(day.date)}</span>
-              </section>
-              <section
-                class={`relative bg-slate-700 min-h-8 px-3 py-2 text-slate-100`}
-              >
-                <time
-                  datetime={new Date(startDate).toISOString().substring(0, 10)}
-                  onClick={() => onClickAddEvent(new Date(startDate), true)}
-                  class='cursor-pointer'
-                  title='Add a new all-day event'
-                >
-                  All-day
-                </time>
-                {allDayEvents.length > 0
-                  ? (
-                    <ol class='mt-2'>
-                      {allDayEvents.map((calendarEvent) => (
-                        <li class='mb-1'>
-                          <a
-                            href='javascript:void(0);'
-                            class={`flex px-2 py-2 rounded-md hover:no-underline hover:opacity-60`}
-                            style={getCalendarEventStyle(calendarEvent, visibleCalendars)}
-                            onClick={() => onClickOpenEvent(calendarEvent)}
-                          >
-                            <p class='flex-auto truncate font-medium text-white'>
-                              {calendarEvent.title}
-                            </p>
-                          </a>
-                        </li>
-                      ))}
-                    </ol>
-                  )
-                  : null}
-              </section>
-              {day.hours.map((hour, hourIndex) => {
-                const shortIsoDate = hour.date.toISOString().substring(0, 10);
-
-                const startHourDate = new Date(shortIsoDate);
-                startHourDate.setUTCHours(hour.date.getUTCHours());
-                const endHourDate = new Date(shortIsoDate);
-                endHourDate.setUTCHours(hour.date.getUTCHours());
-                endHourDate.setUTCMinutes(59);
-                endHourDate.setUTCSeconds(59);
-                endHourDate.setUTCMilliseconds(999);
-
-                const isLastHourOfFirstDay = hourIndex === 23 && dayIndex === 0;
-                const isLastHourOfLastDay = hourIndex === 23 && dayIndex === 6;
-
-                const hourEvents = calendarEvents.filter((calendarEvent) => {
-                  if (calendarEvent.isAllDay) {
-                    return false;
-                  }
-
-                  const eventStartDate = new Date(calendarEvent.startDate);
-                  const eventEndDate = new Date(calendarEvent.endDate);
-                  eventEndDate.setUTCSeconds(eventEndDate.getUTCSeconds() - 1); // Take one second back so events don't bleed into the next hour
-
-                  // Event starts and ends on this hour
-                  if (eventStartDate >= startHourDate && eventEndDate <= endHourDate) {
-                    return true;
-                  }
-
-                  // Event starts before and ends after this hour
-                  if (eventStartDate <= startHourDate && eventEndDate >= endHourDate) {
-                    return true;
-                  }
-
-                  // Event starts on and ends after this hour
-                  if (
-                    eventStartDate >= startHourDate && eventStartDate <= endHourDate &&
-                    eventEndDate >= endHourDate
-                  ) {
-                    return true;
-                  }
-
-                  // Event starts before and ends on this hour
-                  if (
-                    eventStartDate <= startHourDate && eventEndDate >= startHourDate &&
-                    eventEndDate <= endHourDate
-                  ) {
-                    return true;
-                  }
-
-                  return false;
-                });
-
-                return (
-                  <section
-                    class={`relative ${hour.isCurrentHour ? 'bg-slate-600' : 'bg-slate-700'} px-3 py-2 ${
-                      hour.isCurrentHour ? '' : 'text-slate-100'
-                    } ${isLastHourOfFirstDay ? 'rounded-bl-md' : ''} ${isLastHourOfLastDay ? 'rounded-br-md' : ''}`}
-                  >
-                    <time
-                      datetime={startHourDate.toISOString()}
-                      onClick={() => onClickAddEvent(startHourDate)}
-                      class='cursor-pointer'
-                      title='Add a new event'
-                    >
-                      {hourFormat.format(startHourDate)}
-                    </time>
-                    {hourEvents.length > 0
-                      ? (
-                        <ol class='mt-2'>
-                          {hourEvents.map((hourEvent) => (
-                            <li class='mb-1'>
-                              <a
-                                href='javascript:void(0);'
-                                class={`flex px-2 py-2 rounded-md hover:no-underline hover:opacity-60`}
-                                style={getCalendarEventStyle(hourEvent, visibleCalendars)}
-                                onClick={() => onClickOpenEvent(hourEvent)}
-                              >
-                                <time
-                                  datetime={new Date(hourEvent.startDate).toISOString()}
-                                  class='mr-2 flex-none text-slate-100 block'
-                                >
-                                  {hourFormat.format(new Date(hourEvent.startDate))}
-                                </time>
-                                <p class='flex-auto truncate font-medium text-white'>
-                                  {hourEvent.title}
-                                </p>
-                              </a>
-                            </li>
-                          ))}
-                        </ol>
-                      )
-                      : null}
-                  </section>
-                );
-              })}
-            </>
-          );
-        })}
-      </section>
-    </section>
-  );
-}
--- a/components/calendar/Calendars.tsx
+++ b/components/calendar/Calendars.tsx
@ -1,329 +0,0 @@
-import { useSignal } from '@preact/signals';
-
-import { Calendar } from '/lib/models/calendar.ts';
-import { CALENDAR_COLOR_OPTIONS, getColorAsHex } from '/public/ts/utils/calendar.ts';
-import { RequestBody as AddRequestBody, ResponseBody as AddResponseBody } from '/pages/api/calendar/add.ts';
-import { RequestBody as UpdateRequestBody, ResponseBody as UpdateResponseBody } from '/pages/api/calendar/update.ts';
-import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/pages/api/calendar/delete.ts';
-
-interface CalendarsProps {
-  initialCalendars: Calendar[];
-}
-
-export default function Calendars({ initialCalendars }: CalendarsProps) {
-  const isAdding = useSignal<boolean>(false);
-  const isDeleting = useSignal<boolean>(false);
-  const isSaving = useSignal<boolean>(false);
-  const calendars = useSignal<Calendar[]>(initialCalendars);
-  const openCalendar = useSignal<Calendar | null>(null);
-
-  async function onClickAddCalendar() {
-    if (isAdding.value) {
-      return;
-    }
-
-    const name = (prompt(`What's the **name** for the new calendar?`) || '').trim();
-
-    if (!name) {
-      alert('A name is required for a new calendar!');
-      return;
-    }
-
-    isAdding.value = true;
-
-    try {
-      const requestBody: AddRequestBody = { name };
-      const response = await fetch(`/api/calendar/add`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to add calendar! ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as AddResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to add calendar!');
-      }
-
-      calendars.value = [...result.newCalendars];
-    } catch (error) {
-      console.error(error);
-    }
-
-    isAdding.value = false;
-  }
-
-  async function onClickDeleteCalendar(calendarId: string) {
-    if (confirm('Are you sure you want to delete this calendar and all its events?')) {
-      if (isDeleting.value) {
-        return;
-      }
-
-      isDeleting.value = true;
-
-      try {
-        const requestBody: DeleteRequestBody = { calendarId };
-        const response = await fetch(`/api/calendar/delete`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete calendar! ${response.statusText} ${await response.text()}`);
-        }
-
-        const result = await response.json() as DeleteResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to delete calendar!');
-        }
-
-        calendars.value = [...result.newCalendars];
-      } catch (error) {
-        console.error(error);
-      }
-
-      isDeleting.value = false;
-    }
-  }
-
-  async function onClickSaveOpenCalendar() {
-    if (isSaving.value) {
-      return;
-    }
-
-    if (!openCalendar.value?.uid) {
-      alert('A calendar is required to update one!');
-      return;
-    }
-
-    if (!openCalendar.value?.displayName) {
-      alert('A name is required to update the calendar!');
-      return;
-    }
-
-    if (!openCalendar.value?.calendarColor) {
-      alert('A color is required to update the calendar!');
-      return;
-    }
-
-    isSaving.value = true;
-
-    try {
-      const requestBody: UpdateRequestBody = {
-        id: openCalendar.value.uid!,
-        name: openCalendar.value.displayName!,
-        color: openCalendar.value.calendarColor!,
-        isVisible: openCalendar.value.isVisible!,
-      };
-      const response = await fetch(`/api/calendar/update`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-      const result = await response.json() as UpdateResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to update calendar!');
-      }
-
-      calendars.value = [...result.newCalendars];
-    } catch (error) {
-      console.error(error);
-    }
-
-    isSaving.value = false;
-    openCalendar.value = null;
-  }
-
-  return (
-    <>
-      <section class='flex flex-row items-center justify-between mb-4'>
-        <a href='/calendar' class='mr-2'>View calendar</a>
-        <section class='flex items-center'>
-          <button
-            class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2'
-            type='button'
-            title='Add new calendar'
-            onClick={() => onClickAddCalendar()}
-          >
-            <img
-              src='/public/images/add.svg'
-              alt='Add new calendar'
-              class={`white ${isAdding.value ? 'animate-spin' : ''}`}
-              width={20}
-              height={20}
-            />
-          </button>
-        </section>
-      </section>
-
-      <section class='mx-auto max-w-7xl my-8'>
-        <table class='w-full border-collapse bg-gray-900 text-left text-sm text-white shadow-sm rounded-md'>
-          <thead>
-            <tr>
-              <th scope='col' class='px-6 py-4 font-medium'>Name</th>
-              <th scope='col' class='px-6 py-4 font-medium'>Color</th>
-              <th scope='col' class='px-6 py-4 font-medium'>Visible?</th>
-              <th scope='col' class='px-6 py-4 font-medium w-20'></th>
-            </tr>
-          </thead>
-          <tbody class='divide-y divide-slate-600 border-t border-slate-600'>
-            {calendars.value.map((calendar) => (
-              <tr class='bg-slate-700 hover:bg-slate-600 group'>
-                <td class='flex gap-3 px-6 py-4 font-medium'>
-                  {calendar.displayName}
-                </td>
-                <td class='px-6 py-4 text-slate-200'>
-                  <span
-                    class={`w-5 h-5 inline-block rounded-full cursor-pointer`}
-                    title={calendar.calendarColor}
-                    style={{ backgroundColor: calendar.calendarColor }}
-                    onClick={() => openCalendar.value = { ...calendar }}
-                  >
-                  </span>
-                </td>
-                <td class='px-6 py-4'>
-                  {calendar.isVisible ? 'Yes' : 'No'}
-                </td>
-                <td class='px-6 py-4'>
-                  <span
-                    class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100'
-                    onClick={() => onClickDeleteCalendar(calendar.uid!)}
-                  >
-                    <img
-                      src='/public/images/delete.svg'
-                      class='red drop-shadow-md'
-                      width={24}
-                      height={24}
-                      alt='Delete calendar'
-                      title='Delete calendar'
-                    />
-                  </span>
-                </td>
-              </tr>
-            ))}
-            {calendars.value.length === 0
-              ? (
-                <tr>
-                  <td class='flex gap-3 px-6 py-4 font-normal' colspan={4}>
-                    <div class='text-md'>
-                      <div class='font-medium text-slate-400'>No calendars to show</div>
-                    </div>
-                  </td>
-                </tr>
-              )
-              : null}
-          </tbody>
-        </table>
-
-        <span
-          class={`flex justify-end items-center text-sm mt-1 mx-2 text-slate-100`}
-        >
-          {isDeleting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
-              </>
-            )
-            : null}
-          {isSaving.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
-              </>
-            )
-            : null}
-          {!isDeleting.value && !isSaving.value ? <>&nbsp;</> : null}
-        </span>
-      </section>
-
-      <section
-        class={`fixed ${openCalendar.value ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
-      >
-      </section>
-
-      <section
-        class={`fixed ${
-          openCalendar.value ? 'block' : 'hidden'
-        } z-50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-96 bg-slate-600 text-white rounded-md px-8 py-6 drop-shadow-lg`}
-      >
-        <h1 class='text-2xl font-semibold my-5'>Edit Calendar</h1>
-        <section class='py-5 my-2 border-y border-slate-500'>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='calendar_name'>Name</label>
-            <input
-              class='input-field'
-              type='text'
-              name='calendar_name'
-              id='calendar_name'
-              value={openCalendar.value?.displayName || ''}
-              onInput={(event) =>
-                openCalendar.value = { ...openCalendar.value!, displayName: event.currentTarget.value }}
-              placeholder='Personal'
-            />
-          </fieldset>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='calendar_color'>Color</label>
-            <section class='flex items-center justify-between'>
-              <select
-                class='input-field mr-2 w-5/6!'
-                name='calendar_color'
-                id='calendar_color'
-                value={openCalendar.value?.calendarColor || ''}
-                onChange={(event) =>
-                  openCalendar.value = { ...openCalendar.value!, calendarColor: event.currentTarget.value }}
-              >
-                {CALENDAR_COLOR_OPTIONS.map((color) => (
-                  <option
-                    key={color}
-                    value={getColorAsHex(color)}
-                    selected={openCalendar.value?.calendarColor === getColorAsHex(color)}
-                  >
-                    {color}
-                  </option>
-                ))}
-              </select>
-              <span
-                class={`w-5 h-5 block rounded-full`}
-                style={{ backgroundColor: openCalendar.value?.calendarColor }}
-                title={openCalendar.value?.calendarColor}
-              >
-              </span>
-            </section>
-          </fieldset>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='calendar_is_visible'>Visible?</label>
-            <input
-              type='checkbox'
-              name='calendar_is_visible'
-              id='calendar_is_visible'
-              value='true'
-              checked={openCalendar.value?.isVisible}
-              onChange={(event) =>
-                openCalendar.value = { ...openCalendar.value!, isVisible: event.currentTarget.checked }}
-            />
-          </fieldset>
-        </section>
-        <footer class='flex justify-between'>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClickSaveOpenCalendar()}
-          >
-            Save
-          </button>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => openCalendar.value = null}
-          >
-            Close
-          </button>
-        </footer>
-      </section>
-    </>
-  );
-}
--- a/components/calendar/ImportEventsModal.tsx
+++ b/components/calendar/ImportEventsModal.tsx
@ -1,86 +0,0 @@
-import { useSignal } from '@preact/signals';
-import { useEffect } from 'preact/hooks';
-
-import { Calendar } from '/lib/models/calendar.ts';
-
-interface ImportEventsModalProps {
-  isOpen: boolean;
-  calendars: Calendar[];
-  onClickImport: (calendarId: string) => void;
-  onClose: () => void;
-}
-
-export default function ImportEventsModal(
-  { isOpen, calendars, onClickImport, onClose }: ImportEventsModalProps,
-) {
-  const newCalendarId = useSignal<string | null>(null);
-
-  useEffect(() => {
-    if (!isOpen) {
-      newCalendarId.value = null;
-    } else {
-      newCalendarId.value = calendars[0]!.uid!;
-    }
-  }, [isOpen]);
-
-  return (
-    <>
-      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
-      >
-      </section>
-
-      <section
-        class={`fixed ${
-          newCalendarId.value ? 'block' : 'hidden'
-        } z-50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-96 bg-slate-600 text-white rounded-md px-8 py-6 drop-shadow-lg overflow-y-scroll max-h-[80%]`}
-      >
-        <h1 class='text-2xl font-semibold my-5'>Import Events</h1>
-        <section class='py-5 my-2 border-y border-slate-500'>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='event_calendar'>Calendar</label>
-            <section class='flex items-center justify-between'>
-              <select
-                class='input-field mr-2 w-5/6!'
-                name='event_calendar'
-                id='event_calendar'
-                value={newCalendarId.value || ''}
-                onChange={(event) => {
-                  newCalendarId.value = event.currentTarget.value;
-                }}
-              >
-                {calendars.map((calendar) => (
-                  <option key={calendar.uid} value={calendar.uid}>{calendar.displayName}</option>
-                ))}
-              </select>
-              <span
-                class={`w-5 h-5 block rounded-full`}
-                style={{
-                  backgroundColor: calendars.find((calendar) => calendar.uid === newCalendarId.value)?.calendarColor,
-                }}
-                title={calendars.find((calendar) => calendar.uid === newCalendarId.value)?.calendarColor}
-              >
-              </span>
-            </section>
-          </fieldset>
-        </section>
-        <footer class='flex justify-between'>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClickImport(newCalendarId.value!)}
-          >
-            Choose File
-          </button>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClose()}
-          >
-            Close
-          </button>
-        </footer>
-      </section>
-    </>
-  );
-}
--- a/components/calendar/MainCalendar.tsx
+++ b/components/calendar/MainCalendar.tsx
@ -1,654 +0,0 @@
-import { useSignal } from '@preact/signals';
-
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { capitalizeWord } from '/public/ts/utils/misc.ts';
-import { generateVCalendar } from '/public/ts/utils/calendar.ts';
-import {
-  RequestBody as ExportRequestBody,
-  ResponseBody as ExportResponseBody,
-} from '/pages/api/calendar/export-events.ts';
-import { RequestBody as AddRequestBody, ResponseBody as AddResponseBody } from '/pages/api/calendar/add-event.ts';
-import {
-  RequestBody as DeleteRequestBody,
-  ResponseBody as DeleteResponseBody,
-} from '/pages/api/calendar/delete-event.ts';
-import { RequestBody as ImportRequestBody, ResponseBody as ImportResponseBody } from '/pages/api/calendar/import.ts';
-import CalendarViewDay from './CalendarViewDay.tsx';
-import CalendarViewWeek from './CalendarViewWeek.tsx';
-import CalendarViewMonth from './CalendarViewMonth.tsx';
-import AddEventModal from './AddEventModal.tsx';
-import ViewEventModal from './ViewEventModal.tsx';
-import SearchEvents from './SearchEvents.tsx';
-import ImportEventsModal from './ImportEventsModal.tsx';
-
-interface MainCalendarProps {
-  initialCalendars: Calendar[];
-  initialCalendarEvents: CalendarEvent[];
-  view: 'day' | 'week' | 'month';
-  startDate: string;
-  baseUrl: string;
-  timezoneId: string;
-  timezoneUtcOffset: number;
-}
-
-export default function MainCalendar(
-  { initialCalendars, initialCalendarEvents, view, startDate, baseUrl, timezoneId }: MainCalendarProps,
-) {
-  const isAdding = useSignal<boolean>(false);
-  const isDeleting = useSignal<boolean>(false);
-  const isExporting = useSignal<boolean>(false);
-  const isImporting = useSignal<boolean>(false);
-  const calendars = useSignal<Calendar[]>(initialCalendars);
-  const isViewOptionsDropdownOpen = useSignal<boolean>(false);
-  const isImportExportOptionsDropdownOpen = useSignal<boolean>(false);
-  const calendarEvents = useSignal<CalendarEvent[]>(initialCalendarEvents);
-  const openEventModal = useSignal<
-    { isOpen: boolean; calendar?: typeof initialCalendars[number]; calendarEvent?: CalendarEvent }
-  >({ isOpen: false });
-  const newEventModal = useSignal<{ isOpen: boolean; initialStartDate?: Date; initiallyAllDay?: boolean }>({
-    isOpen: false,
-  });
-  const openImportModal = useSignal<
-    { isOpen: boolean }
-  >({ isOpen: false });
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', {
-    year: 'numeric',
-    month: 'long',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-  const today = new Date().toISOString().substring(0, 10);
-
-  const visibleCalendars = calendars.value.filter((calendar) => calendar.isVisible);
-
-  function onClickAddEvent(startDate = new Date(), isAllDay = false) {
-    if (newEventModal.value.isOpen) {
-      newEventModal.value = {
-        isOpen: false,
-      };
-      return;
-    }
-
-    if (calendars.value.length === 0) {
-      alert('You need to create a calendar first!');
-      return;
-    }
-
-    newEventModal.value = {
-      isOpen: true,
-      initialStartDate: startDate,
-      initiallyAllDay: isAllDay,
-    };
-  }
-
-  async function onClickSaveNewEvent(newEvent: CalendarEvent) {
-    if (isAdding.value) {
-      return;
-    }
-
-    if (!newEvent) {
-      return;
-    }
-
-    isAdding.value = true;
-
-    try {
-      const requestBody: AddRequestBody = {
-        calendarIds: visibleCalendars.map((calendar) => calendar.uid!),
-        calendarView: view,
-        calendarStartDate: startDate,
-        calendarId: newEvent.calendarId,
-        title: newEvent.title,
-        startDate: new Date(newEvent.startDate).toISOString(),
-        endDate: new Date(newEvent.endDate).toISOString(),
-        isAllDay: newEvent.isAllDay,
-      };
-      const response = await fetch(`/api/calendar/add-event`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-      const result = await response.json() as AddResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to add event!');
-      }
-
-      calendarEvents.value = [...result.newCalendarEvents];
-
-      newEventModal.value = {
-        isOpen: false,
-      };
-    } catch (error) {
-      console.error(error);
-    }
-
-    isAdding.value = false;
-  }
-
-  function onCloseNewEvent() {
-    newEventModal.value = {
-      isOpen: false,
-    };
-  }
-
-  function toggleImportExportOptionsDropdown() {
-    isImportExportOptionsDropdownOpen.value = !isImportExportOptionsDropdownOpen.value;
-  }
-
-  function toggleViewOptionsDropdown() {
-    isViewOptionsDropdownOpen.value = !isViewOptionsDropdownOpen.value;
-  }
-
-  function onClickOpenEvent(calendarEvent: CalendarEvent) {
-    if (openEventModal.value.isOpen) {
-      openEventModal.value = {
-        isOpen: false,
-      };
-      return;
-    }
-
-    const calendar = calendars.value.find((calendar) => calendar.uid === calendarEvent.calendarId)!;
-
-    openEventModal.value = {
-      isOpen: true,
-      calendar,
-      calendarEvent,
-    };
-  }
-
-  async function onClickDeleteEvent(calendarEventId: string) {
-    if (confirm('Are you sure you want to delete this event?')) {
-      if (isDeleting.value) {
-        return;
-      }
-
-      isDeleting.value = true;
-
-      try {
-        const requestBody: DeleteRequestBody = {
-          calendarIds: visibleCalendars.map((calendar) => calendar.uid!),
-          calendarView: view,
-          calendarStartDate: startDate,
-          calendarEventId,
-          calendarId: calendarEvents.value.find((calendarEvent) => calendarEvent.uid === calendarEventId)!.calendarId,
-        };
-        const response = await fetch(`/api/calendar/delete-event`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-        const result = await response.json() as DeleteResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to delete event!');
-        }
-
-        calendarEvents.value = [...result.newCalendarEvents];
-      } catch (error) {
-        console.error(error);
-      }
-
-      isDeleting.value = false;
-
-      openEventModal.value = { isOpen: false };
-    }
-  }
-
-  function onCloseOpenEvent() {
-    openEventModal.value = {
-      isOpen: false,
-    };
-  }
-
-  function onClickChangeStartDate(changeTo: 'previous' | 'next' | 'today') {
-    const previousDay = new Date(new Date(startDate).setUTCDate(new Date(startDate).getUTCDate() - 1)).toISOString()
-      .substring(0, 10);
-    const nextDay = new Date(new Date(startDate).setUTCDate(new Date(startDate).getUTCDate() + 1)).toISOString()
-      .substring(0, 10);
-    const previousWeek = new Date(new Date(startDate).setUTCDate(new Date(startDate).getUTCDate() - 7)).toISOString()
-      .substring(0, 10);
-    const nextWeek = new Date(new Date(startDate).setUTCDate(new Date(startDate).getUTCDate() + 7)).toISOString()
-      .substring(0, 10);
-    const previousMonth = new Date(new Date(startDate).setUTCMonth(new Date(startDate).getUTCMonth() - 1)).toISOString()
-      .substring(0, 10);
-    const nextMonth = new Date(new Date(startDate).setUTCMonth(new Date(startDate).getUTCMonth() + 1)).toISOString()
-      .substring(0, 10);
-
-    if (changeTo === 'today') {
-      if (today === startDate) {
-        return;
-      }
-
-      window.location.href = `/calendar?view=${view}&startDate=${today}`;
-      return;
-    }
-
-    if (changeTo === 'previous') {
-      let newStartDate = previousMonth;
-
-      if (view === 'day') {
-        newStartDate = previousDay;
-      } else if (view === 'week') {
-        newStartDate = previousWeek;
-      }
-
-      if (newStartDate === startDate) {
-        return;
-      }
-
-      window.location.href = `/calendar?view=${view}&startDate=${newStartDate}`;
-      return;
-    }
-
-    let newStartDate = nextMonth;
-
-    if (view === 'day') {
-      newStartDate = nextDay;
-    } else if (view === 'week') {
-      newStartDate = nextWeek;
-    }
-
-    if (newStartDate === startDate) {
-      return;
-    }
-
-    window.location.href = `/calendar?view=${view}&startDate=${newStartDate}`;
-  }
-
-  function onClickChangeView(newView: MainCalendarProps['view']) {
-    if (view === newView) {
-      isViewOptionsDropdownOpen.value = false;
-      return;
-    }
-
-    window.location.href = `/calendar?view=${newView}&startDate=${startDate}`;
-  }
-
-  function onClickImportICS() {
-    openImportModal.value = { isOpen: true };
-    isImportExportOptionsDropdownOpen.value = false;
-  }
-
-  function onClickChooseImportCalendar(calendarId: string) {
-    isImportExportOptionsDropdownOpen.value = false;
-
-    if (isImporting.value) {
-      return;
-    }
-
-    const fileInput = document.createElement('input');
-    fileInput.type = 'file';
-    fileInput.click();
-
-    fileInput.onchange = (event) => {
-      const files = (event.target as HTMLInputElement)?.files!;
-      const file = files[0];
-
-      if (!file) {
-        return;
-      }
-
-      const reader = new FileReader();
-      reader.onload = async (fileRead) => {
-        const importFileContents = fileRead.target?.result;
-
-        if (!importFileContents || isImporting.value) {
-          return;
-        }
-
-        isImporting.value = true;
-
-        openImportModal.value = { isOpen: false };
-
-        try {
-          const icsToImport = importFileContents!.toString();
-
-          const requestBody: ImportRequestBody = {
-            icsToImport,
-            calendarIds: visibleCalendars.map((calendar) => calendar.uid!),
-            calendarView: view,
-            calendarStartDate: startDate,
-            calendarId,
-          };
-
-          const response = await fetch(`/api/calendar/import`, {
-            method: 'POST',
-            body: JSON.stringify(requestBody),
-          });
-          const result = await response.json() as ImportResponseBody;
-
-          if (!result.success) {
-            throw new Error('Failed to import file!');
-          }
-
-          calendarEvents.value = [...result.newCalendarEvents];
-        } catch (error) {
-          console.error(error);
-        }
-
-        isImporting.value = false;
-      };
-
-      reader.readAsText(file, 'UTF-8');
-    };
-  }
-
-  async function onClickExportICS() {
-    isImportExportOptionsDropdownOpen.value = false;
-
-    if (isExporting.value) {
-      return;
-    }
-
-    isExporting.value = true;
-
-    const fileName = ['calendar-', new Date().toISOString().substring(0, 19).replace(/:/g, '-'), '.ics']
-      .join('');
-
-    try {
-      const requestBody: ExportRequestBody = { calendarIds: visibleCalendars.map((calendar) => calendar.uid!) };
-      const response = await fetch(`/api/calendar/export-events`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-      const result = await response.json() as ExportResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to get contact!');
-      }
-
-      const exportContents = generateVCalendar([...result.calendarEvents]);
-
-      // Add content-type
-      const vCardContent = ['data:text/calendar; charset=utf-8,', encodeURIComponent(exportContents)].join('');
-
-      // Download the file
-      const data = vCardContent;
-      const link = document.createElement('a');
-      link.setAttribute('href', data);
-      link.setAttribute('download', fileName);
-      link.click();
-      link.remove();
-    } catch (error) {
-      console.error(error);
-    }
-
-    isExporting.value = false;
-  }
-
-  return (
-    <>
-      <section class='flex flex-row items-center justify-between mb-4'>
-        <section class='relative inline-block text-left mr-2'>
-          <section class='flex flex-row items-center justify-start'>
-            <a href='/calendars' class='mr-4 whitespace-nowrap'>Manage calendars</a>
-            <SearchEvents calendars={visibleCalendars} onClickOpenEvent={onClickOpenEvent} />
-          </section>
-        </section>
-
-        <section class='flex items-center justify-end'>
-          <h3 class='text-base font-semibold text-white whitespace-nowrap mr-2'>
-            <time datetime={startDate}>{dateFormat.format(new Date(startDate))}</time>
-          </h3>
-          <section class='ml-2 relative flex items-center rounded-md bg-slate-700 shadow-sm md:items-stretch'>
-            <button
-              type='button'
-              class='flex h-9 w-12 items-center justify-center rounded-l-md text-white hover:bg-slate-600 focus:relative'
-              onClick={() => onClickChangeStartDate('previous')}
-            >
-              <span class='sr-only'>Previous {view}</span>
-              <svg class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                <path
-                  fill-rule='evenodd'
-                  d='M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z'
-                  clip-rule='evenodd'
-                />
-              </svg>
-            </button>
-            <button
-              type='button'
-              class='px-3.5 text-sm font-semibold text-white hover:bg-slate-600 focus:relative'
-              onClick={() => onClickChangeStartDate('today')}
-            >
-              Today
-            </button>
-            <button
-              type='button'
-              class='flex h-9 w-12 items-center justify-center rounded-r-md text-white hover:bg-slate-600 pl-1 focus:relative'
-              onClick={() => onClickChangeStartDate('next')}
-            >
-              <span class='sr-only'>Next {view}</span>
-              <svg class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                <path
-                  fill-rule='evenodd'
-                  d='M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z'
-                  clip-rule='evenodd'
-                />
-              </svg>
-            </button>
-          </section>
-          <section class='relative inline-block text-left ml-2'>
-            <div>
-              <button
-                type='button'
-                class='inline-flex w-full justify-center gap-x-1.5 rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-600'
-                id='view-button'
-                aria-expanded='true'
-                aria-haspopup='true'
-                onClick={() => toggleViewOptionsDropdown()}
-              >
-                {capitalizeWord(view)}
-                <svg class='-mr-1 h-5 w-5 text-white' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                  <path
-                    fill-rule='evenodd'
-                    d='M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z'
-                    clip-rule='evenodd'
-                  />
-                </svg>
-              </button>
-            </div>
-
-            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
-                !isViewOptionsDropdownOpen.value ? 'hidden' : ''
-              }`}
-              role='menu'
-              aria-orientation='vertical'
-              aria-labelledby='view-button'
-              tabindex={-1}
-            >
-              <div class='py-1'>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600 ${
-                    view === 'day' ? 'font-semibold' : ''
-                  }`}
-                  onClick={() => onClickChangeView('day')}
-                >
-                  Day
-                </button>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600 ${
-                    view === 'week' ? 'font-semibold' : ''
-                  }`}
-                  onClick={() => onClickChangeView('week')}
-                >
-                  Week
-                </button>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600 ${
-                    view === 'month' ? 'font-semibold' : ''
-                  }`}
-                  onClick={() => onClickChangeView('month')}
-                >
-                  Month
-                </button>
-              </div>
-            </div>
-          </section>
-          <section class='relative inline-block text-left ml-2'>
-            <div>
-              <button
-                type='button'
-                class='inline-flex w-full justify-center gap-x-1.5 rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-600'
-                id='import-export-button'
-                aria-expanded='true'
-                aria-haspopup='true'
-                onClick={() => toggleImportExportOptionsDropdown()}
-              >
-                ICS
-                <svg class='-mr-1 h-5 w-5 text-slate-400' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                  <path
-                    fill-rule='evenodd'
-                    d='M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z'
-                    clip-rule='evenodd'
-                  />
-                </svg>
-              </button>
-            </div>
-
-            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
-                !isImportExportOptionsDropdownOpen.value ? 'hidden' : ''
-              }`}
-              role='menu'
-              aria-orientation='vertical'
-              aria-labelledby='import-export-button'
-              tabindex={-1}
-            >
-              <div class='py-1'>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                  onClick={() => onClickImportICS()}
-                >
-                  Import ICS
-                </button>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                  onClick={() => onClickExportICS()}
-                >
-                  Export ICS
-                </button>
-              </div>
-            </div>
-          </section>
-          <button
-            class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2'
-            type='button'
-            title='Add new event'
-            onClick={() => onClickAddEvent()}
-          >
-            <img
-              src='/public/images/add.svg'
-              alt='Add new event'
-              class={`white ${isAdding.value ? 'animate-spin' : ''}`}
-              width={20}
-              height={20}
-            />
-          </button>
-        </section>
-      </section>
-
-      <section class='mx-auto max-w-7xl my-8'>
-        {view === 'day'
-          ? (
-            <CalendarViewDay
-              startDate={new Date(startDate)}
-              visibleCalendars={visibleCalendars}
-              calendarEvents={calendarEvents.value}
-              onClickAddEvent={onClickAddEvent}
-              onClickOpenEvent={onClickOpenEvent}
-              timezoneId={timezoneId}
-            />
-          )
-          : null}
-        {view === 'week'
-          ? (
-            <CalendarViewWeek
-              startDate={new Date(startDate)}
-              visibleCalendars={visibleCalendars}
-              calendarEvents={calendarEvents.value}
-              onClickAddEvent={onClickAddEvent}
-              onClickOpenEvent={onClickOpenEvent}
-              timezoneId={timezoneId}
-            />
-          )
-          : null}
-        {view === 'month'
-          ? (
-            <CalendarViewMonth
-              startDate={new Date(startDate)}
-              visibleCalendars={visibleCalendars}
-              calendarEvents={calendarEvents.value}
-              onClickAddEvent={onClickAddEvent}
-              onClickOpenEvent={onClickOpenEvent}
-              timezoneId={timezoneId}
-            />
-          )
-          : null}
-
-        <span
-          class={`flex justify-end items-center text-sm mt-1 mx-2 text-slate-100`}
-        >
-          {isDeleting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
-              </>
-            )
-            : null}
-          {isExporting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Exporting...
-              </>
-            )
-            : null}
-          {isImporting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Importing...
-              </>
-            )
-            : null}
-          {!isDeleting.value && !isExporting.value && !isImporting.value ? <>&nbsp;</> : null}
-        </span>
-      </section>
-
-      <section class='flex flex-row items-center justify-start my-12'>
-        <span class='font-semibold'>CalDav URL:</span>{' '}
-        <code class='bg-slate-600 mx-2 px-2 py-1 rounded-md'>{baseUrl}/caldav</code>
-      </section>
-
-      <AddEventModal
-        isOpen={newEventModal.value.isOpen}
-        initialStartDate={newEventModal.value.initialStartDate}
-        initiallyAllDay={newEventModal.value.initiallyAllDay}
-        calendars={calendars.value}
-        onClickSave={onClickSaveNewEvent}
-        onClose={onCloseNewEvent}
-      />
-
-      <ViewEventModal
-        isOpen={openEventModal.value.isOpen}
-        calendar={openEventModal.value.calendar!}
-        calendarEvent={openEventModal.value.calendarEvent!}
-        onClickDelete={onClickDeleteEvent}
-        onClose={onCloseOpenEvent}
-        timezoneId={timezoneId}
-      />
-
-      <ImportEventsModal
-        isOpen={openImportModal.value.isOpen}
-        calendars={calendars.value}
-        onClickImport={onClickChooseImportCalendar}
-        onClose={() => {
-          openImportModal.value = { isOpen: false };
-        }}
-      />
-    </>
-  );
-}
--- a/components/calendar/SearchEvents.tsx
+++ b/components/calendar/SearchEvents.tsx
@ -1,153 +0,0 @@
-import { useSignal } from '@preact/signals';
-import { useEffect } from 'preact/hooks';
-
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { RequestBody, ResponseBody } from '/pages/api/calendar/search-events.ts';
-import { getColorAsHex } from '/public/ts/utils/calendar.ts';
-
-interface SearchEventsProps {
-  calendars: Calendar[];
-  onClickOpenEvent: (calendarEvent: CalendarEvent) => void;
-}
-
-export default function SearchEvents({ calendars, onClickOpenEvent }: SearchEventsProps) {
-  const isSearching = useSignal<boolean>(false);
-  const areResultsVisible = useSignal<boolean>(false);
-  const calendarEvents = useSignal<CalendarEvent[]>([]);
-  const searchTimeout = useSignal<ReturnType<typeof setTimeout>>(0);
-  const closeTimeout = useSignal<ReturnType<typeof setTimeout>>(0);
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: '2-digit',
-    timeZone: 'UTC', // Calendar dates are parsed without timezone info, so we need to force to UTC so it's consistent across db, server, and client
-  });
-
-  const calendarIds = calendars.map((calendar) => calendar.uid!);
-
-  function searchEvents(searchTerm: string) {
-    if (searchTimeout.value) {
-      clearTimeout(searchTimeout.value);
-    }
-
-    if (searchTerm.trim().length < 2) {
-      return;
-    }
-
-    areResultsVisible.value = false;
-
-    searchTimeout.value = setTimeout(async () => {
-      isSearching.value = true;
-
-      try {
-        const requestBody: RequestBody = { calendarIds, searchTerm };
-        const response = await fetch(`/api/calendar/search-events`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-        const result = await response.json() as ResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to search events!');
-        }
-
-        calendarEvents.value = result.matchingCalendarEvents;
-
-        if (calendarEvents.value.length > 0) {
-          areResultsVisible.value = true;
-        }
-      } catch (error) {
-        console.error(error);
-      }
-
-      isSearching.value = false;
-    }, 500);
-  }
-
-  function onFocus() {
-    if (calendarEvents.value.length > 0) {
-      areResultsVisible.value = true;
-    }
-  }
-
-  function onBlur() {
-    if (closeTimeout.value) {
-      clearTimeout(closeTimeout.value);
-    }
-
-    closeTimeout.value = setTimeout(() => {
-      areResultsVisible.value = false;
-    }, 300);
-  }
-
-  useEffect(() => {
-    return () => {
-      if (searchTimeout.value) {
-        clearTimeout(searchTimeout.value);
-      }
-
-      if (closeTimeout.value) {
-        clearTimeout(closeTimeout.value);
-      }
-    };
-  }, []);
-
-  return (
-    <>
-      <input
-        class='input-field w-72 mr-2'
-        type='search'
-        name='search'
-        placeholder='Search events...'
-        onInput={(event) => searchEvents(event.currentTarget.value)}
-        onFocus={() => onFocus()}
-        onBlur={() => onBlur()}
-      />
-      {isSearching.value ? <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} /> : null}
-      {areResultsVisible.value
-        ? (
-          <section class='relative inline-block text-left ml-2 text-xs'>
-            <section
-              class={`absolute right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none`}
-              role='menu'
-              aria-orientation='vertical'
-              aria-labelledby='view-button'
-              tabindex={-1}
-            >
-              <section class='py-1'>
-                <ol class='mt-2'>
-                  {calendarEvents.value.map((calendarEvent) => (
-                    <li class='mb-1'>
-                      <a
-                        href='javascript:void(0);'
-                        class={`block px-2 py-2 hover:no-underline hover:opacity-60`}
-                        style={{
-                          backgroundColor: calendars.find((calendar) => calendar.uid === calendarEvent.calendarId)
-                            ?.calendarColor || getColorAsHex('bg-gray-700'),
-                        }}
-                        onClick={() => onClickOpenEvent(calendarEvent)}
-                      >
-                        <time
-                          datetime={new Date(calendarEvent.startDate).toISOString()}
-                          class='mr-2 flex-none text-slate-100 block'
-                        >
-                          {dateFormat.format(new Date(calendarEvent.startDate))}
-                        </time>
-                        <p class='flex-auto truncate font-medium text-white'>
-                          {calendarEvent.title}
-                        </p>
-                      </a>
-                    </li>
-                  ))}
-                </ol>
-              </section>
-            </section>
-          </section>
-        )
-        : null}
-    </>
-  );
-}
--- a/components/calendar/ViewCalendarEvent.tsx
+++ b/components/calendar/ViewCalendarEvent.tsx
@ -1,275 +0,0 @@
-import { useSignal } from '@preact/signals';
-
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { capitalizeWord, convertObjectToFormData } from '/public/ts/utils/misc.ts';
-import { FormField, generateFieldHtml } from '/public/ts/utils/form.ts';
-import {
-  RequestBody as DeleteRequestBody,
-  ResponseBody as DeleteResponseBody,
-} from '/pages/api/calendar/delete-event.ts';
-
-interface ViewCalendarEventProps {
-  initialCalendarEvent: CalendarEvent;
-  calendars: Calendar[];
-  formData: Record<string, any>;
-  error?: string;
-  notice?: string;
-}
-
-export function formFields(calendarEvent: CalendarEvent, calendars: Calendar[], updateType: 'raw' | 'ui') {
-  const fields: FormField[] = [
-    {
-      name: 'update-type',
-      label: 'Update type',
-      type: 'hidden',
-      value: updateType,
-      readOnly: true,
-    },
-  ];
-
-  if (updateType === 'ui') {
-    fields.push({
-      name: 'title',
-      label: 'Title',
-      type: 'text',
-      placeholder: 'Dentis',
-      value: calendarEvent.title,
-      required: true,
-    }, {
-      name: 'calendarId',
-      label: 'Calendar',
-      type: 'select',
-      value: calendarEvent.calendarId,
-      options: calendars.map((calendar) => ({ label: calendar.displayName!, value: calendar.uid! })),
-      required: true,
-      description: 'Cannot be changed after the event has been created.',
-    }, {
-      name: 'startDate',
-      label: 'Start date',
-      type: 'datetime-local',
-      value: new Date(calendarEvent.startDate).toISOString().substring(0, 16),
-      required: true,
-      description: 'Dates are set in the default calendar timezone, controlled by Radicale.',
-    }, {
-      name: 'endDate',
-      label: 'End date',
-      type: 'datetime-local',
-      value: new Date(calendarEvent.endDate).toISOString().substring(0, 16),
-      required: true,
-      description: 'Dates are set in the default calendar timezone, controlled by Radicale.',
-    }, {
-      name: 'isAllDay',
-      label: 'All-day?',
-      type: 'checkbox',
-      placeholder: 'YYYYMMDD',
-      value: 'true',
-      required: false,
-      checked: calendarEvent.isAllDay,
-    }, {
-      name: 'status',
-      label: 'Status',
-      type: 'select',
-      value: calendarEvent.status,
-      options: (['scheduled', 'pending', 'canceled'] as CalendarEvent['status'][]).map((status) => ({
-        label: capitalizeWord(status),
-        value: status,
-      })),
-      required: true,
-    }, {
-      name: 'description',
-      label: 'Description',
-      type: 'textarea',
-      placeholder: 'Just a regular check-up.',
-      value: calendarEvent.description,
-      required: false,
-    }, {
-      name: 'eventUrl',
-      label: 'URL',
-      type: 'url',
-      placeholder: 'https://example.com',
-      value: calendarEvent.eventUrl,
-      required: false,
-    }, {
-      name: 'location',
-      label: 'Location',
-      type: 'text',
-      placeholder: 'Birmingham, UK',
-      value: calendarEvent.location,
-      required: false,
-    }, {
-      name: 'transparency',
-      label: 'Transparency',
-      type: 'select',
-      value: calendarEvent.transparency,
-      options: (['opaque', 'transparent'] as CalendarEvent['transparency'][]).map((
-        transparency,
-      ) => ({
-        label: capitalizeWord(transparency),
-        value: transparency,
-      })),
-      required: true,
-    });
-  } else if (updateType === 'raw') {
-    fields.push({
-      name: 'ics',
-      label: 'Raw ICS',
-      type: 'textarea',
-      placeholder: 'Raw ICS...',
-      value: calendarEvent.data,
-      description:
-        'This is the raw ICS for this event. Use this to manually update the event _if_ you know what you are doing.',
-      rows: '10',
-    });
-  }
-
-  return fields;
-}
-
-export default function ViewCalendarEvent(
-  { initialCalendarEvent, calendars, formData: formDataObject, error, notice }: ViewCalendarEventProps,
-) {
-  const isDeleting = useSignal<boolean>(false);
-  const calendarEvent = useSignal<CalendarEvent>(initialCalendarEvent);
-
-  const formData = convertObjectToFormData(formDataObject);
-
-  async function onClickDeleteEvent() {
-    const message = calendarEvent.peek().isRecurring
-      ? 'Are you sure you want to delete _all_ instances of this recurring event?'
-      : 'Are you sure you want to delete this event?';
-    if (confirm(message)) {
-      if (isDeleting.value) {
-        return;
-      }
-
-      isDeleting.value = true;
-
-      try {
-        const requestBody: DeleteRequestBody = {
-          calendarIds: calendars.map((calendar) => calendar.uid!),
-          calendarView: 'day',
-          calendarStartDate: new Date().toISOString().substring(0, 10),
-          calendarEventId: calendarEvent.value.uid!,
-          calendarId: calendarEvent.value.calendarId,
-        };
-        const response = await fetch(`/api/calendar/delete-event`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-        const result = await response.json() as DeleteResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to delete event!');
-        }
-
-        window.location.href = '/calendar';
-      } catch (error) {
-        console.error(error);
-      }
-
-      isDeleting.value = false;
-    }
-  }
-
-  return (
-    <>
-      <section class='flex flex-row items-center justify-between mb-4'>
-        <a href='/calendar' class='mr-2'>View calendar</a>
-        <section class='flex items-center'>
-          <button
-            class='inline-block justify-center gap-x-1.5 rounded-md bg-red-800 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-red-600 ml-2'
-            type='button'
-            title='Delete event'
-            onClick={() => onClickDeleteEvent()}
-          >
-            <img
-              src='/public/images/delete.svg'
-              alt='Delete event'
-              class={`white ${isDeleting.value ? 'animate-spin' : ''}`}
-              width={20}
-              height={20}
-            />
-          </button>
-        </section>
-      </section>
-
-      <section class='mx-auto max-w-7xl my-8'>
-        {error
-          ? (
-            <section class='notification-error'>
-              <h3>Failed to update!</h3>
-              <p>{error}</p>
-            </section>
-          )
-          : null}
-        {notice
-          ? (
-            <section class='notification-success'>
-              <h3>Success!</h3>
-              <p>{notice}</p>
-            </section>
-          )
-          : null}
-
-        <form method='POST' class='mb-12'>
-          <div
-            dangerouslySetInnerHTML={{
-              __html: formFields(calendarEvent.peek(), calendars, 'ui').map((field) =>
-                generateFieldHtml(field, formData)
-              ).join(''),
-            }}
-          />
-
-          <section class='flex justify-end items-center mt-8 mb-4'>
-            {calendarEvent.peek().isRecurring
-              ? (
-                <p class='text-sm text-slate-400 mr-4'>
-                  Note that you'll update all instances of this recurring event.
-                </p>
-              )
-              : null}
-            <button class='button' type='submit'>Update event</button>
-          </section>
-        </form>
-
-        <hr class='my-8 border-slate-700' />
-
-        <details class='mb-12 group'>
-          <summary class='text-slate-100 flex items-center font-bold cursor-pointer text-center justify-center mx-auto hover:text-sky-400'>
-            Edit Raw ICS{' '}
-            <span class='ml-2 text-slate-400 group-open:rotate-90 transition-transform duration-200'>
-              <img src='/public/images/right.svg' alt='Expand' width={16} height={16} class='white' />
-            </span>
-          </summary>
-
-          <form method='POST' class='mb-12'>
-            <div
-              dangerouslySetInnerHTML={{
-                __html: formFields(calendarEvent.peek(), calendars, 'raw').map((field) =>
-                  generateFieldHtml(field, formData)
-                ).join(''),
-              }}
-            />
-
-            <section class='flex justify-end mt-8 mb-4'>
-              <button class='button' type='submit'>Update ICS</button>
-            </section>
-          </form>
-        </details>
-
-        <span
-          class={`flex justify-end items-center text-sm mt-1 mx-2 text-slate-100`}
-        >
-          {isDeleting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
-              </>
-            )
-            : null}
-          {!isDeleting.value ? <>&nbsp;</> : null}
-        </span>
-      </section>
-    </>
-  );
-}
--- a/components/calendar/ViewEventModal.tsx
+++ b/components/calendar/ViewEventModal.tsx
@ -1,159 +0,0 @@
-import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
-import { convertRRuleToWords } from '/public/ts/utils/calendar.ts';
-
-interface ViewEventModalProps {
-  isOpen: boolean;
-  calendarEvent: CalendarEvent;
-  calendar: Calendar;
-  onClickDelete: (eventId: string) => void;
-  onClose: () => void;
-  timezoneId: string;
-}
-
-export default function ViewEventModal(
-  { isOpen, calendarEvent, calendar, onClickDelete, onClose, timezoneId }: ViewEventModalProps,
-) {
-  if (!calendarEvent || !calendar) {
-    return null;
-  }
-
-  const allDayEventDateFormat = new Intl.DateTimeFormat('en-GB', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-  const hourFormat = new Intl.DateTimeFormat('en-GB', {
-    hour12: false,
-    hour: '2-digit',
-    minute: '2-digit',
-    timeZone: timezoneId, // Calendar dates are parsed without timezone info, so we need to force to a specific one so it's consistent across db, server, and client
-  });
-
-  return (
-    <>
-      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
-      >
-      </section>
-
-      <section
-        class={`fixed ${
-          isOpen ? 'block' : 'hidden'
-        } z-50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 min-w-96 max-w-lg bg-slate-600 text-white rounded-md px-8 py-6 drop-shadow-lg overflow-y-scroll max-h-[80%]`}
-      >
-        <h1 class='text-2xl font-semibold my-5'>{calendarEvent.title}</h1>
-        <header class='py-5 border-t border-b border-slate-500 font-semibold flex justify-between items-center'>
-          <span>
-            {calendarEvent.startDate ? allDayEventDateFormat.format(new Date(calendarEvent.startDate)) : ''}
-          </span>
-          {calendarEvent.isAllDay ? <span>All-day</span> : (
-            <span>
-              {calendarEvent.startDate ? hourFormat.format(new Date(calendarEvent.startDate)) : ''} -{' '}
-              {calendarEvent.endDate ? hourFormat.format(new Date(calendarEvent.endDate)) : ''}
-            </span>
-          )}
-        </header>
-        <section class='py-5 my-0 border-b border-slate-500 flex justify-between items-center'>
-          <span>
-            {calendar.displayName}
-          </span>
-          <span
-            class={`w-5 h-5 ml-2 block rounded-full`}
-            title={calendar.calendarColor}
-            style={{ backgroundColor: calendar.calendarColor }}
-          />
-        </section>
-        {calendarEvent.description
-          ? (
-            <section class='py-5 my-0 border-b border-slate-500'>
-              <article class='overflow-auto max-w-full max-h-80 font-mono text-sm whitespace-pre-wrap'>
-                {calendarEvent.description}
-              </article>
-            </section>
-          )
-          : null}
-        {calendarEvent.eventUrl
-          ? (
-            <section class='py-5 my-0 border-b border-slate-500'>
-              <a href={calendarEvent.eventUrl} target='_blank' rel='noopener noreferrer'>
-                {calendarEvent.eventUrl}
-              </a>
-            </section>
-          )
-          : null}
-        {calendarEvent.location
-          ? (
-            <section class='py-5 my-0 border-b border-slate-500'>
-              <a
-                href={`https://www.openstreetmap.org/search?query=${encodeURIComponent(calendarEvent.location)}`}
-                target='_blank'
-                rel='noopener noreferrer'
-              >
-                {calendarEvent.location}
-              </a>
-            </section>
-          )
-          : null}
-        {Array.isArray(calendarEvent.attendees) && calendarEvent.attendees.length > 0
-          ? (
-            <section class='py-5 my-0 border-b border-slate-500'>
-              {calendarEvent.attendees.map((attendee) => (
-                <p class='my-1'>
-                  <a href={`mailto:${attendee.email}`} target='_blank' rel='noopener noreferrer'>
-                    {attendee.name || attendee.email}
-                  </a>{' '}
-                  - {attendee.status}
-                </p>
-              ))}
-            </section>
-          )
-          : null}
-        {calendarEvent.isRecurring && calendarEvent.recurringRrule
-          ? (
-            <section class='py-5 my-0 border-b border-slate-500'>
-              <p class='text-xs'>
-                Repeats {convertRRuleToWords(calendarEvent.recurringRrule, { capitalizeSentence: false })}.
-              </p>
-            </section>
-          )
-          : null}
-        {Array.isArray(calendarEvent.reminders) && calendarEvent.reminders.length > 0
-          ? (
-            <section class='py-5 my-0 border-b border-slate-500'>
-              {calendarEvent.reminders.map((reminder) => (
-                <p class='my-1 text-xs'>
-                  {reminder.description || 'Reminder'} at {hourFormat.format(new Date(reminder.startDate))} via{' '}
-                  {reminder.type}.
-                </p>
-              ))}
-            </section>
-          )
-          : null}
-        <footer class='flex justify-between mt-2'>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-red-600 text-white cursor-pointer rounded-md'
-            onClick={() => onClickDelete(calendarEvent.uid!)}
-          >
-            Delete
-          </button>
-          <a
-            href={`/calendar/${calendarEvent.uid}?calendarId=${calendar.uid}`}
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            target='_blank'
-          >
-            Edit
-          </a>
-          <button
-            type='button'
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClose()}
-          >
-            Close
-          </button>
-        </footer>
-      </section>
-    </>
-  );
-}
--- a/components/contacts/Contacts.tsx
+++ b/components/contacts/Contacts.tsx
@ -1,609 +0,0 @@
-import { useSignal } from '@preact/signals';
-
-import { AddressBook, Contact } from '/lib/models/contacts.ts';
-import { RequestBody as GetRequestBody, ResponseBody as GetResponseBody } from '/pages/api/contacts/get.ts';
-import { RequestBody as AddRequestBody, ResponseBody as AddResponseBody } from '/pages/api/contacts/add.ts';
-import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/pages/api/contacts/delete.ts';
-import { RequestBody as ImportRequestBody, ResponseBody as ImportResponseBody } from '/pages/api/contacts/import.ts';
-import {
-  RequestBody as AddAddressBookRequestBody,
-  ResponseBody as AddAddressBookResponseBody,
-} from '/pages/api/contacts/add-addressbook.ts';
-import {
-  RequestBody as DeleteAddressBookRequestBody,
-  ResponseBody as DeleteAddressBookResponseBody,
-} from '/pages/api/contacts/delete-addressbook.ts';
-
-interface ContactsProps {
-  initialAddressBookId: string;
-  initialContacts: Contact[];
-  initialAddressBooks: AddressBook[];
-  page: number;
-  contactsCount: number;
-  baseUrl: string;
-  search?: string;
-}
-
-const CONTACTS_PER_PAGE_COUNT = 10; // This helps make the UI a bit faster (less stuff to render)
-
-export default function Contacts(
-  { initialContacts, initialAddressBooks, page, contactsCount, search, initialAddressBookId, baseUrl }: ContactsProps,
-) {
-  const isAdding = useSignal<boolean>(false);
-  const isDeleting = useSignal<boolean>(false);
-  const isExporting = useSignal<boolean>(false);
-  const isImporting = useSignal<boolean>(false);
-  const contacts = useSignal<Contact[]>(initialContacts);
-  const addressBooks = useSignal<AddressBook[]>(initialAddressBooks);
-  const selectedAddressBookId = useSignal<string>(initialAddressBookId);
-  const selectedAddressBookName = useSignal<string>(
-    initialAddressBooks.find((addressBook) => addressBook.uid === initialAddressBookId)?.displayName || 'Address Book',
-  );
-  const isAddressBooksDropdownOpen = useSignal<boolean>(false);
-  const isOptionsDropdownOpen = useSignal<boolean>(false);
-
-  async function onClickAddContact() {
-    if (isAdding.value) {
-      return;
-    }
-
-    const firstName = (prompt(`What's the **first name** for the new contact?`) || '').trim();
-
-    if (!firstName) {
-      alert('A first name is required for a new contact!');
-      return;
-    }
-
-    const lastName = (prompt(`What's the **last name** for the new contact?`) || '').trim();
-
-    isAdding.value = true;
-
-    try {
-      const requestBody: AddRequestBody = { firstName, lastName, addressBookId: selectedAddressBookId.value };
-      const response = await fetch(`/api/contacts/add`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to add contact. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as AddResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to add contact!');
-      }
-
-      contacts.value = [...result.contacts];
-    } catch (error) {
-      console.error(error);
-    }
-
-    isAdding.value = false;
-  }
-
-  function toggleOptionsDropdown() {
-    isOptionsDropdownOpen.value = !isOptionsDropdownOpen.value;
-  }
-
-  async function onClickAddAddressBook() {
-    if (isAdding.value) {
-      return;
-    }
-
-    const name = (prompt(`What's the **name** for the new address book?`) || '').trim();
-
-    if (!name) {
-      alert('A name is required for a new address book!');
-      return;
-    }
-
-    isAdding.value = true;
-    isAddressBooksDropdownOpen.value = false;
-
-    try {
-      const requestBody: AddAddressBookRequestBody = { name };
-      const response = await fetch(`/api/contacts/add-addressbook`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to add address book. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as AddAddressBookResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to add address book!');
-      }
-
-      addressBooks.value = [...result.addressBooks];
-    } catch (error) {
-      console.error(error);
-    }
-
-    isAdding.value = false;
-  }
-
-  function toggleAddressBooksDropdown() {
-    isAddressBooksDropdownOpen.value = !isAddressBooksDropdownOpen.value;
-  }
-
-  function onClickSelectAddressBook(addressBookId: string) {
-    selectedAddressBookId.value = addressBookId;
-    selectedAddressBookName.value =
-      addressBooks.value.find((addressBook) => addressBook.uid === addressBookId)?.displayName ||
-      'Address Book';
-    isAddressBooksDropdownOpen.value = false;
-    window.location.href = `/contacts?addressBookId=${addressBookId}`;
-  }
-
-  async function onClickDeleteAddressBook(addressBookId: string) {
-    if (confirm('Are you sure you want to delete this address book?')) {
-      if (isDeleting.value) {
-        return;
-      }
-
-      isDeleting.value = true;
-
-      try {
-        const requestBody: DeleteAddressBookRequestBody = { addressBookId };
-        const response = await fetch(`/api/contacts/delete-addressbook`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete address book. ${response.statusText} ${await response.text()}`);
-        }
-
-        const result = await response.json() as DeleteAddressBookResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to delete address book!');
-        }
-
-        addressBooks.value = [...result.addressBooks];
-        selectedAddressBookId.value = '';
-        selectedAddressBookName.value = '';
-        window.location.href = `/contacts`;
-      } catch (error) {
-        console.error(error);
-      }
-
-      isDeleting.value = false;
-    }
-  }
-
-  async function onClickDeleteContact(contactId: string) {
-    if (confirm('Are you sure you want to delete this contact?')) {
-      if (isDeleting.value) {
-        return;
-      }
-
-      isDeleting.value = true;
-
-      try {
-        const requestBody: DeleteRequestBody = { contactId, addressBookId: selectedAddressBookId.value };
-        const response = await fetch(`/api/contacts/delete`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete contact. ${response.statusText} ${await response.text()}`);
-        }
-
-        const result = await response.json() as DeleteResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to delete contact!');
-        }
-
-        contacts.value = [...result.contacts];
-      } catch (error) {
-        console.error(error);
-      }
-
-      isDeleting.value = false;
-    }
-  }
-
-  function onClickImportVCard() {
-    isOptionsDropdownOpen.value = false;
-
-    if (isImporting.value) {
-      return;
-    }
-
-    const fileInput = document.createElement('input');
-    fileInput.type = 'file';
-    fileInput.click();
-
-    fileInput.onchange = (event) => {
-      const files = (event.target as HTMLInputElement)?.files!;
-      const file = files[0];
-
-      if (!file) {
-        return;
-      }
-
-      const reader = new FileReader();
-      reader.onload = async (fileRead) => {
-        const importFileContents = fileRead.target?.result;
-
-        if (!importFileContents || isImporting.value) {
-          return;
-        }
-
-        isImporting.value = true;
-
-        try {
-          const vCards = importFileContents!.toString();
-
-          const requestBody: ImportRequestBody = { addressBookId: selectedAddressBookId.value, vCards };
-          const response = await fetch(`/api/contacts/import`, {
-            method: 'POST',
-            body: JSON.stringify(requestBody),
-          });
-
-          if (!response.ok) {
-            throw new Error(`Failed to import contact. ${response.statusText} ${await response.text()}`);
-          }
-
-          const result = await response.json() as ImportResponseBody;
-
-          if (!result.success) {
-            throw new Error('Failed to import contact!');
-          }
-
-          contacts.value = [...result.contacts];
-        } catch (error) {
-          console.error(error);
-        }
-
-        isImporting.value = false;
-      };
-
-      reader.readAsText(file, 'UTF-8');
-    };
-  }
-
-  async function onClickExportVCard() {
-    isOptionsDropdownOpen.value = false;
-
-    if (isExporting.value) {
-      return;
-    }
-
-    isExporting.value = true;
-
-    const fileName = ['contacts-', new Date().toISOString().substring(0, 19).replace(/:/g, '-'), '.vcf']
-      .join('');
-
-    try {
-      const requestBody: GetRequestBody = { addressBookId: selectedAddressBookId.value };
-      const response = await fetch(`/api/contacts/get`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to export contact. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as GetResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to get contact!');
-      }
-
-      const exportContents = result.contacts.map((contact) => contact.data).join('\n\n');
-
-      // Add content-type
-      const vCardContent = ['data:text/vcard; charset=utf-8,', encodeURIComponent(exportContents)].join('');
-
-      // Download the file
-      const data = vCardContent;
-      const link = document.createElement('a');
-      link.setAttribute('href', data);
-      link.setAttribute('download', fileName);
-      link.click();
-      link.remove();
-    } catch (error) {
-      console.error(error);
-    }
-
-    isExporting.value = false;
-  }
-
-  const pagesCount = Math.ceil(contactsCount / CONTACTS_PER_PAGE_COUNT);
-  const pages = Array.from({ length: pagesCount }).map((_value, index) => index + 1);
-
-  return (
-    <>
-      <section class='flex flex-row items-center justify-between mb-4'>
-        <section class='relative inline-block text-left mr-2'>
-          <form method='GET' action={`/contacts?addressBookId=${selectedAddressBookId.value}`} class='m-0 p-0'>
-            <input
-              class='input-field w-60'
-              type='search'
-              name='search'
-              value={search}
-              placeholder='Search contacts...'
-            />
-          </form>
-        </section>
-        <section class='flex items-center'>
-          <section class='relative inline-block text-left ml-2'>
-            <div>
-              <button
-                type='button'
-                class='inline-flex w-full justify-center gap-x-1.5 rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-600 truncate'
-                id='select-address-book-button'
-                aria-expanded='true'
-                aria-haspopup='true'
-                onClick={() => toggleAddressBooksDropdown()}
-              >
-                {selectedAddressBookName.value}
-                <svg class='-mr-1 h-5 w-5 text-slate-400' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                  <path
-                    fill-rule='evenodd'
-                    d='M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z'
-                    clip-rule='evenodd'
-                  />
-                </svg>
-              </button>
-            </div>
-
-            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right divide-y divide-slate-600 rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
-                !isAddressBooksDropdownOpen.value ? 'hidden' : ''
-              }`}
-              role='menu'
-              aria-orientation='vertical'
-              aria-labelledby='select-address-book-button'
-              tabindex={-1}
-            >
-              {addressBooks.value.length > 1
-                ? (
-                  <div class='py-1'>
-                    {addressBooks.value.filter((addressBook) => addressBook.uid !== selectedAddressBookId.value).map((
-                      addressBook,
-                    ) => (
-                      <button
-                        type='button'
-                        class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600 truncate`}
-                        onClick={() => onClickSelectAddressBook(addressBook.uid!)}
-                      >
-                        {addressBook.displayName}
-                      </button>
-                    ))}
-                  </div>
-                )
-                : null}
-              <div class='py-1'>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                  onClick={() => onClickAddAddressBook()}
-                >
-                  New Address Book
-                </button>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-red-600`}
-                  onClick={() => onClickDeleteAddressBook(selectedAddressBookId.value)}
-                >
-                  Delete "{selectedAddressBookName.value}"
-                </button>
-              </div>
-            </div>
-          </section>
-          <section class='relative inline-block text-left ml-2'>
-            <div>
-              <button
-                type='button'
-                class='inline-flex w-full justify-center gap-x-1.5 rounded-md bg-slate-700 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-600'
-                id='import-export-button'
-                aria-expanded='true'
-                aria-haspopup='true'
-                onClick={() => toggleOptionsDropdown()}
-              >
-                VCF
-                <svg class='-mr-1 h-5 w-5 text-slate-400' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                  <path
-                    fill-rule='evenodd'
-                    d='M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z'
-                    clip-rule='evenodd'
-                  />
-                </svg>
-              </button>
-            </div>
-
-            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
-                !isOptionsDropdownOpen.value ? 'hidden' : ''
-              }`}
-              role='menu'
-              aria-orientation='vertical'
-              aria-labelledby='import-export-button'
-              tabindex={-1}
-            >
-              <div class='py-1'>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                  onClick={() => onClickImportVCard()}
-                >
-                  Import vCard
-                </button>
-                <button
-                  type='button'
-                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                  onClick={() => onClickExportVCard()}
-                >
-                  Export vCard
-                </button>
-              </div>
-            </div>
-          </section>
-          <button
-            class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2'
-            type='button'
-            title='Add new contact'
-            onClick={() => onClickAddContact()}
-          >
-            <img
-              src='/public/images/add.svg'
-              alt='Add new contact'
-              class={`white ${isAdding.value ? 'animate-spin' : ''}`}
-              width={20}
-              height={20}
-            />
-          </button>
-        </section>
-      </section>
-
-      <section class='mx-auto max-w-7xl my-8'>
-        <table class='w-full border-collapse bg-gray-900 text-left text-sm text-slate-500 shadow-sm rounded-md'>
-          <thead>
-            <tr class='border-b border-slate-600'>
-              <th scope='col' class='px-6 py-4 font-medium text-white'>First Name</th>
-              <th scope='col' class='px-6 py-4 font-medium text-white'>Last Name</th>
-              <th scope='col' class='px-6 py-4 font-medium text-white w-20'></th>
-            </tr>
-          </thead>
-          <tbody class='divide-y divide-slate-600 border-t border-slate-600'>
-            {contacts.value.map((contact) => (
-              <tr class='bg-slate-700 hover:bg-slate-600 group'>
-                <td class='flex gap-3 px-6 py-4 font-normal text-white'>
-                  <a href={`/contacts/${contact.uid}?addressBookId=${selectedAddressBookId.value}`}>
-                    {contact.firstName}
-                  </a>
-                </td>
-                <td class='px-6 py-4 text-slate-200'>
-                  {contact.lastName}
-                </td>
-                <td class='px-6 py-4'>
-                  <span
-                    class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100'
-                    onClick={() => onClickDeleteContact(contact.uid!)}
-                  >
-                    <img
-                      src='/public/images/delete.svg'
-                      class='red drop-shadow-md'
-                      width={24}
-                      height={24}
-                      alt='Delete contact'
-                      title='Delete contact'
-                    />
-                  </span>
-                </td>
-              </tr>
-            ))}
-            {contacts.value.length === 0
-              ? (
-                <tr>
-                  <td class='flex gap-3 px-6 py-4 font-normal' colspan={3}>
-                    <div class='text-md'>
-                      <div class='font-medium text-slate-400'>No contacts to show</div>
-                    </div>
-                  </td>
-                </tr>
-              )
-              : null}
-          </tbody>
-        </table>
-
-        <span
-          class={`flex justify-end items-center text-sm mt-1 mx-2 text-slate-100`}
-        >
-          {isDeleting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
-              </>
-            )
-            : null}
-          {isExporting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Exporting...
-              </>
-            )
-            : null}
-          {isImporting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Importing...
-              </>
-            )
-            : null}
-          {!isDeleting.value && !isExporting.value && !isImporting.value ? <>&nbsp;</> : null}
-        </span>
-      </section>
-
-      {pagesCount > 0
-        ? (
-          <section class='flex justify-end'>
-            <nav class='isolate inline-flex -space-x-px rounded-md shadow-sm' aria-label='Pagination'>
-              <a
-                href={page > 1
-                  ? `/contacts?search=${search}&page=${page - 1}&addressBookId=${selectedAddressBookId.value}`
-                  : 'javascript:void(0)'}
-                class='relative inline-flex items-center rounded-l-md px-2 py-2 text-white hover:bg-slate-600 bg-slate-700'
-                title='Previous'
-              >
-                <svg class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                  <path
-                    fill-rule='evenodd'
-                    d='M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z'
-                    clip-rule='evenodd'
-                  />
-                </svg>
-              </a>
-              {pages.map((pageNumber) => {
-                const isCurrent = pageNumber === page;
-
-                return (
-                  <a
-                    href={`/contacts?search=${search}&page=${pageNumber}&addressBookId=${selectedAddressBookId.value}`}
-                    aria-current='page'
-                    class={`relative inline-flex items-center ${
-                      isCurrent ? 'bg-[#51A4FB] hover:bg-sky-400' : 'bg-slate-700 hover:bg-slate-600'
-                    } px-4 py-2 text-sm font-semibold text-white`}
-                  >
-                    {pageNumber}
-                  </a>
-                );
-              })}
-              <a
-                href={page < pagesCount
-                  ? `/contacts?search=${search}&page=${page + 1}&addressBookId=${selectedAddressBookId.value}`
-                  : 'javascript:void(0)'}
-                class='relative inline-flex items-center rounded-r-md px-2 py-2 text-white hover:bg-slate-600 bg-slate-700'
-                title='Next'
-              >
-                <svg class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor' aria-hidden='true'>
-                  <path
-                    fill-rule='evenodd'
-                    d='M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z'
-                    clip-rule='evenodd'
-                  />
-                </svg>
-              </a>
-            </nav>
-          </section>
-        )
-        : null}
-
-      <section class='flex flex-row items-center justify-start my-12'>
-        <span class='font-semibold'>CardDAV URL:</span>{' '}
-        <code class='bg-slate-600 mx-2 px-2 py-1 rounded-md'>{baseUrl}/carddav</code>
-      </section>
-    </>
-  );
-}
--- a/components/contacts/ViewContact.tsx
+++ b/components/contacts/ViewContact.tsx
@ -1,212 +0,0 @@
-import { useSignal } from '@preact/signals';
-
-import { Contact } from '/lib/models/contacts.ts';
-import { convertObjectToFormData } from '/public/ts/utils/misc.ts';
-import { FormField, generateFieldHtml } from '/public/ts/utils/form.ts';
-import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/pages/api/contacts/delete.ts';
-
-interface ViewContactProps {
-  addressBookId: string;
-  initialContact: Contact;
-  formData: Record<string, any>;
-  error?: string;
-  notice?: string;
-}
-
-export function formFields(contact: Contact, updateType: 'raw' | 'ui') {
-  const fields: FormField[] = [
-    {
-      name: 'update-type',
-      label: 'Update type',
-      type: 'hidden',
-      value: updateType,
-      readOnly: true,
-    },
-  ];
-
-  if (updateType === 'ui') {
-    fields.push({
-      name: 'first_name',
-      label: 'First name',
-      type: 'text',
-      placeholder: 'John',
-      value: contact.firstName,
-      required: true,
-    }, {
-      name: 'last_name',
-      label: 'Last name',
-      type: 'text',
-      placeholder: 'Doe',
-      value: contact.lastName,
-      required: false,
-    }, {
-      name: 'main_phone',
-      label: 'Main phone',
-      type: 'tel',
-      placeholder: '+44 0000 111 2222',
-      value: contact.phone,
-      required: false,
-    }, {
-      name: 'main_email',
-      label: 'Main email',
-      type: 'email',
-      placeholder: 'john.doe@example.com',
-      value: contact.email,
-      required: false,
-    }, {
-      name: 'notes',
-      label: 'Notes',
-      type: 'textarea',
-      placeholder: 'Some notes...',
-      value: contact.notes,
-      required: false,
-    });
-  } else if (updateType === 'raw') {
-    fields.push({
-      name: 'vcard',
-      label: 'Raw vCard',
-      type: 'textarea',
-      placeholder: 'Raw vCard...',
-      value: contact.data,
-      description:
-        'This is the raw vCard for this contact. Use this to manually update the contact _if_ you know what you are doing.',
-      rows: '10',
-    });
-  }
-
-  return fields;
-}
-
-export default function ViewContact(
-  { initialContact, formData: formDataObject, error, notice, addressBookId }: ViewContactProps,
-) {
-  const isDeleting = useSignal<boolean>(false);
-  const contact = useSignal<Contact>(initialContact);
-
-  const formData = convertObjectToFormData(formDataObject);
-
-  async function onClickDeleteContact() {
-    if (confirm('Are you sure you want to delete this contact?')) {
-      if (isDeleting.value) {
-        return;
-      }
-
-      isDeleting.value = true;
-
-      try {
-        const requestBody: DeleteRequestBody = { contactId: contact.value.uid!, addressBookId };
-        const response = await fetch(`/api/contacts/delete`, {
-          method: 'POST',
-          body: JSON.stringify(requestBody),
-        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete contact. ${response.statusText} ${await response.text()}`);
-        }
-
-        const result = await response.json() as DeleteResponseBody;
-
-        if (!result.success) {
-          throw new Error('Failed to delete contact!');
-        }
-
-        window.location.href = '/contacts';
-      } catch (error) {
-        console.error(error);
-      }
-
-      isDeleting.value = false;
-    }
-  }
-
-  return (
-    <>
-      <section class='flex flex-row items-center justify-between mb-4'>
-        <a href='/contacts' class='mr-2'>View contacts</a>
-        <section class='flex items-center'>
-          <button
-            class='inline-block justify-center gap-x-1.5 rounded-md bg-red-800 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-red-600 ml-2'
-            type='button'
-            title='Delete contact'
-            onClick={() => onClickDeleteContact()}
-          >
-            <img
-              src='/public/images/delete.svg'
-              alt='Delete contact'
-              class={`white ${isDeleting.value ? 'animate-spin' : ''}`}
-              width={20}
-              height={20}
-            />
-          </button>
-        </section>
-      </section>
-
-      <section class='mx-auto max-w-7xl my-8'>
-        {error
-          ? (
-            <section class='notification-error'>
-              <h3>Failed to update!</h3>
-              <p>{error}</p>
-            </section>
-          )
-          : null}
-        {notice
-          ? (
-            <section class='notification-success'>
-              <h3>Success!</h3>
-              <p>{notice}</p>
-            </section>
-          )
-          : null}
-
-        <form method='POST' class='mb-12'>
-          <div
-            dangerouslySetInnerHTML={{
-              __html: formFields(contact.peek(), 'ui').map((field) => generateFieldHtml(field, formData)).join(''),
-            }}
-          />
-
-          <section class='flex justify-end mt-8 mb-4'>
-            <button class='button' type='submit'>Update contact</button>
-          </section>
-        </form>
-
-        <hr class='my-8 border-slate-700' />
-
-        <details class='mb-12 group'>
-          <summary class='text-slate-100 flex items-center font-bold cursor-pointer text-center justify-center mx-auto hover:text-sky-400'>
-            Edit Raw vCard{' '}
-            <span class='ml-2 text-slate-400 group-open:rotate-90 transition-transform duration-200'>
-              <img src='/public/images/right.svg' alt='Expand' width={16} height={16} class='white' />
-            </span>
-          </summary>
-
-          <form method='POST' class='mb-12'>
-            <div
-              dangerouslySetInnerHTML={{
-                __html: formFields(contact.peek(), 'raw').map((field) => generateFieldHtml(field, formData)).join(''),
-              }}
-            />
-
-            <section class='flex justify-end mt-8 mb-4'>
-              <button class='button' type='submit'>Update vCard</button>
-            </section>
-          </form>
-        </details>
-
-        <span
-          class={`flex justify-end items-center text-sm mt-1 mx-2 text-slate-100`}
-        >
-          {isDeleting.value
-            ? (
-              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
-              </>
-            )
-            : null}
-          {!isDeleting.value ? <>&nbsp;</> : null}
-        </span>
-      </section>
-    </>
-  );
-}
--- a/components/expenses/BudgetModal.tsx
+++ b/components/expenses/BudgetModal.tsx
@ -2,7 +2,7 @@ import { useSignal } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

 import { Budget } from '/lib/types.ts';
-import { formatInputToNumber } from '/public/ts/utils/misc.ts';
+import { formatInputToNumber } from '/lib/utils/misc.ts';

 interface BudgetModalProps {
  isOpen: boolean;
@ -41,7 +41,7 @@ export default function BudgetModal(
  return (
    <>
      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
+        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900 bg-opacity-60`}
      >
      </section>

--- a/components/expenses/ExpenseModal.tsx
+++ b/components/expenses/ExpenseModal.tsx
@ -2,12 +2,12 @@ import { useSignal } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

 import { Budget, Expense } from '/lib/types.ts';
-import { formatInputToNumber } from '/public/ts/utils/misc.ts';
+import { formatInputToNumber } from '/lib/utils/misc.ts';

 import {
  RequestBody as SuggestionsRequestBody,
  ResponseBody as SuggestionsResponse,
-} from '/pages/api/expenses/auto-complete.ts';
+} from '/routes/api/expenses/auto-complete.tsx';

 interface ExpenseModalProps {
  isOpen: boolean;
@ -98,7 +98,7 @@ export default function ExpenseModal(
  return (
    <>
      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
+        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900 bg-opacity-60`}
      >
      </section>

@ -191,6 +191,7 @@ export default function ExpenseModal(
              onChange={(event) => {
                newExpenseBudget.value = event.currentTarget.value;
              }}
+              placeholder='Misc'
            >
              {sortedBudgetNames.map((budget) => (
                <option value={budget} selected={newExpenseBudget.value === budget}>{budget}</option>
--- a/components/expenses/ListBudgets.tsx
+++ b/components/expenses/ListBudgets.tsx
@ -1,8 +1,8 @@
 import { useSignal } from '@preact/signals';
 import { useEffect, useRef } from 'preact/hooks';
-import { Chart } from 'chart.js/auto';
+import { Chart } from 'chart.js';

-import { formatNumber } from '/public/ts/utils/misc.ts';
+import { formatNumber } from '/lib/utils/misc.ts';
 import { Budget, SupportedCurrencySymbol } from '/lib/types.ts';

 interface ListBudgetsProps {
--- a/components/expenses/ListExpenses.tsx
+++ b/components/expenses/ListExpenses.tsx
@ -1,6 +1,5 @@
 import { Expense, SupportedCurrencySymbol } from '/lib/types.ts';
-import { formatNumber } from '/public/ts/utils/misc.ts';
-
+import { formatNumber } from '/lib/utils/misc.ts';
 interface ListExpensesProps {
  expenses: Expense[];
  currency: SupportedCurrencySymbol;
@ -14,13 +13,10 @@ export default function ListExpenses(
    onClickEditExpense,
  }: ListExpensesProps,
 ) {
-  const dateFormatOptions: Intl.DateTimeFormatOptions = {
+  const dateFormat = new Intl.DateTimeFormat('en-US', {
    month: 'short',
    day: 'numeric',
-    timeZone: 'UTC', // Expense dates are stored without timezone info, so we need to force to UTC so it's consistent across db, server, and client
-  };
-
-  const dateFormat = new Intl.DateTimeFormat('en-US', dateFormatOptions);
+  });

  return (
    <section class='mx-auto max-w-7xl my-8 mt-12'>
@ -48,14 +44,14 @@ export default function ListExpenses(
                    class='text-white border-t border-slate-700 hover:bg-slate-600 transition-colors even:bg-slate-700 odd:bg-slate-800 cursor-pointer flex md:table-row flex-row flex-wrap my-4 mx-4 md:my-0 md:mx-0 rounded md:rounded-none shadow-md md:shadow-none relative py-4 md:py-0 px-6 md:px-0'
                    onClick={() => onClickEditExpense(expense.id)}
                  >
-                    <td class='md:px-6 md:py-3 flex-50 mx-2 md:mx-0'>{expense.description}</td>
-                    <td class='md:px-6 md:py-3 flex-20 mx-2 md:mx-0 text-gray-400 md:text-gray-300'>
+                    <td class='md:px-6 md:py-3 flex-[50] mx-2 md:mx-0'>{expense.description}</td>
+                    <td class='md:px-6 md:py-3 flex-[20] mx-2 md:mx-0 text-gray-400 md:text-gray-300'>
                      {expense.budget}
                    </td>
-                    <td class='md:px-6 md:py-3 flex-15 mx-2 md:mx-0 text-gray-400 md:text-gray-300'>
+                    <td class='md:px-6 md:py-3 flex-[15] mx-2 md:mx-0 text-gray-400 md:text-gray-300'>
                      {dateFormat.format(new Date(expense.date))}
                    </td>
-                    <td class='md:px-6 md:py-3 flex-15 mx-2 md:mx-0 font-bold md:font-semibold'>
+                    <td class='md:px-6 md:py-3 flex-[15] mx-2 md:mx-0 font-bold md:font-semibold'>
                      {formatNumber(currency, expense.cost)}
                    </td>
                  </tr>
--- a/components/expenses/MainExpenses.tsx
+++ b/components/expenses/MainExpenses.tsx
@ -5,32 +5,35 @@ import { Budget, Expense, SupportedCurrencySymbol } from '/lib/types.ts';
 import {
  RequestBody as ImportRequestBody,
  ResponseBody as ImportResponseBody,
-} from '/pages/api/expenses/import-expenses.ts';
-import { ResponseBody as ExportResponseBody } from '/pages/api/expenses/export-expenses.ts';
+} from '/routes/api/expenses/import-expenses.tsx';
+import {
+  RequestBody as ExportRequestBody,
+  ResponseBody as ExportResponseBody,
+} from '/routes/api/expenses/export-expenses.tsx';
 import {
  RequestBody as AddExpenseRequestBody,
  ResponseBody as AddExpenseResponseBody,
-} from '/pages/api/expenses/add-expense.ts';
+} from '/routes/api/expenses/add-expense.tsx';
 import {
  RequestBody as AddBudgetRequestBody,
  ResponseBody as AddBudgetResponseBody,
-} from '/pages/api/expenses/add-budget.ts';
+} from '/routes/api/expenses/add-budget.tsx';
 import {
  RequestBody as UpdateExpenseRequestBody,
  ResponseBody as UpdateExpenseResponseBody,
-} from '/pages/api/expenses/update-expense.ts';
+} from '/routes/api/expenses/update-expense.tsx';
 import {
  RequestBody as UpdateBudgetRequestBody,
  ResponseBody as UpdateBudgetResponseBody,
-} from '/pages/api/expenses/update-budget.ts';
+} from '/routes/api/expenses/update-budget.tsx';
 import {
  RequestBody as DeleteExpenseRequestBody,
  ResponseBody as DeleteExpenseResponseBody,
-} from '/pages/api/expenses/delete-expense.ts';
+} from '/routes/api/expenses/delete-expense.tsx';
 import {
  RequestBody as DeleteBudgetRequestBody,
  ResponseBody as DeleteBudgetResponseBody,
-} from '/pages/api/expenses/delete-budget.ts';
+} from '/routes/api/expenses/delete-budget.tsx';
 import ListBudgets from '/components/expenses/ListBudgets.tsx';
 import ListExpenses from '/components/expenses/ListExpenses.tsx';
 import ExpenseModal from './ExpenseModal.tsx';
@ -60,14 +63,7 @@ export default function MainExpenses({ initialBudgets, initialExpenses, initialM
  const shouldResetBudgetModal = useSignal<boolean>(false);
  const searchTimeout = useSignal<ReturnType<typeof setTimeout>>(0);

-  const dateFormatOptions: Intl.DateTimeFormatOptions = {
-    year: 'numeric',
-    month: 'long',
-    timeZone: 'UTC', // Expense dates are stored without timezone info, so we need to force to UTC so it's consistent across db, server, and client
-  };
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', dateFormatOptions);
-
+  const dateFormat = new Intl.DateTimeFormat('en-GB', { year: 'numeric', month: 'long' });
  const thisMonth = new Date().toISOString().substring(0, 7);

  function onClickImportFile() {
@ -164,19 +160,15 @@ export default function MainExpenses({ initialBudgets, initialExpenses, initialM
    const fileName = `expenses-data-export-${new Date().toISOString().substring(0, 19).replace(/:/g, '-')}.json`;

    try {
+      const requestBody: ExportRequestBody = {};
      const response = await fetch(`/api/expenses/export-expenses`, {
        method: 'POST',
-        body: JSON.stringify({}),
+        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to export expenses. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as ExportResponseBody;

      if (!result.success) {
-        throw new Error('Failed to export expenses!');
+        throw new Error('Failed to get contact!');
      }

      const exportContents = JSON.stringify(result.jsonContents, null, 2);
@ -659,9 +651,7 @@ export default function MainExpenses({ initialBudgets, initialExpenses, initialM
              placeholder='Filter expenses...'
              onInput={(event) => searchExpenses(event.currentTarget.value)}
            />
-            {isSearching.value
-              ? <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />
-              : null}
+            {isSearching.value ? <img src='/images/loading.svg' class='white mr-2' width={18} height={18} /> : null}
          </section>
        </section>
        <section class='flex items-center justify-end w-full'>
@ -717,7 +707,7 @@ export default function MainExpenses({ initialBudgets, initialExpenses, initialM
                onClick={() => toggleNewOptionsDropdown()}
              >
                <img
-                  src='/public/images/add.svg'
+                  src='/images/add.svg'
                  alt='Add new expense or budget'
                  class={`white ${isSaving.value || isImporting.value ? 'animate-spin' : ''}`}
                  width={20}
@ -727,7 +717,7 @@ export default function MainExpenses({ initialBudgets, initialExpenses, initialM
            </div>

            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
+              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
                !areNewOptionsOption.value ? 'hidden' : ''
              }`}
              role='menu'
@ -795,21 +785,21 @@ export default function MainExpenses({ initialBudgets, initialExpenses, initialM
          {isSaving.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
              </>
            )
            : null}
          {isImporting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Importing...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Importing...
              </>
            )
            : null}
          {isExporting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Exporting...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Exporting...
              </>
            )
            : null}
--- a/components/files/CreateDirectoryModal.tsx
+++ b/components/files/CreateDirectoryModal.tsx
@ -14,7 +14,7 @@ export default function CreateDirectoryModal(
  return (
    <>
      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
+        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900 bg-opacity-60`}
      >
      </section>

--- a/components/files/CreateShareModal.tsx
+++ b/components/files/CreateShareModal.tsx
@ -1,67 +0,0 @@
-import { useSignal } from '@preact/signals';
-
-interface CreateShareModalProps {
-  isOpen: boolean;
-  filePath: string;
-  password?: string;
-  onClickSave: (filePath: string, password?: string) => Promise<void>;
-  onClose: () => void;
-}
-
-export default function CreateShareModal(
-  { isOpen, filePath, password, onClickSave, onClose }: CreateShareModalProps,
-) {
-  const newPassword = useSignal<string>(password || '');
-
-  return (
-    <>
-      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
-      >
-      </section>
-
-      <section
-        class={`fixed ${
-          isOpen ? 'block' : 'hidden'
-        } z-50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-96 bg-slate-600 text-white rounded-md px-8 py-6 drop-shadow-lg overflow-y-scroll max-h-[80%]`}
-      >
-        <h1 class='text-2xl font-semibold my-5'>Create New Public Share Link</h1>
-        <section class='py-5 my-2 border-y border-slate-500'>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='create-share-password'>Password</label>
-            <input
-              class='input-field'
-              type='password'
-              name='password'
-              id='create-share-password'
-              value={newPassword.value}
-              onInput={(event) => {
-                newPassword.value = event.currentTarget.value;
-              }}
-              autocomplete='off'
-            />
-          </fieldset>
-        </section>
-        <footer class='flex justify-between'>
-          <button
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => {
-              onClickSave(filePath, newPassword.peek());
-              newPassword.value = '';
-            }}
-            type='button'
-          >
-            Create
-          </button>
-          <button
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClose()}
-            type='button'
-          >
-            Close
-          </button>
-        </footer>
-      </section>
-    </>
-  );
-}
--- a/components/files/FilesBreadcrumb.tsx
+++ b/components/files/FilesBreadcrumb.tsx
@ -2,24 +2,22 @@ interface FilesBreadcrumbProps {
  path: string;
  isShowingNotes?: boolean;
  isShowingPhotos?: boolean;
-  fileShareId?: string;
 }

-export default function FilesBreadcrumb({ path, isShowingNotes, isShowingPhotos, fileShareId }: FilesBreadcrumbProps) {
-  let routePath = fileShareId ? `file-share/${fileShareId}` : 'files';
+export default function FilesBreadcrumb({ path, isShowingNotes, isShowingPhotos }: FilesBreadcrumbProps) {
+  let routePath = 'files';
  let rootPath = '/';
-  let itemPluralLabel = 'files';

  if (isShowingNotes) {
    routePath = 'notes';
-    itemPluralLabel = 'notes';
    rootPath = '/Notes/';
  } else if (isShowingPhotos) {
    routePath = 'photos';
-    itemPluralLabel = 'photos';
    rootPath = '/Photos/';
  }

+  const itemPluralLabel = routePath;
+
  if (path === rootPath) {
    return (
      <h3 class='text-base font-semibold text-white whitespace-nowrap mr-2'>
@ -32,7 +30,7 @@ export default function FilesBreadcrumb({ path, isShowingNotes, isShowingPhotos,

  return (
    <h3 class='text-base font-semibold text-white whitespace-nowrap mr-2'>
-      {!isShowingNotes && !isShowingPhotos ? <a href={`/${routePath}?path=/`}>All files</a> : null}
+      {!isShowingNotes && !isShowingPhotos ? <a href={`/files?path=/`}>All files</a> : null}
      {isShowingNotes ? <a href={`/notes?path=/Notes/`}>All notes</a> : null}
      {isShowingPhotos ? <a href={`/photos?path=/Photos/`}>All photos</a> : null}
      {pathParts.map((part, index) => {
@ -59,9 +57,7 @@ export default function FilesBreadcrumb({ path, isShowingNotes, isShowingPhotos,
        return (
          <>
            <span class='ml-2 text-xs'>/</span>
-            <a href={`/${routePath}?path=/${encodeURIComponent(fullPathForPart.join('/'))}/`} class='ml-2'>
-              {decodeURIComponent(part)}
-            </a>
+            <a href={`/${routePath}?path=/${fullPathForPart.join('/')}/`} class='ml-2'>{decodeURIComponent(part)}</a>
          </>
        );
      })}
--- a/components/files/ListFiles.tsx
+++ b/components/files/ListFiles.tsx
@ -1,7 +1,5 @@
-import { join } from '@std/path';
-
 import { Directory, DirectoryFile } from '/lib/types.ts';
-import { humanFileSize, TRASH_PATH } from '/public/ts/utils/files.ts';
+import { humanFileSize, TRASH_PATH } from '/lib/utils/files.ts';

 interface ListFilesProps {
  directories: Directory[];
@ -16,12 +14,8 @@ interface ListFilesProps {
  onClickOpenMoveFile?: (parentPath: string, name: string) => void;
  onClickDeleteDirectory?: (parentPath: string, name: string) => Promise<void>;
  onClickDeleteFile?: (parentPath: string, name: string) => Promise<void>;
-  onClickCreateShare?: (filePath: string) => void;
-  onClickOpenManageShare?: (fileShareId: string) => void;
-  onClickDownloadDirectory?: (parentPath: string, name: string) => void;
  isShowingNotes?: boolean;
  isShowingPhotos?: boolean;
-  fileShareId?: string;
 }

 export default function ListFiles(
@ -38,26 +32,20 @@ export default function ListFiles(
    onClickOpenMoveFile,
    onClickDeleteDirectory,
    onClickDeleteFile,
-    onClickCreateShare,
-    onClickOpenManageShare,
-    onClickDownloadDirectory,
    isShowingNotes,
    isShowingPhotos,
-    fileShareId,
  }: ListFilesProps,
 ) {
-  const dateFormatOptions: Intl.DateTimeFormatOptions = {
+  const dateFormat = new Intl.DateTimeFormat('en-GB', {
    year: 'numeric',
    month: 'long',
    day: 'numeric',
    hour12: false,
    hour: '2-digit',
    minute: '2-digit',
-  };
+  });

-  const dateFormat = new Intl.DateTimeFormat('en-GB', dateFormatOptions);
-
-  let routePath = fileShareId ? `file-share/${fileShareId}` : 'files';
+  let routePath = 'files';
  let itemSingleLabel = 'file';
  let itemPluralLabel = 'files';

@ -93,8 +81,7 @@ export default function ListFiles(
        <thead>
          <tr class='border-b border-slate-600'>
            {(directories.length === 0 && files.length === 0) ||
-                (typeof onClickChooseFile === 'undefined' && typeof onClickChooseDirectory === 'undefined') ||
-                fileShareId
+                (typeof onClickChooseFile === 'undefined' && typeof onClickChooseDirectory === 'undefined')
              ? null
              : (
                <th scope='col' class='pl-6 pr-2 font-medium text-white w-3'>
@ -111,9 +98,7 @@ export default function ListFiles(
            {isShowingNotes || isShowingPhotos
              ? null
              : <th scope='col' class='px-6 py-4 font-medium text-white w-32'>Size</th>}
-            {isShowingPhotos || fileShareId
-              ? null
-              : <th scope='col' class='px-6 py-4 font-medium text-white w-24'></th>}
+            {isShowingPhotos ? null : <th scope='col' class='px-6 py-4 font-medium text-white w-20'></th>}
          </tr>
        </thead>
        <tbody class='divide-y divide-slate-600 border-t border-slate-600'>
@ -122,7 +107,7 @@ export default function ListFiles(

            return (
              <tr class='bg-slate-700 hover:bg-slate-600 group'>
-                {typeof onClickChooseDirectory === 'undefined' || fileShareId ? null : (
+                {typeof onClickChooseDirectory === 'undefined' ? null : (
                  <td class='gap-3 pl-6 pr-2 py-4'>
                    {fullPath === TRASH_PATH ? null : (
                      <input
@ -139,11 +124,11 @@ export default function ListFiles(
                )}
                <td class='flex gap-3 px-6 py-4'>
                  <a
-                    href={`/${routePath}?path=${encodeURIComponent(fullPath)}`}
+                    href={`/${routePath}?path=${fullPath}`}
                    class='flex items-center font-normal text-white'
                  >
                    <img
-                      src={`/public/images/${fullPath === TRASH_PATH ? 'trash.svg' : 'directory.svg'}`}
+                      src={`/images/${fullPath === TRASH_PATH ? 'trash.svg' : 'directory.svg'}`}
                      class='white drop-shadow-md mr-2'
                      width={18}
                      height={18}
@ -158,38 +143,22 @@ export default function ListFiles(
                </td>
                {isShowingNotes || isShowingPhotos ? null : (
                  <td class='px-6 py-4 text-slate-200'>
-                    {humanFileSize(directory.size_in_bytes)}
+                    -
                  </td>
                )}
-                {isShowingPhotos || fileShareId ? null : (
+                {isShowingPhotos ? null : (
                  <td class='px-6 py-4'>
                    {(fullPath === TRASH_PATH || typeof onClickOpenRenameDirectory === 'undefined' ||
                        typeof onClickOpenMoveDirectory === 'undefined')
                      ? null
                      : (
-                        <section class='flex items-center justify-end w-32'>
-                          {typeof onClickDownloadDirectory === 'undefined' ? null : (
-                            <span
-                              class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
-                              onClick={() => onClickDownloadDirectory(directory.parent_path, directory.directory_name)}
-                            >
-                              <img
-                                src='/public/images/download.svg'
-                                class='white drop-shadow-md'
-                                width={18}
-                                height={18}
-                                alt='Download directory as zip'
-                                title='Download directory as zip'
-                              />
-                            </span>
-                          )}
+                        <section class='flex items-center justify-end w-20'>
                          <span
                            class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
-                            onClick={() =>
-                              onClickOpenRenameDirectory(directory.parent_path, directory.directory_name)}
+                            onClick={() => onClickOpenRenameDirectory(directory.parent_path, directory.directory_name)}
                          >
                            <img
-                              src='/public/images/rename.svg'
+                              src='/images/rename.svg'
                              class='white drop-shadow-md'
                              width={18}
                              height={18}
@ -202,7 +171,7 @@ export default function ListFiles(
                            onClick={() => onClickOpenMoveDirectory(directory.parent_path, directory.directory_name)}
                          >
                            <img
-                              src='/public/images/move.svg'
+                              src='/images/move.svg'
                              class='white drop-shadow-md'
                              width={18}
                              height={18}
@ -212,11 +181,11 @@ export default function ListFiles(
                          </span>
                          {typeof onClickDeleteDirectory === 'undefined' ? null : (
                            <span
-                              class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
+                              class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100'
                              onClick={() => onClickDeleteDirectory(directory.parent_path, directory.directory_name)}
                            >
                              <img
-                                src='/public/images/delete.svg'
+                                src='/images/delete.svg'
                                class='red drop-shadow-md'
                                width={20}
                                height={20}
@ -225,36 +194,6 @@ export default function ListFiles(
                              />
                            </span>
                          )}
-                          {typeof onClickCreateShare === 'undefined' || directory.file_share_id ? null : (
-                            <span
-                              class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
-                              onClick={() => onClickCreateShare(join(directory.parent_path, directory.directory_name))}
-                            >
-                              <img
-                                src='/public/images/share.svg'
-                                class='white drop-shadow-md'
-                                width={18}
-                                height={18}
-                                alt='Create public share link'
-                                title='Create public share link'
-                              />
-                            </span>
-                          )}
-                          {typeof onClickOpenManageShare === 'undefined' || !directory.file_share_id ? null : (
-                            <span
-                              class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
-                              onClick={() => onClickOpenManageShare(directory.file_share_id!)}
-                            >
-                              <img
-                                src='/public/images/share.svg'
-                                class='white drop-shadow-md'
-                                width={18}
-                                height={18}
-                                alt='Manage public share link'
-                                title='Manage public share link'
-                              />
-                            </span>
-                          )}
                        </section>
                      )}
                  </td>
@ -264,7 +203,7 @@ export default function ListFiles(
          })}
          {files.map((file) => (
            <tr class='bg-slate-700 hover:bg-slate-600 group'>
-              {typeof onClickChooseFile === 'undefined' || fileShareId ? null : (
+              {typeof onClickChooseFile === 'undefined' ? null : (
                <td class='gap-3 pl-6 pr-2 py-4'>
                  <input
                    class='w-3 h-3 cursor-pointer text-[#51A4FB] bg-slate-100 border-slate-300 rounded dark:bg-slate-700 dark:border-slate-600'
@ -280,15 +219,13 @@ export default function ListFiles(
              )}
              <td class='flex gap-3 px-6 py-4'>
                <a
-                  href={`/${routePath}/open/${encodeURIComponent(file.file_name)}?path=${
-                    encodeURIComponent(file.parent_path)
-                  }`}
+                  href={`/${routePath}/open/${file.file_name}?path=${file.parent_path}`}
                  class='flex items-center font-normal text-white'
                  target='_blank'
                  rel='noopener noreferrer'
                >
                  <img
-                    src='/public/images/file.svg'
+                    src='/images/file.svg'
                    class='white drop-shadow-md mr-2'
                    width={18}
                    height={18}
@ -306,16 +243,16 @@ export default function ListFiles(
                  {humanFileSize(file.size_in_bytes)}
                </td>
              )}
-              {isShowingPhotos || fileShareId ? null : (
+              {isShowingPhotos ? null : (
                <td class='px-6 py-4'>
-                  <section class='flex items-center justify-end w-24'>
+                  <section class='flex items-center justify-end w-20'>
                    {typeof onClickOpenRenameFile === 'undefined' ? null : (
                      <span
                        class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
                        onClick={() => onClickOpenRenameFile(file.parent_path, file.file_name)}
                      >
                        <img
-                          src='/public/images/rename.svg'
+                          src='/images/rename.svg'
                          class='white drop-shadow-md'
                          width={18}
                          height={18}
@ -330,7 +267,7 @@ export default function ListFiles(
                        onClick={() => onClickOpenMoveFile(file.parent_path, file.file_name)}
                      >
                        <img
-                          src='/public/images/move.svg'
+                          src='/images/move.svg'
                          class='white drop-shadow-md'
                          width={18}
                          height={18}
@ -341,11 +278,11 @@ export default function ListFiles(
                    )}
                    {typeof onClickDeleteFile === 'undefined' ? null : (
                      <span
-                        class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
+                        class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100'
                        onClick={() => onClickDeleteFile(file.parent_path, file.file_name)}
                      >
                        <img
-                          src='/public/images/delete.svg'
+                          src='/images/delete.svg'
                          class='red drop-shadow-md'
                          width={20}
                          height={20}
@ -354,36 +291,6 @@ export default function ListFiles(
                        />
                      </span>
                    )}
-                    {typeof onClickCreateShare === 'undefined' || file.file_share_id ? null : (
-                      <span
-                        class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
-                        onClick={() => onClickCreateShare(join(file.parent_path, file.file_name))}
-                      >
-                        <img
-                          src='/public/images/share.svg'
-                          class='white drop-shadow-md'
-                          width={18}
-                          height={18}
-                          alt='Create public share link'
-                          title='Create public share link'
-                        />
-                      </span>
-                    )}
-                    {typeof onClickOpenManageShare === 'undefined' || !file.file_share_id ? null : (
-                      <span
-                        class='invisible cursor-pointer group-hover:visible opacity-50 hover:opacity-100 mr-2'
-                        onClick={() => onClickOpenManageShare(file.file_share_id!)}
-                      >
-                        <img
-                          src='/public/images/share.svg'
-                          class='white drop-shadow-md'
-                          width={18}
-                          height={18}
-                          alt='Manage public share link'
-                          title='Manage public share link'
-                        />
-                      </span>
-                    )}
                  </section>
                </td>
              )}
--- a/components/files/ListPhotos.tsx
+++ b/components/files/ListPhotos.tsx
@ -1,7 +1,7 @@
 import { Directory, DirectoryFile } from '/lib/types.ts';
-import { humanFileSize, TRASH_PATH } from '/public/ts/utils/files.ts';
+import { humanFileSize, TRASH_PATH } from '/lib/utils/files.ts';

-interface ListPhotosProps {
+interface ListFilesProps {
  directories: Directory[];
  files: DirectoryFile[];
  onClickOpenRenameDirectory?: (parentPath: string, name: string) => void;
@ -13,7 +13,7 @@ interface ListPhotosProps {
  isShowingNotes?: boolean;
 }

-export default function ListPhotos(
+export default function ListFiles(
  {
    directories,
    files,
@ -24,18 +24,16 @@ export default function ListPhotos(
    onClickDeleteDirectory,
    onClickDeleteFile,
    isShowingNotes,
-  }: ListPhotosProps,
+  }: ListFilesProps,
 ) {
-  const dateFormatOptions: Intl.DateTimeFormatOptions = {
+  const dateFormat = new Intl.DateTimeFormat('en-GB', {
    year: 'numeric',
    month: 'long',
    day: 'numeric',
    hour12: false,
    hour: '2-digit',
    minute: '2-digit',
-  };
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', dateFormatOptions);
+  });

  const routePath = isShowingNotes ? 'notes' : 'files';
  const itemSingleLabel = isShowingNotes ? 'note' : 'file';
@ -60,11 +58,11 @@ export default function ListPhotos(
              <tr class='bg-slate-700 hover:bg-slate-600 group'>
                <td class='flex gap-3 px-6 py-4'>
                  <a
-                    href={`/${routePath}?path=${encodeURIComponent(fullPath)}`}
+                    href={`/${routePath}?path=${fullPath}`}
                    class='flex items-center font-normal text-white'
                  >
                    <img
-                      src={`/public/images/${fullPath === TRASH_PATH ? 'trash.svg' : 'directory.svg'}`}
+                      src={`/images/${fullPath === TRASH_PATH ? 'trash.svg' : 'directory.svg'}`}
                      class='white drop-shadow-md mr-2'
                      width={18}
                      height={18}
@ -79,7 +77,7 @@ export default function ListPhotos(
                </td>
                {isShowingNotes ? null : (
                  <td class='px-6 py-4 text-slate-200'>
-                    {humanFileSize(directory.size_in_bytes)}
+                    -
                  </td>
                )}
                <td class='px-6 py-4'>
@ -93,7 +91,7 @@ export default function ListPhotos(
                          onClick={() => onClickOpenRenameDirectory(directory.parent_path, directory.directory_name)}
                        >
                          <img
-                            src='/public/images/rename.svg'
+                            src='/images/rename.svg'
                            class='white drop-shadow-md'
                            width={18}
                            height={18}
@ -106,7 +104,7 @@ export default function ListPhotos(
                          onClick={() => onClickOpenMoveDirectory(directory.parent_path, directory.directory_name)}
                        >
                          <img
-                            src='/public/images/move.svg'
+                            src='/images/move.svg'
                            class='white drop-shadow-md'
                            width={18}
                            height={18}
@ -119,7 +117,7 @@ export default function ListPhotos(
                          onClick={() => onClickDeleteDirectory(directory.parent_path, directory.directory_name)}
                        >
                          <img
-                            src='/public/images/delete.svg'
+                            src='/images/delete.svg'
                            class='red drop-shadow-md'
                            width={20}
                            height={20}
@ -137,15 +135,13 @@ export default function ListPhotos(
            <tr class='bg-slate-700 hover:bg-slate-600 group'>
              <td class='flex gap-3 px-6 py-4'>
                <a
-                  href={`/${routePath}/open/${encodeURIComponent(file.file_name)}?path=${
-                    encodeURIComponent(file.parent_path)
-                  }`}
+                  href={`/${routePath}/open/${file.file_name}?path=${file.parent_path}`}
                  class='flex items-center font-normal text-white'
                  target='_blank'
                  rel='noopener noreferrer'
                >
                  <img
-                    src='/public/images/file.svg'
+                    src='/images/file.svg'
                    class='white drop-shadow-md mr-2'
                    width={18}
                    height={18}
@ -171,7 +167,7 @@ export default function ListPhotos(
                      onClick={() => onClickOpenRenameFile(file.parent_path, file.file_name)}
                    >
                      <img
-                        src='/public/images/rename.svg'
+                        src='/images/rename.svg'
                        class='white drop-shadow-md'
                        width={18}
                        height={18}
@ -186,7 +182,7 @@ export default function ListPhotos(
                      onClick={() => onClickOpenMoveFile(file.parent_path, file.file_name)}
                    >
                      <img
-                        src='/public/images/move.svg'
+                        src='/images/move.svg'
                        class='white drop-shadow-md'
                        width={18}
                        height={18}
@ -200,7 +196,7 @@ export default function ListPhotos(
                    onClick={() => onClickDeleteFile(file.parent_path, file.file_name)}
                  >
                    <img
-                      src='/public/images/delete.svg'
+                      src='/images/delete.svg'
                      class='red drop-shadow-md'
                      width={20}
                      height={20}
--- a/components/files/MainFiles.tsx
+++ b/components/files/MainFiles.tsx
@ -1,68 +1,41 @@
 import { useSignal } from '@preact/signals';

 import { Directory, DirectoryFile } from '/lib/types.ts';
-import { ResponseBody as UploadResponseBody } from '/pages/api/files/upload.ts';
-import { RequestBody as RenameRequestBody, ResponseBody as RenameResponseBody } from '/pages/api/files/rename.ts';
-import { RequestBody as MoveRequestBody, ResponseBody as MoveResponseBody } from '/pages/api/files/move.ts';
-import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/pages/api/files/delete.ts';
+import { ResponseBody as UploadResponseBody } from '/routes/api/files/upload.tsx';
+import { RequestBody as RenameRequestBody, ResponseBody as RenameResponseBody } from '/routes/api/files/rename.tsx';
+import { RequestBody as MoveRequestBody, ResponseBody as MoveResponseBody } from '/routes/api/files/move.tsx';
+import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/routes/api/files/delete.tsx';
 import {
  RequestBody as CreateDirectoryRequestBody,
  ResponseBody as CreateDirectoryResponseBody,
-} from '/pages/api/files/create-directory.ts';
+} from '/routes/api/files/create-directory.tsx';
 import {
  RequestBody as RenameDirectoryRequestBody,
  ResponseBody as RenameDirectoryResponseBody,
-} from '/pages/api/files/rename-directory.ts';
+} from '/routes/api/files/rename-directory.tsx';
 import {
  RequestBody as MoveDirectoryRequestBody,
  ResponseBody as MoveDirectoryResponseBody,
-} from '/pages/api/files/move-directory.ts';
+} from '/routes/api/files/move-directory.tsx';
 import {
  RequestBody as DeleteDirectoryRequestBody,
  ResponseBody as DeleteDirectoryResponseBody,
-} from '/pages/api/files/delete-directory.ts';
-import {
-  RequestBody as CreateShareRequestBody,
-  ResponseBody as CreateShareResponseBody,
-} from '/pages/api/files/create-share.ts';
-import {
-  RequestBody as UpdateShareRequestBody,
-  ResponseBody as UpdateShareResponseBody,
-} from '/pages/api/files/update-share.ts';
-import {
-  RequestBody as DeleteShareRequestBody,
-  ResponseBody as DeleteShareResponseBody,
-} from '/pages/api/files/delete-share.ts';
+} from '/routes/api/files/delete-directory.tsx';
 import SearchFiles from './SearchFiles.tsx';
 import ListFiles from './ListFiles.tsx';
 import FilesBreadcrumb from './FilesBreadcrumb.tsx';
 import CreateDirectoryModal from './CreateDirectoryModal.tsx';
 import RenameDirectoryOrFileModal from './RenameDirectoryOrFileModal.tsx';
 import MoveDirectoryOrFileModal from './MoveDirectoryOrFileModal.tsx';
-import CreateShareModal from './CreateShareModal.tsx';
-import ManageShareModal from './ManageShareModal.tsx';

 interface MainFilesProps {
  initialDirectories: Directory[];
  initialFiles: DirectoryFile[];
  initialPath: string;
  baseUrl: string;
-  isFileSharingAllowed: boolean;
-  areDirectoryDownloadsAllowed: boolean;
-  fileShareId?: string;
 }

-export default function MainFiles(
-  {
-    initialDirectories,
-    initialFiles,
-    initialPath,
-    baseUrl,
-    isFileSharingAllowed,
-    areDirectoryDownloadsAllowed,
-    fileShareId,
-  }: MainFilesProps,
-) {
+export default function MainFiles({ initialDirectories, initialFiles, initialPath, baseUrl }: MainFilesProps) {
  const isAdding = useSignal<boolean>(false);
  const isUploading = useSignal<boolean>(false);
  const isDeleting = useSignal<boolean>(false);
@ -83,8 +56,6 @@ export default function MainFiles(
  const moveDirectoryOrFileModal = useSignal<
    { isOpen: boolean; isDirectory: boolean; path: string; name: string } | null
  >(null);
-  const createShareModal = useSignal<{ isOpen: boolean; filePath: string; password?: string } | null>(null);
-  const manageShareModal = useSignal<{ isOpen: boolean; fileShareId: string } | null>(null);

  function onClickUploadFile(uploadDirectory = false) {
    const fileInput = document.createElement('input');
@ -132,11 +103,6 @@ export default function MainFiles(
            method: 'POST',
            body: requestBody,
          });
-
-          if (!response.ok) {
-            throw new Error(`Failed to upload file. ${response.statusText} ${await response.text()}`);
-          }
-
          const result = await response.json() as UploadResponseBody;

          if (!result.success) {
@ -184,11 +150,6 @@ export default function MainFiles(
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to create directory. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as CreateDirectoryResponseBody;

      if (!result.success) {
@ -258,11 +219,6 @@ export default function MainFiles(
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to rename directory. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as RenameDirectoryResponseBody;

      if (!result.success) {
@ -297,11 +253,6 @@ export default function MainFiles(
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to rename file. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as RenameResponseBody;

      if (!result.success) {
@ -356,11 +307,6 @@ export default function MainFiles(
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to move directory. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as MoveDirectoryResponseBody;

      if (!result.success) {
@ -393,11 +339,6 @@ export default function MainFiles(
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to move file. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as MoveResponseBody;

      if (!result.success) {
@ -413,21 +354,6 @@ export default function MainFiles(
    moveDirectoryOrFileModal.value = null;
  }

-  function onClickDownloadDirectory(parentPath: string, name: string) {
-    // Create download URL with proper path encoding
-    const downloadUrl = `/api/files/download-directory?parentPath=${encodeURIComponent(parentPath)}&name=${
-      encodeURIComponent(name)
-    }`;
-
-    // Create a temporary anchor element to trigger download
-    const link = document.createElement('a');
-    link.href = downloadUrl;
-    link.download = `${name}.zip`;
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  }
-
  async function onClickDeleteDirectory(parentPath: string, name: string, isBulkDeleting = false) {
    if (isBulkDeleting || confirm('Are you sure you want to delete this directory?')) {
      if (!isBulkDeleting && isDeleting.value) {
@ -445,11 +371,6 @@ export default function MainFiles(
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete directory. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as DeleteDirectoryResponseBody;

        if (!result.success) {
@ -482,11 +403,6 @@ export default function MainFiles(
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete file. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as DeleteResponseBody;

        if (!result.success) {
@ -567,165 +483,12 @@ export default function MainFiles(
    }
  }

-  function onClickCreateShare(filePath: string) {
-    if (createShareModal.value?.isOpen) {
-      createShareModal.value = null;
-      return;
-    }
-
-    createShareModal.value = {
-      isOpen: true,
-      filePath,
-    };
-  }
-
-  async function onClickSaveFileShare(filePath: string, password?: string) {
-    if (isAdding.value) {
-      return;
-    }
-
-    if (!filePath) {
-      return;
-    }
-
-    isAdding.value = true;
-
-    try {
-      const requestBody: CreateShareRequestBody = {
-        pathInView: path.value,
-        filePath,
-        password,
-      };
-      const response = await fetch(`/api/files/create-share`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to create share. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as CreateShareResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to create share!');
-      }
-
-      directories.value = [...result.newDirectories];
-      files.value = [...result.newFiles];
-
-      createShareModal.value = null;
-
-      onClickOpenManageShare(result.createdFileShareId);
-    } catch (error) {
-      console.error(error);
-    }
-
-    isAdding.value = false;
-  }
-
-  function onClickCloseFileShare() {
-    createShareModal.value = null;
-  }
-
-  function onClickOpenManageShare(fileShareId: string) {
-    manageShareModal.value = {
-      isOpen: true,
-      fileShareId,
-    };
-  }
-
-  async function onClickUpdateFileShare(fileShareId: string, password?: string) {
-    if (isUpdating.value) {
-      return;
-    }
-
-    if (!fileShareId) {
-      return;
-    }
-
-    isUpdating.value = true;
-
-    try {
-      const requestBody: UpdateShareRequestBody = {
-        pathInView: path.value,
-        fileShareId,
-        password,
-      };
-      const response = await fetch(`/api/files/update-share`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to update share. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as UpdateShareResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to update share!');
-      }
-
-      directories.value = [...result.newDirectories];
-      files.value = [...result.newFiles];
-
-      manageShareModal.value = null;
-    } catch (error) {
-      console.error(error);
-    }
-
-    isUpdating.value = false;
-  }
-
-  function onClickCloseManageShare() {
-    manageShareModal.value = null;
-  }
-
-  async function onClickDeleteFileShare(fileShareId: string) {
-    if (!fileShareId || isDeleting.value || !confirm('Are you sure you want to delete this public share link?')) {
-      return;
-    }
-
-    isDeleting.value = true;
-
-    try {
-      const requestBody: DeleteShareRequestBody = {
-        pathInView: path.value,
-        fileShareId,
-      };
-      const response = await fetch(`/api/files/delete-share`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to delete file share. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as DeleteShareResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to delete file share!');
-      }
-
-      directories.value = [...result.newDirectories];
-      files.value = [...result.newFiles];
-
-      manageShareModal.value = null;
-    } catch (error) {
-      console.error(error);
-    }
-
-    isDeleting.value = false;
-  }
-
  return (
    <>
      <section class='flex flex-row items-center justify-between mb-4'>
        <section class='relative inline-block text-left mr-2'>
          <section class='flex flex-row items-center justify-start'>
-            {!fileShareId ? <SearchFiles /> : null}
+            <SearchFiles />

            {isAnyItemChosen
              ? (
@ -741,7 +504,7 @@ export default function MainFiles(
                      onClick={() => toggleBulkOptionsDropdown()}
                    >
                      <img
-                        src={`/public/images/${areBulkOptionsOpen.value ? 'hide-options' : 'show-options'}.svg`}
+                        src={`/images/${areBulkOptionsOpen.value ? 'hide-options' : 'show-options'}.svg`}
                        alt='Bulk actions'
                        class={`white w-5 max-w-5`}
                        width={20}
@ -751,7 +514,7 @@ export default function MainFiles(
                  </div>

                  <div
-                    class={`absolute left-0 z-10 mt-2 w-44 origin-top-left rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
+                    class={`absolute left-0 z-10 mt-2 w-44 origin-top-left rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
                      !areBulkOptionsOpen.value ? 'hidden' : ''
                    }`}
                    role='menu'
@ -776,67 +539,63 @@ export default function MainFiles(
        </section>

        <section class='flex items-center justify-end'>
-          <FilesBreadcrumb path={path.value} fileShareId={fileShareId} />
+          <FilesBreadcrumb path={path.value} />

-          {!fileShareId
-            ? (
-              <section class='relative inline-block text-left ml-2'>
-                <div>
-                  <button
-                    class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2'
-                    type='button'
-                    title='Add new file or directory'
-                    id='new-button'
-                    aria-expanded='true'
-                    aria-haspopup='true'
-                    onClick={() => toggleNewOptionsDropdown()}
-                  >
-                    <img
-                      src='/public/images/add.svg'
-                      alt='Add new file or directory'
-                      class={`white ${isAdding.value || isUploading.value ? 'animate-spin' : ''}`}
-                      width={20}
-                      height={20}
-                    />
-                  </button>
-                </div>
+          <section class='relative inline-block text-left ml-2'>
+            <div>
+              <button
+                class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2'
+                type='button'
+                title='Add new file or directory'
+                id='new-button'
+                aria-expanded='true'
+                aria-haspopup='true'
+                onClick={() => toggleNewOptionsDropdown()}
+              >
+                <img
+                  src='/images/add.svg'
+                  alt='Add new file or directory'
+                  class={`white ${isAdding.value || isUploading.value ? 'animate-spin' : ''}`}
+                  width={20}
+                  height={20}
+                />
+              </button>
+            </div>

-                <div
-                  class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
-                    !areNewOptionsOpen.value ? 'hidden' : ''
-                  }`}
-                  role='menu'
-                  aria-orientation='vertical'
-                  aria-labelledby='new-button'
-                  tabindex={-1}
+            <div
+              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
+                !areNewOptionsOpen.value ? 'hidden' : ''
+              }`}
+              role='menu'
+              aria-orientation='vertical'
+              aria-labelledby='new-button'
+              tabindex={-1}
+            >
+              <div class='py-1'>
+                <button
+                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
+                  onClick={() => onClickUploadFile()}
+                  type='button'
                >
-                  <div class='py-1'>
-                    <button
-                      class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                      onClick={() => onClickUploadFile()}
-                      type='button'
-                    >
-                      Upload Files
-                    </button>
-                    <button
-                      class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                      onClick={() => onClickUploadFile(true)}
-                      type='button'
-                    >
-                      Upload Directory
-                    </button>
-                    <button
-                      class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
-                      onClick={() => onClickCreateDirectory()}
-                      type='button'
-                    >
-                      New Directory
-                    </button>
-                  </div>
-                </div>
-              </section>
-            )
-            : null}
+                  Upload Files
+                </button>
+                <button
+                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
+                  onClick={() => onClickUploadFile(true)}
+                  type='button'
+                >
+                  Upload Directory
+                </button>
+                <button
+                  class={`text-white block px-4 py-2 text-sm w-full text-left hover:bg-slate-600`}
+                  onClick={() => onClickCreateDirectory()}
+                  type='button'
+                >
+                  New Directory
+                </button>
+              </div>
+            </div>
+          </section>
        </section>
      </section>

@ -854,10 +613,6 @@ export default function MainFiles(
          onClickOpenMoveFile={onClickOpenMoveFile}
          onClickDeleteDirectory={onClickDeleteDirectory}
          onClickDeleteFile={onClickDeleteFile}
-          onClickCreateShare={isFileSharingAllowed ? onClickCreateShare : undefined}
-          onClickOpenManageShare={isFileSharingAllowed ? onClickOpenManageShare : undefined}
-          onClickDownloadDirectory={areDirectoryDownloadsAllowed ? onClickDownloadDirectory : undefined}
-          fileShareId={fileShareId}
        />

        <span
@ -866,28 +621,28 @@ export default function MainFiles(
          {isDeleting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
              </>
            )
            : null}
          {isAdding.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Creating...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Creating...
              </>
            )
            : null}
          {isUploading.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Uploading...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Uploading...
              </>
            )
            : null}
          {isUpdating.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Updating...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Updating...
              </>
            )
            : null}
@ -895,76 +650,33 @@ export default function MainFiles(
        </span>
      </section>

-      {!fileShareId
-        ? (
-          <section class='flex flex-row items-center justify-start my-12'>
-            <span class='font-semibold'>WebDav URL:</span>{' '}
-            <code class='bg-slate-600 mx-2 px-2 py-1 rounded-md'>{baseUrl}/dav</code>
-          </section>
-        )
-        : null}
+      <section class='flex flex-row items-center justify-start my-12'>
+        <span class='font-semibold'>WebDav URL:</span>{' '}
+        <code class='bg-slate-600 mx-2 px-2 py-1 rounded-md'>{baseUrl}/dav</code>
+      </section>

-      {!fileShareId
-        ? (
-          <CreateDirectoryModal
-            isOpen={isNewDirectoryModalOpen.value}
-            onClickSave={onClickSaveDirectory}
-            onClose={onCloseCreateDirectory}
-          />
-        )
-        : null}
+      <CreateDirectoryModal
+        isOpen={isNewDirectoryModalOpen.value}
+        onClickSave={onClickSaveDirectory}
+        onClose={onCloseCreateDirectory}
+      />

-      {!fileShareId
-        ? (
-          <RenameDirectoryOrFileModal
-            isOpen={renameDirectoryOrFileModal.value?.isOpen || false}
-            isDirectory={renameDirectoryOrFileModal.value?.isDirectory || false}
-            initialName={renameDirectoryOrFileModal.value?.name || ''}
-            onClickSave={renameDirectoryOrFileModal.value?.isDirectory
-              ? onClickSaveRenameDirectory
-              : onClickSaveRenameFile}
-            onClose={onClickCloseRename}
-          />
-        )
-        : null}
+      <RenameDirectoryOrFileModal
+        isOpen={renameDirectoryOrFileModal.value?.isOpen || false}
+        isDirectory={renameDirectoryOrFileModal.value?.isDirectory || false}
+        initialName={renameDirectoryOrFileModal.value?.name || ''}
+        onClickSave={renameDirectoryOrFileModal.value?.isDirectory ? onClickSaveRenameDirectory : onClickSaveRenameFile}
+        onClose={onClickCloseRename}
+      />

-      {!fileShareId
-        ? (
-          <MoveDirectoryOrFileModal
-            isOpen={moveDirectoryOrFileModal.value?.isOpen || false}
-            isDirectory={moveDirectoryOrFileModal.value?.isDirectory || false}
-            initialPath={moveDirectoryOrFileModal.value?.path || ''}
-            name={moveDirectoryOrFileModal.value?.name || ''}
-            onClickSave={moveDirectoryOrFileModal.value?.isDirectory ? onClickSaveMoveDirectory : onClickSaveMoveFile}
-            onClose={onClickCloseMove}
-          />
-        )
-        : null}
-
-      {!fileShareId && isFileSharingAllowed
-        ? (
-          <CreateShareModal
-            isOpen={createShareModal.value?.isOpen || false}
-            filePath={createShareModal.value?.filePath || ''}
-            password={createShareModal.value?.password || ''}
-            onClickSave={onClickSaveFileShare}
-            onClose={onClickCloseFileShare}
-          />
-        )
-        : null}
-
-      {!fileShareId && isFileSharingAllowed
-        ? (
-          <ManageShareModal
-            baseUrl={baseUrl}
-            isOpen={manageShareModal.value?.isOpen || false}
-            fileShareId={manageShareModal.value?.fileShareId || ''}
-            onClickSave={onClickUpdateFileShare}
-            onClickDelete={onClickDeleteFileShare}
-            onClose={onClickCloseManageShare}
-          />
-        )
-        : null}
+      <MoveDirectoryOrFileModal
+        isOpen={moveDirectoryOrFileModal.value?.isOpen || false}
+        isDirectory={moveDirectoryOrFileModal.value?.isDirectory || false}
+        initialPath={moveDirectoryOrFileModal.value?.path || ''}
+        name={moveDirectoryOrFileModal.value?.name || ''}
+        onClickSave={moveDirectoryOrFileModal.value?.isDirectory ? onClickSaveMoveDirectory : onClickSaveMoveFile}
+        onClose={onClickCloseMove}
+      />
    </>
  );
 }
--- a/components/files/ManageShareModal.tsx
+++ b/components/files/ManageShareModal.tsx
@ -1,126 +0,0 @@
-import { useSignal } from '@preact/signals';
-import { useEffect } from 'preact/hooks';
-
-import { RequestBody, ResponseBody } from '/pages/api/files/get-share.ts';
-import { FileShare } from '/lib/types.ts';
-
-interface ManageShareModalProps {
-  baseUrl: string;
-  isOpen: boolean;
-  fileShareId: string;
-  onClickSave: (fileShareId: string, password?: string) => Promise<void>;
-  onClickDelete: (fileShareId: string) => Promise<void>;
-  onClose: () => void;
-}
-
-export default function ManageShareModal(
-  { baseUrl, isOpen, fileShareId, onClickSave, onClickDelete, onClose }: ManageShareModalProps,
-) {
-  const newPassword = useSignal<string>('');
-
-  const isLoading = useSignal<boolean>(false);
-  const fileShare = useSignal<FileShare | null>(null);
-
-  useEffect(() => {
-    fetchFileShare();
-  }, [fileShareId]);
-
-  async function fetchFileShare() {
-    if (!fileShareId || isLoading.value) {
-      return;
-    }
-
-    isLoading.value = true;
-
-    try {
-      const requestBody: RequestBody = {
-        fileShareId,
-      };
-      const response = await fetch(`/api/files/get-share`, {
-        method: 'POST',
-        body: JSON.stringify(requestBody),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to get file share. ${response.statusText} ${await response.text()}`);
-      }
-
-      const result = await response.json() as ResponseBody;
-
-      if (!result.success) {
-        throw new Error('Failed to get file share!');
-      }
-
-      fileShare.value = result.fileShare;
-
-      isLoading.value = false;
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  return (
-    <>
-      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
-      >
-      </section>
-
-      <section
-        class={`fixed ${
-          isOpen ? 'block' : 'hidden'
-        } z-50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-96 bg-slate-600 text-white rounded-md px-8 py-6 drop-shadow-lg overflow-y-scroll max-h-[80%]`}
-      >
-        <h1 class='text-2xl font-semibold my-5'>Manage Public Share Link</h1>
-        <section class='py-5 my-2 border-y border-slate-500'>
-          <section class='block mb-2'>
-            <span class='font-semibold my-2 block'>Public Share URL:</span>{' '}
-            <code class='bg-slate-700 my-2 px-2 py-1 rounded-md'>{baseUrl}/file-share/{fileShareId}</code>
-          </section>
-          <fieldset class='block mb-2'>
-            <label class='text-slate-300 block pb-1' for='manage-share-password'>
-              {fileShare.value?.extra.hashed_password ? 'New Password' : 'Set Password'}
-            </label>
-            <input
-              class='input-field'
-              type='password'
-              name='manage-share-password'
-              id='manage-share-password'
-              value={newPassword.value}
-              onInput={(event) => {
-                newPassword.value = event.currentTarget.value;
-              }}
-              autocomplete='off'
-            />
-          </fieldset>
-        </section>
-        <footer class='flex justify-between'>
-          <button
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => {
-              onClickSave(fileShareId, newPassword.peek());
-              newPassword.value = '';
-            }}
-            type='button'
-          >
-            Update
-          </button>
-          <button
-            class='px-5 py-2 bg-red-600 hover:bg-red-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClickDelete(fileShareId)}
-            type='button'
-          >
-            Delete
-          </button>
-          <button
-            class='px-5 py-2 bg-slate-600 hover:bg-slate-500 text-white cursor-pointer rounded-md'
-            onClick={() => onClose()}
-            type='button'
-          >
-            Close
-          </button>
-        </footer>
-      </section>
-    </>
-  );
-}
--- a/components/files/MoveDirectoryOrFileModal.tsx
+++ b/components/files/MoveDirectoryOrFileModal.tsx
@ -1,7 +1,7 @@
 import { useSignal } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

-import { RequestBody, ResponseBody } from '/pages/api/files/get-directories.ts';
+import { RequestBody, ResponseBody } from '/routes/api/files/get-directories.tsx';
 import { Directory } from '/lib/types.ts';

 interface MoveDirectoryOrFileModalProps {
@ -42,11 +42,6 @@ export default function MoveDirectoryOrFileModal(
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to get directories. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as ResponseBody;

      if (!result.success) {
@ -78,7 +73,7 @@ export default function MoveDirectoryOrFileModal(
  return (
    <>
      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
+        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900 bg-opacity-60`}
      >
      </section>

@ -123,7 +118,7 @@ export default function MoveDirectoryOrFileModal(
            {isLoading.value
              ? (
                <>
-                  <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Loading...
+                  <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Loading...
                </>
              )
              : null}
--- a/components/files/RenameDirectoryOrFileModal.tsx
+++ b/components/files/RenameDirectoryOrFileModal.tsx
@ -21,7 +21,7 @@ export default function RenameDirectoryOrFileModal(
  return (
    <>
      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
+        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900 bg-opacity-60`}
      >
      </section>

--- a/components/files/SearchFiles.tsx
+++ b/components/files/SearchFiles.tsx
@ -2,9 +2,10 @@ import { useSignal } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

 import { Directory, DirectoryFile } from '/lib/types.ts';
-import { RequestBody, ResponseBody } from '/pages/api/files/search.ts';
+import { RequestBody, ResponseBody } from '/routes/api/files/search.tsx';
+interface SearchFilesProps {}

-export default function SearchFiles() {
+export default function SearchFiles({}: SearchFilesProps) {
  const isSearching = useSignal<boolean>(false);
  const areResultsVisible = useSignal<boolean>(false);
  const matchingDirectories = useSignal<Directory[]>([]);
@ -12,15 +13,13 @@ export default function SearchFiles() {
  const searchTimeout = useSignal<ReturnType<typeof setTimeout>>(0);
  const closeTimeout = useSignal<ReturnType<typeof setTimeout>>(0);

-  const dateFormatOptions: Intl.DateTimeFormatOptions = {
+  const dateFormat = new Intl.DateTimeFormat('en-GB', {
    year: 'numeric',
    month: 'long',
    day: 'numeric',
    hour: 'numeric',
    minute: '2-digit',
-  };
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', dateFormatOptions);
+  });

  function searchFiles(searchTerm: string) {
    if (searchTimeout.value) {
@ -42,11 +41,6 @@ export default function SearchFiles() {
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to search files. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as ResponseBody;

        if (!result.success) {
@ -106,12 +100,12 @@ export default function SearchFiles() {
        onFocus={() => onFocus()}
        onBlur={() => onBlur()}
      />
-      {isSearching.value ? <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} /> : null}
+      {isSearching.value ? <img src='/images/loading.svg' class='white mr-2' width={18} height={18} /> : null}
      {areResultsVisible.value
        ? (
          <section class='relative inline-block text-left ml-2 text-sm'>
            <section
-              class={`absolute right-0 z-10 mt-2 w-80 origin-top-right rounded-md bg-slate-600 shadow-lg ring-1 ring-black/15 focus:outline-none overflow-y-scroll max-h-[80%] min-h-56`}
+              class={`absolute right-0 z-10 mt-2 w-80 origin-top-right rounded-md bg-slate-600 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none overflow-y-scroll max-h-[80%] min-h-56`}
              role='menu'
              aria-orientation='vertical'
              aria-labelledby='view-button'
@ -122,9 +116,7 @@ export default function SearchFiles() {
                  {matchingDirectories.value.map((directory) => (
                    <li class='mb-1'>
                      <a
-                        href={`/files?path=${encodeURIComponent(directory.parent_path)}${
-                          encodeURIComponent(directory.directory_name)
-                        }`}
+                        href={`/files?path=${directory.parent_path}${directory.directory_name}`}
                        class={`block px-2 py-2 hover:no-underline hover:opacity-60 bg-slate-700 cursor-pointer font-normal`}
                        target='_blank'
                        rel='noopener noreferrer'
@ -144,9 +136,7 @@ export default function SearchFiles() {
                  {matchingFiles.value.map((file) => (
                    <li class='mb-1'>
                      <a
-                        href={`/files/open/${encodeURIComponent(file.file_name)}?path=${
-                          encodeURIComponent(file.parent_path)
-                        }`}
+                        href={`/files/open/${file.file_name}?path=${file.parent_path}`}
                        class={`block px-2 py-2 hover:no-underline hover:opacity-60 bg-slate-700 cursor-pointer font-normal`}
                        target='_blank'
                        rel='noopener noreferrer'
--- a/components/files/ShareVerifyForm.tsx
+++ b/components/files/ShareVerifyForm.tsx
@ -1,58 +0,0 @@
-interface ShareVerifyFormProps {
-  error?: { title: string; message: string };
-}
-
-export default function ShareVerifyForm(
-  { error }: ShareVerifyFormProps,
-) {
-  return (
-    <section class='max-w-md w-full mb-12 mx-auto'>
-      <section class='mb-6'>
-        <h2 class='mt-6 text-center text-3xl font-extrabold text-white'>
-          File Share Authentication
-        </h2>
-        <p class='mt-2 text-center text-sm text-gray-300'>
-          You are required to authenticate with a password
-        </p>
-      </section>
-
-      {error
-        ? (
-          <section class='notification-error'>
-            <h3>{error.title}</h3>
-            <p>{error.message}</p>
-          </section>
-        )
-        : null}
-
-      <form
-        class='mb-6'
-        method='POST'
-      >
-        <fieldset class='block mb-4'>
-          <label class='text-slate-300 block pb-1' for='verify-password'>
-            Password
-          </label>
-          <input
-            type='password'
-            id='verify-password'
-            name='password'
-            placeholder='Password'
-            class='mt-1 input-field'
-            autocomplete='off'
-            required
-          />
-        </fieldset>
-
-        <section class='flex justify-center mt-8 mb-4'>
-          <button
-            type='submit'
-            class='button'
-          >
-            Verify Password
-          </button>
-        </section>
-      </form>
-    </section>
-  );
-}
--- a/components/notes/CreateNoteModal.tsx
+++ b/components/notes/CreateNoteModal.tsx
@ -14,7 +14,7 @@ export default function CreateNoteModal(
  return (
    <>
      <section
-        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900/60`}
+        class={`fixed ${isOpen ? 'block' : 'hidden'} z-40 w-screen h-screen inset-0 bg-gray-900 bg-opacity-60`}
      >
      </section>

--- a/components/notes/MainNotes.tsx
+++ b/components/notes/MainNotes.tsx
@ -1,16 +1,16 @@
 import { useSignal } from '@preact/signals';

 import { Directory, DirectoryFile } from '/lib/types.ts';
-import { ResponseBody as UploadResponseBody } from '/pages/api/files/upload.ts';
-import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/pages/api/files/delete.ts';
+import { ResponseBody as UploadResponseBody } from '/routes/api/files/upload.tsx';
+import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/routes/api/files/delete.tsx';
 import {
  RequestBody as CreateDirectoryRequestBody,
  ResponseBody as CreateDirectoryResponseBody,
-} from '/pages/api/files/create-directory.ts';
+} from '/routes/api/files/create-directory.tsx';
 import {
  RequestBody as DeleteDirectoryRequestBody,
  ResponseBody as DeleteDirectoryResponseBody,
-} from '/pages/api/files/delete-directory.ts';
+} from '/routes/api/files/delete-directory.tsx';
 import ListFiles from '/components/files/ListFiles.tsx';
 import FilesBreadcrumb from '/components/files/FilesBreadcrumb.tsx';
 import CreateDirectoryModal from '/components/files/CreateDirectoryModal.tsx';
@ -64,11 +64,6 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
        method: 'POST',
        body: requestBody,
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to create note. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as UploadResponseBody;

      if (!result.success) {
@ -119,11 +114,6 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to create directory. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as CreateDirectoryResponseBody;

      if (!result.success) {
@ -165,11 +155,6 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete directory. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as DeleteDirectoryResponseBody;

        if (!result.success) {
@ -202,11 +187,6 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete note. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as DeleteResponseBody;

        if (!result.success) {
@ -240,7 +220,7 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
                onClick={() => toggleNewOptionsDropdown()}
              >
                <img
-                  src='/public/images/add.svg'
+                  src='/images/add.svg'
                  alt='Add new note or directory'
                  class={`white ${isAdding.value ? 'animate-spin' : ''}`}
                  width={20}
@ -250,7 +230,7 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
            </div>

            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
+              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
                !areNewOptionsOption.value ? 'hidden' : ''
              }`}
              role='menu'
@ -294,14 +274,14 @@ export default function MainNotes({ initialDirectories, initialFiles, initialPat
          {isDeleting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
              </>
            )
            : null}
          {isAdding.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Creating...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Creating...
              </>
            )
            : null}
--- a/components/photos/ListPhotos.tsx
+++ b/components/photos/ListPhotos.tsx
@ -1,5 +1,5 @@
 import { DirectoryFile } from '/lib/types.ts';
-import { PHOTO_IMAGE_EXTENSIONS, PHOTO_VIDEO_EXTENSIONS } from '/public/ts/utils/photos.ts';
+import { PHOTO_IMAGE_EXTENSIONS, PHOTO_VIDEO_EXTENSIONS } from '/lib/utils/photos.ts';

 interface ListPhotosProps {
  files: DirectoryFile[];
@ -30,9 +30,7 @@ export default function ListPhotos(
              return (
                <article class='hover:opacity-70'>
                  <a
-                    href={`/files/open/${encodeURIComponent(file.file_name)}?path=${
-                      encodeURIComponent(file.parent_path)
-                    }`}
+                    href={`/files/open/${file.file_name}?path=${file.parent_path}`}
                    class='flex items-center'
                    target='_blank'
                    rel='noopener noreferrer'
@ -41,9 +39,7 @@ export default function ListPhotos(
                      ? (
                        <video class='h-auto max-w-full rounded-md' title={file.file_name}>
                          <source
-                            src={`/files/open/${encodeURIComponent(file.file_name)}?path=${
-                              encodeURIComponent(file.parent_path)
-                            }`}
+                            src={`/files/open/${file.file_name}?path=${file.parent_path}`}
                            type={`video/${extensionName}`}
                          />
                        </video>
@ -52,9 +48,7 @@ export default function ListPhotos(
                    {isImage
                      ? (
                        <img
-                          src={`/photos/thumbnail/${encodeURIComponent(file.file_name)}?path=${
-                            encodeURIComponent(file.parent_path)
-                          }`}
+                          src={`/photos/thumbnail/${file.file_name}?path=${file.parent_path}`}
                          class='h-auto max-w-full rounded-md'
                          alt={file.file_name}
                          title={file.file_name}
--- a/components/photos/MainPhotos.tsx
+++ b/components/photos/MainPhotos.tsx
@ -1,11 +1,11 @@
 import { useSignal } from '@preact/signals';

 import { Directory, DirectoryFile } from '/lib/types.ts';
-import { ResponseBody as UploadResponseBody } from '/pages/api/files/upload.ts';
+import { ResponseBody as UploadResponseBody } from '/routes/api/files/upload.tsx';
 import {
  RequestBody as CreateDirectoryRequestBody,
  ResponseBody as CreateDirectoryResponseBody,
-} from '/pages/api/files/create-directory.ts';
+} from '/routes/api/files/create-directory.tsx';
 import CreateDirectoryModal from '/components/files/CreateDirectoryModal.tsx';
 import ListFiles from '/components/files/ListFiles.tsx';
 import FilesBreadcrumb from '/components/files/FilesBreadcrumb.tsx';
@ -58,11 +58,6 @@ export default function MainPhotos({ initialDirectories, initialFiles, initialPa
            method: 'POST',
            body: requestBody,
          });
-
-          if (!response.ok) {
-            throw new Error(`Failed to upload photo. ${response.statusText} ${await response.text()}`);
-          }
-
          const result = await response.json() as UploadResponseBody;

          if (!result.success) {
@ -109,11 +104,6 @@ export default function MainPhotos({ initialDirectories, initialFiles, initialPa
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to create directory. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as CreateDirectoryResponseBody;

      if (!result.success) {
@ -156,7 +146,7 @@ export default function MainPhotos({ initialDirectories, initialFiles, initialPa
                onClick={() => toggleNewOptionsDropdown()}
              >
                <img
-                  src='/public/images/add.svg'
+                  src='/images/add.svg'
                  alt='Add new file or directory'
                  class={`white ${isAdding.value || isUploading.value ? 'animate-spin' : ''}`}
                  width={20}
@ -166,7 +156,7 @@ export default function MainPhotos({ initialDirectories, initialFiles, initialPa
            </div>

            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
+              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
                !areNewOptionsOption.value ? 'hidden' : ''
              }`}
              role='menu'
@ -212,14 +202,14 @@ export default function MainPhotos({ initialDirectories, initialFiles, initialPa
          {isAdding.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Creating...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Creating...
              </>
            )
            : null}
          {isUploading.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Uploading...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Uploading...
              </>
            )
            : null}
--- a/crons/index.ts
+++ b/crons/index.ts
@ -1,4 +1,4 @@
-import { Cron } from '@hexagon/croner';
+import { Cron } from 'https://deno.land/x/croner@8.1.2/dist/croner.js';

 import { AppConfig } from '/lib/config.ts';
 import { cleanupSessions } from './sessions.ts';
--- a/crons/news.ts
+++ b/crons/news.ts
@ -1,6 +1,6 @@
 import Database, { sql } from '/lib/interfaces/database.ts';
 import { NewsFeed } from '/lib/types.ts';
-import { concurrentPromises } from '/public/ts/utils/misc.ts';
+import { concurrentPromises } from '/lib/utils/misc.ts';
 import { FeedModel } from '/lib/models/news.ts';

 const db = new Database();
--- a/db-migrations/004-public-file-sharing.pgsql
+++ b/db-migrations/004-public-file-sharing.pgsql
@ -1,22 +0,0 @@
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET idle_in_transaction_session_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SELECT pg_catalog.set_config('search_path', '', false);
-SET check_function_bodies = false;
-SET xmloption = content;
-SET client_min_messages = warning;
-SET row_security = off;
-
-CREATE TABLE public.bewcloud_file_shares (
-    id uuid DEFAULT gen_random_uuid(),
-    user_id uuid DEFAULT gen_random_uuid(),
-    file_path text NOT NULL,
-    extra jsonb NOT NULL,
-    created_at timestamp with time zone DEFAULT now()
-);
-
-ALTER TABLE ONLY public.bewcloud_file_shares ADD CONSTRAINT bewcloud_file_shares_pkey PRIMARY KEY (id);
-ALTER TABLE ONLY public.bewcloud_file_shares ADD CONSTRAINT bewcloud_file_shares_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.bewcloud_users(id);
-ALTER TABLE ONLY public.bewcloud_file_shares ADD CONSTRAINT bewcloud_file_shares_user_id_file_path_unique UNIQUE (user_id, file_path);
--- a/deno.json
+++ b/deno.json
@ -1,98 +1,47 @@
 {
-  "lock": true,
+  "lock": false,
  "tasks": {
-    "execute-with-permissions": "deno run --allow-env --allow-net --allow-sys=networkInterfaces,hostname,cpus,homedir --allow-read=.,/ --allow-write=data-files,/ --allow-run",
-    "check": "deno fmt --check && deno lint && deno check .",
-    "build": "make build",
-    "preview": "deno task execute-with-permissions ./main.ts",
-    "test": "IS_TESTING=true deno test --allow-all --check",
-    "migrate-db": "deno task execute-with-permissions ./migrate-db.ts",
-    "watch-app": "deno task execute-with-permissions --watch --watch-exclude=./public/css/tailwind.css,./public/components ./main.ts",
-    "watch-babel": "make watch-babel",
-    "watch-tailwind": "make watch-tailwind",
-    "download-frontend-imports": "deno run --allow-read=./deno.json,./public/js --allow-write=./public/js --allow-net=esm.sh ./download-frontend-imports.ts",
-    "start": {
-      "dependencies": ["watch-tailwind", "watch-babel", "watch-app"]
-    }
-  },
-  "fmt": {
-    "useTabs": false,
-    "lineWidth": 120,
-    "indentWidth": 2,
-    "singleQuote": true,
-    "proseWrap": "preserve",
-    "exclude": ["README.md", "lib/models/dav.js", "public/css/tailwind.css"]
+    "check": "deno fmt --check && deno lint && deno check **/*.ts && deno check **/*.tsx",
+    "cli": "echo \"import '\\$fresh/src/dev/cli.ts'\" | deno run --unstable -A -",
+    "manifest": "deno task cli manifest $(pwd)",
+    "start": "deno run -A --watch=static/,routes/,lib/,components/,islands/ dev.ts",
+    "build": "deno run -A dev.ts build",
+    "preview": "deno run -A main.ts",
+    "update": "deno run -A -r https://fresh.deno.dev/update .",
+    "test": "deno test -A --check"
  },
+  "fmt": { "useTabs": false, "lineWidth": 120, "indentWidth": 2, "singleQuote": true, "proseWrap": "preserve" },
  "lint": {
    "rules": {
-      "tags": ["recommended"],
-      "exclude": ["no-explicit-any", "no-window"]
-    },
-    "exclude": ["lib/models/dav.js"]
-  },
-  "exclude": ["./node_modules/*", "./public/js/*", "./public/components/*"],
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "jsxImportSource": "preact",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "dom.asynciterable",
-      "deno.ns"
-    ]
+      "tags": ["fresh", "recommended"],
+      "exclude": ["no-explicit-any", "no-empty-interface", "no-window", "no-unused-vars"]
+    }
  },
+  "exclude": ["./_fresh/*", "./node_modules/*", "**/_fresh/*"],
+  "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "preact" },
  "nodeModulesDir": "auto",
  "imports": {
    "/": "./",
    "./": "./",
-
-    "sass": "https://deno.land/x/denosass@1.0.6/mod.ts",
-    "@libs/xml": "https://deno.land/x/xml@2.1.3/mod.ts",
-
-    "chart.js": "https://esm.sh/chart.js@4.5.1",
-    "chart.js/auto": "https://esm.sh/chart.js@4.5.1/auto",
-    "preact": "https://esm.sh/preact@10.28.4",
-    "preact/jsx-runtime": "https://esm.sh/preact@10.28.4/jsx-runtime",
-    "preact/hooks": "https://esm.sh/preact@10.28.4/hooks",
-    "preact-render-to-string": "https://esm.sh/preact-render-to-string@6.6.5?deps=preact@10.28.4",
-    "@preact/signals": "https://esm.sh/*@preact/signals@2.8.1?deps=preact@10.28.4",
-    "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.13.0?deps=preact@10.28.4",
-    "@simplewebauthn/browser": "https://esm.sh/@simplewebauthn/browser@13.2.2",
-    "@std/path": "https://esm.sh/jsr/@std/path@1.1.4",
-
-    "deno/emit": "jsr:@deno/emit@0.46.0",
-    "postgres": "jsr:@db/postgres@0.19.5",
-    "@b-fuze/deno-dom": "jsr:@b-fuze/deno-dom@0.1.56",
-    "@hexagon/croner": "jsr:@hexagon/croner@10.0.1",
-    "@mikaelporttila/rss": "jsr:@mikaelporttila/rss@1.1.3",
-    "@libs/qrcode": "jsr:@libs/qrcode@3.0.1",
-    "@simplewebauthn/server": "jsr:@simplewebauthn/server@13.2.2",
-    "@std/assert": "jsr:@std/assert@1.0.18",
-    "@std/dotenv": "jsr:@std/dotenv@0.225.6",
-    "@std/encoding": "jsr:@std/encoding@1.0.10",
-    "@std/http": "jsr:@std/http@1.0.24",
-
-    "jimp": "npm:jimp@1.6.0",
-    "mrmime": "npm:mrmime@2.0.1",
-    "nodemailer": "npm:nodemailer@8.0.1",
-    "openid-client": "npm:openid-client@6.8.2",
-    "otpauth": "npm:otpauth@9.5.0",
-    "tailwindcss": "npm:tailwindcss@4.2.0",
-    "@tailwindcss/cli": "npm:@tailwindcss/cli@4.2.0",
-    "@babel/cli": "npm:@babel/cli@7.28.6",
-    "@babel/core": "npm:@babel/core@7.29.0",
-    "@babel/plugin-transform-react-jsx": "npm:@babel/plugin-transform-react-jsx@7.28.6",
-    "@babel/preset-react": "npm:@babel/preset-react@7.28.5",
-    "@babel/preset-typescript": "npm:@babel/preset-typescript@7.28.5"
-  },
-  "frontendImports": [
-    "chart.js",
-    "chart.js/auto",
-    "preact",
-    "preact/hooks",
-    "@preact/signals",
-    "@preact/signals-core",
-    "@simplewebauthn/browser",
-    "@std/path"
-  ]
+    "xml": "https://deno.land/x/xml@2.1.3/mod.ts",
+    "mrmime": "https://deno.land/x/mrmime@v2.0.0/mod.ts",
+    "fresh/": "https://deno.land/x/fresh@1.7.3/",
+    "$fresh/": "https://deno.land/x/fresh@1.7.3/",
+    "preact": "https://esm.sh/preact@10.23.2",
+    "preact/": "https://esm.sh/preact@10.23.2/",
+    "@preact/signals": "https://esm.sh/*@preact/signals@1.3.0",
+    "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.8.0",
+    "tailwindcss": "npm:tailwindcss@3.4.17",
+    "tailwindcss/": "npm:/tailwindcss@3.4.17/",
+    "tailwindcss/plugin": "npm:/tailwindcss@3.4.17/plugin.js",
+    "std/": "https://deno.land/std@0.224.0/",
+    "$std/": "https://deno.land/std@0.224.0/",
+    "chart.js": "https://esm.sh/chart.js@4.4.9/auto",
+    "otpauth": "https://esm.sh/otpauth@9.4.0",
+    "qrcode": "https://esm.sh/qrcode@1.5.4",
+    "openid-client": "https://esm.sh/openid-client@6.5.0",
+    "@simplewebauthn/server": "jsr:@simplewebauthn/server@13.1.1",
+    "@simplewebauthn/server/helpers": "jsr:@simplewebauthn/server@13.1.1/helpers",
+    "@simplewebauthn/browser": "jsr:@simplewebauthn/browser@13.1.0"
+  }
 }
--- a/deno.lock
+++ b/deno.lock
--- a/dev.ts
+++ b/dev.ts
@ -0,0 +1,8 @@
+#!/usr/bin/env -S deno run -A --watch=static/,routes/,lib/,components/,islands/
+
+import dev from 'fresh/dev.ts';
+import config from './fresh.config.ts';
+
+import 'std/dotenv/load.ts';
+
+await dev(import.meta.url, './main.ts', config);
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -1,42 +1,19 @@
 services:
  postgresql:
-    image: postgres:18.1
+    image: postgres:15
    environment:
      - POSTGRES_USER=postgres
      - POSTGRES_PASSWORD=fake
      - POSTGRES_DB=bewcloud
    restart: on-failure
    volumes:
-      - pgdata:/var/lib/postgresql/18/docker
+      - pgdata:/var/lib/postgresql/data
    ports:
      - 5432:5432
    ulimits:
      memlock:
        soft: -1
        hard: -1
-    mem_limit: '256m'
-
-  # NOTE: If you don't want to use the CardDav/CalDav servers, you can comment/remove this service.
-  radicale:
-    image: tomsquest/docker-radicale:3.6.0.0
-    ports:
-      - 5232:5232
-    init: true
-    read_only: true
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - ALL
-    cap_add:
-      - SETUID
-      - SETGID
-      - CHOWN
-      - KILL
-    restart: unless-stopped
-    volumes:
-      - ./data-radicale:/data
-      - ./radicale-config:/config:ro
-    mem_limit: '256m'

 volumes:
  pgdata:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,10 +1,6 @@
 services:
  website:
-    image: ghcr.io/bewcloud/bewcloud:v4.1.2
-    # NOTE: uncomment below (and comment above) only if you pulled the repo and want to build the image locally
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile
+    image: ghcr.io/bewcloud/bewcloud:main # alternatively, you can use a specific version/tag, for greater stability
    restart: always
    ports:
      - 127.0.0.1:8000:8000
@ -14,49 +10,25 @@ services:
        required: true
    volumes:
      - ./data-files:/app/data-files
-      - ./bewcloud.config.ts:/app/bewcloud.config.ts
+      # - ./bewcloud.config.ts:/app/bewcloud.config.ts # uncomment if you need to override the default config

  postgresql:
-    image: postgres:18.1
+    image: postgres:15
    environment:
      - POSTGRES_USER=postgres
      - POSTGRES_PASSWORD=fake
      - POSTGRES_DB=bewcloud
-    restart: always
+    restart: on-failure
    volumes:
-      - bewcloud-db:/var/lib/postgresql/18/docker
-    # NOTE: uncomment below only if you need to connect to the database from outside the container
-    # ports:
-    #   - 127.0.0.1:5432:5432
+      - bewcloud-db:/var/lib/postgresql/data
+    ports:
+      - 127.0.0.1:5432:5432
    ulimits:
      memlock:
        soft: -1
        hard: -1
    mem_limit: '256m'

-  # NOTE: If you don't want to use the CardDav/CalDav servers, you can comment/remove this service.
-  radicale:
-    image: tomsquest/docker-radicale:3.6.0.0
-    # NOTE: uncomment below only if you need to connect to the CardDav/CalDav servers from outside the container
-    # ports:
-    #   - 127.0.0.1:5232:5232
-    init: true
-    read_only: true
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - ALL
-    cap_add:
-      - SETUID
-      - SETGID
-      - CHOWN
-      - KILL
-    restart: always
-    volumes:
-      - ./data-radicale:/data
-      - ./radicale-config:/config:ro
-    mem_limit: '256m'
-
 volumes:
  bewcloud-db:
    driver: local
--- a/download-frontend-imports.ts
+++ b/download-frontend-imports.ts
@ -1,183 +0,0 @@
-import denoConfig from '/deno.json' with { type: 'json' };
-import { dirname } from '@std/path';
-
-const downloadDirectory = `${Deno.cwd()}/public/js`;
-
-function extractFileNameFromUrl(url: string) {
-  let fileName = url.replace('https://esm.sh/', '').split('?')[0].trim();
-  if (!fileName.endsWith('.mjs') && !fileName.includes('color@^0.3.0')) {
-    fileName = `${fileName}.mjs`;
-  }
-  return fileName;
-}
-
-async function ensureDirectoryExistsForFileName(fileName: string) {
-  const directory = dirname(fileName);
-  try {
-    const stat = await Deno.stat(directory);
-    if (!stat.isDirectory) {
-      throw new Error(`Directory ${directory} is not a directory`);
-    }
-  } catch (error) {
-    if ((error as Error).toString().includes('NotFound')) {
-      await Deno.mkdir(directory, { recursive: true });
-    }
-  }
-}
-
-function getUrlsToDownload(): Map<string, { url: string; fileName: string }> {
-  const urlMap = new Map<string, { url: string; fileName: string }>();
-  const { imports, frontendImports } = denoConfig;
-
-  for (const importName of frontendImports) {
-    const url = new URL(imports[importName as keyof typeof imports]);
-    // url.searchParams.append('standalone', ''); // This should be easier, but it results in broken bundles (probably because of the missing peerDependencies)
-
-    const finalUrl = url.toString();
-
-    urlMap.set(importName, { url: finalUrl, fileName: extractFileNameFromUrl(finalUrl) });
-  }
-
-  return urlMap;
-}
-
-async function downloadUrls(urlMap: Map<string, { url: string; fileName: string }>) {
-  for (const { url, fileName } of urlMap.values()) {
-    console.log(`Fetching source file ${fileName} (${url})...`);
-    const response = await fetch(url);
-    const sourceContent = await response.text();
-
-    const sourceLines = sourceContent.split('\n');
-    for (const sourceLine of sourceLines) {
-      const dependencyUrlsMap = new Map<string, { url: string; fileName: string }>();
-      const importUrlInSourceContent = sourceLine.split('import "')[1]?.split('"')[0];
-      const exportUrlInSourceContent = sourceLine.split('export * from "')[1]?.split('"')[0];
-      const defaultExportUrlInSourceContent = sourceLine.split('export { default } from "')[1]?.split('"')[0];
-
-      if (importUrlInSourceContent) {
-        const importUrl = new URL(`https://esm.sh${importUrlInSourceContent}`).toString();
-        dependencyUrlsMap.set(importUrlInSourceContent, {
-          url: importUrl,
-          fileName: extractFileNameFromUrl(importUrl),
-        });
-      }
-
-      if (exportUrlInSourceContent) {
-        const exportUrl = new URL(`https://esm.sh${exportUrlInSourceContent}`).toString();
-        dependencyUrlsMap.set(exportUrlInSourceContent, {
-          url: exportUrl,
-          fileName: extractFileNameFromUrl(exportUrl),
-        });
-      }
-
-      if (defaultExportUrlInSourceContent) {
-        const defaultExportUrl = new URL(`https://esm.sh${defaultExportUrlInSourceContent}`).toString();
-        dependencyUrlsMap.set(defaultExportUrlInSourceContent, {
-          url: defaultExportUrl,
-          fileName: extractFileNameFromUrl(defaultExportUrl),
-        });
-      }
-
-      await downloadUrls(dependencyUrlsMap);
-
-      continue;
-    }
-
-    console.log(`Downloading bundle file ${fileName} (${url})...`);
-
-    const bundleResponse = await fetch(url);
-    let bundleFileContent = await bundleResponse.text();
-
-    // Update absolute import paths
-    bundleFileContent = bundleFileContent.replaceAll('import "/', 'import "/public/js/');
-    bundleFileContent = bundleFileContent.replaceAll('import"/', 'import"/public/js/');
-    // Update absolute export paths
-    bundleFileContent = bundleFileContent.replaceAll('export * from "/', 'export * from "/public/js/');
-    bundleFileContent = bundleFileContent.replaceAll('from"/', 'from"/public/js/'); // minified files
-    // Update absolute default export paths
-    bundleFileContent = bundleFileContent.replaceAll(
-      'export { default } from "/',
-      'export { default } from "/public/js/',
-    );
-    // Remove sourcemap URLs (they're not downloaded)
-    bundleFileContent = bundleFileContent.replaceAll('//# sourceMappingURL=', '//');
-
-    const fullFilePath = `${downloadDirectory}/${fileName}`;
-
-    console.log(`Writing bundle file ${fileName} (${fullFilePath})...`);
-
-    await ensureDirectoryExistsForFileName(fullFilePath);
-
-    await Deno.writeTextFile(fullFilePath, bundleFileContent);
-  }
-}
-
-async function main() {
-  const urlMap = getUrlsToDownload();
-
-  // These are some extra imports that are harder to match from analyzing the imported files (just related to @std/path)
-  urlMap.set('@std/path/internals', {
-    url: 'https://esm.sh/@jsr/std__internal@^1.0.12/os',
-    fileName: '@jsr/std__internal@^1.0.12/os',
-  });
-
-  const osPaths = [
-    'basename',
-    'constants',
-    'dirname',
-    'extname',
-    'format',
-    'from-file-url',
-    'glob-to-regexp',
-    'is-absolute',
-    'join-globs',
-    'join',
-    'normalize-glob',
-    'normalize',
-    'parse',
-    'relative',
-    'resolve',
-    'to-file-url',
-    'to-namespaced-path',
-    '_util',
-  ];
-  for (const path of osPaths) {
-    urlMap.set(`@std/path/posix/${path}`, {
-      url: `https://esm.sh/@jsr/std__path@1.1.4/denonext/posix/${path}.mjs`,
-      fileName: `@jsr/std__path@1.1.4/denonext/posix/${path}.mjs`,
-    });
-    urlMap.set(`@std/path/windows/${path}`, {
-      url: `https://esm.sh/@jsr/std__path@1.1.4/denonext/windows/${path}.mjs`,
-      fileName: `@jsr/std__path@1.1.4/denonext/windows/${path}.mjs`,
-    });
-  }
-
-  const commonPaths = [
-    'common',
-    'basename',
-    'assert_path',
-    'strip_trailing_separators',
-    'dirname',
-    'constants',
-    'format',
-    'from_file_url',
-    'glob_to_reg_exp',
-    'normalize',
-    'normalize_string',
-    'relative',
-    'to_file_url',
-  ];
-  for (const path of commonPaths) {
-    urlMap.set(`@std/path/common/${path}`, {
-      url: `https://esm.sh/@jsr/std__path@1.1.4/denonext/_common/${path}.mjs`,
-      fileName: `@jsr/std__path@1.1.4/denonext/_common/${path}.mjs`,
-    });
-  }
-
-  await downloadUrls(urlMap);
-
-  console.log('Done');
-  Deno.exit(0);
-}
-
-main();
--- a/fresh.config.ts
+++ b/fresh.config.ts
@ -0,0 +1,14 @@
+import { defineConfig } from 'fresh/server.ts';
+import tailwind from 'fresh/plugins/tailwind.ts';
+
+import { startCrons } from '/crons/index.ts';
+
+const isBuildMode = Deno.args.includes('build');
+
+if (!isBuildMode) {
+  await startCrons();
+}
+
+export default defineConfig({
+  plugins: [tailwind()],
+});
--- a/fresh.gen.ts
+++ b/fresh.gen.ts
@ -0,0 +1,151 @@
+// DO NOT EDIT. This file is generated by Fresh.
+// This file SHOULD be checked into source version control.
+// This file is automatically updated during development when running `dev.ts`.
+
+import * as $_404 from './routes/_404.tsx';
+import * as $_app from './routes/_app.tsx';
+import * as $_middleware from './routes/_middleware.tsx';
+import * as $api_auth_multi_factor_disable from './routes/api/auth/multi-factor/disable.ts';
+import * as $api_auth_multi_factor_enable from './routes/api/auth/multi-factor/enable.ts';
+import * as $api_auth_multi_factor_passkey_begin from './routes/api/auth/multi-factor/passkey/begin.ts';
+import * as $api_auth_multi_factor_passkey_setup_begin from './routes/api/auth/multi-factor/passkey/setup-begin.ts';
+import * as $api_auth_multi_factor_passkey_setup_complete from './routes/api/auth/multi-factor/passkey/setup-complete.ts';
+import * as $api_auth_multi_factor_passkey_verify from './routes/api/auth/multi-factor/passkey/verify.ts';
+import * as $api_auth_multi_factor_totp_setup from './routes/api/auth/multi-factor/totp/setup.ts';
+import * as $api_dashboard_save_links from './routes/api/dashboard/save-links.tsx';
+import * as $api_dashboard_save_notes from './routes/api/dashboard/save-notes.tsx';
+import * as $api_expenses_add_budget from './routes/api/expenses/add-budget.tsx';
+import * as $api_expenses_add_expense from './routes/api/expenses/add-expense.tsx';
+import * as $api_expenses_auto_complete from './routes/api/expenses/auto-complete.tsx';
+import * as $api_expenses_delete_budget from './routes/api/expenses/delete-budget.tsx';
+import * as $api_expenses_delete_expense from './routes/api/expenses/delete-expense.tsx';
+import * as $api_expenses_export_expenses from './routes/api/expenses/export-expenses.tsx';
+import * as $api_expenses_import_expenses from './routes/api/expenses/import-expenses.tsx';
+import * as $api_expenses_update_budget from './routes/api/expenses/update-budget.tsx';
+import * as $api_expenses_update_expense from './routes/api/expenses/update-expense.tsx';
+import * as $api_files_create_directory from './routes/api/files/create-directory.tsx';
+import * as $api_files_delete_directory from './routes/api/files/delete-directory.tsx';
+import * as $api_files_delete from './routes/api/files/delete.tsx';
+import * as $api_files_get_directories from './routes/api/files/get-directories.tsx';
+import * as $api_files_get from './routes/api/files/get.tsx';
+import * as $api_files_move_directory from './routes/api/files/move-directory.tsx';
+import * as $api_files_move from './routes/api/files/move.tsx';
+import * as $api_files_rename_directory from './routes/api/files/rename-directory.tsx';
+import * as $api_files_rename from './routes/api/files/rename.tsx';
+import * as $api_files_search from './routes/api/files/search.tsx';
+import * as $api_files_upload from './routes/api/files/upload.tsx';
+import * as $api_news_add_feed from './routes/api/news/add-feed.tsx';
+import * as $api_news_delete_feed from './routes/api/news/delete-feed.tsx';
+import * as $api_news_import_feeds from './routes/api/news/import-feeds.tsx';
+import * as $api_news_mark_read from './routes/api/news/mark-read.tsx';
+import * as $api_news_refresh_articles from './routes/api/news/refresh-articles.tsx';
+import * as $api_notes_save from './routes/api/notes/save.tsx';
+import * as $dashboard from './routes/dashboard.tsx';
+import * as $dav from './routes/dav.tsx';
+import * as $expenses from './routes/expenses.tsx';
+import * as $files from './routes/files.tsx';
+import * as $files_open_fileName_ from './routes/files/open/[fileName].tsx';
+import * as $index from './routes/index.tsx';
+import * as $login from './routes/login.tsx';
+import * as $logout from './routes/logout.tsx';
+import * as $mfa_verify from './routes/mfa-verify.tsx';
+import * as $news from './routes/news.tsx';
+import * as $news_feeds from './routes/news/feeds.tsx';
+import * as $notes from './routes/notes.tsx';
+import * as $notes_open_fileName_ from './routes/notes/open/[fileName].tsx';
+import * as $oidc_callback from './routes/oidc/callback.tsx';
+import * as $photos from './routes/photos.tsx';
+import * as $photos_thumbnail_fileName_ from './routes/photos/thumbnail/[fileName].tsx';
+import * as $settings from './routes/settings.tsx';
+import * as $signup from './routes/signup.tsx';
+import * as $Settings from './islands/Settings.tsx';
+import * as $auth_MultiFactorAuthSettings from './islands/auth/MultiFactorAuthSettings.tsx';
+import * as $auth_PasswordlessPasskeyLogin from './islands/auth/PasswordlessPasskeyLogin.tsx';
+import * as $dashboard_Links from './islands/dashboard/Links.tsx';
+import * as $dashboard_Notes from './islands/dashboard/Notes.tsx';
+import * as $expenses_ExpensesWrapper from './islands/expenses/ExpensesWrapper.tsx';
+import * as $files_FilesWrapper from './islands/files/FilesWrapper.tsx';
+import * as $news_Articles from './islands/news/Articles.tsx';
+import * as $news_Feeds from './islands/news/Feeds.tsx';
+import * as $notes_Note from './islands/notes/Note.tsx';
+import * as $notes_NotesWrapper from './islands/notes/NotesWrapper.tsx';
+import * as $photos_PhotosWrapper from './islands/photos/PhotosWrapper.tsx';
+import type { Manifest } from '$fresh/server.ts';
+
+const manifest = {
+  routes: {
+    './routes/_404.tsx': $_404,
+    './routes/_app.tsx': $_app,
+    './routes/_middleware.tsx': $_middleware,
+    './routes/api/auth/multi-factor/disable.ts': $api_auth_multi_factor_disable,
+    './routes/api/auth/multi-factor/enable.ts': $api_auth_multi_factor_enable,
+    './routes/api/auth/multi-factor/passkey/begin.ts': $api_auth_multi_factor_passkey_begin,
+    './routes/api/auth/multi-factor/passkey/setup-begin.ts': $api_auth_multi_factor_passkey_setup_begin,
+    './routes/api/auth/multi-factor/passkey/setup-complete.ts': $api_auth_multi_factor_passkey_setup_complete,
+    './routes/api/auth/multi-factor/passkey/verify.ts': $api_auth_multi_factor_passkey_verify,
+    './routes/api/auth/multi-factor/totp/setup.ts': $api_auth_multi_factor_totp_setup,
+    './routes/api/dashboard/save-links.tsx': $api_dashboard_save_links,
+    './routes/api/dashboard/save-notes.tsx': $api_dashboard_save_notes,
+    './routes/api/expenses/add-budget.tsx': $api_expenses_add_budget,
+    './routes/api/expenses/add-expense.tsx': $api_expenses_add_expense,
+    './routes/api/expenses/auto-complete.tsx': $api_expenses_auto_complete,
+    './routes/api/expenses/delete-budget.tsx': $api_expenses_delete_budget,
+    './routes/api/expenses/delete-expense.tsx': $api_expenses_delete_expense,
+    './routes/api/expenses/export-expenses.tsx': $api_expenses_export_expenses,
+    './routes/api/expenses/import-expenses.tsx': $api_expenses_import_expenses,
+    './routes/api/expenses/update-budget.tsx': $api_expenses_update_budget,
+    './routes/api/expenses/update-expense.tsx': $api_expenses_update_expense,
+    './routes/api/files/create-directory.tsx': $api_files_create_directory,
+    './routes/api/files/delete-directory.tsx': $api_files_delete_directory,
+    './routes/api/files/delete.tsx': $api_files_delete,
+    './routes/api/files/get-directories.tsx': $api_files_get_directories,
+    './routes/api/files/get.tsx': $api_files_get,
+    './routes/api/files/move-directory.tsx': $api_files_move_directory,
+    './routes/api/files/move.tsx': $api_files_move,
+    './routes/api/files/rename-directory.tsx': $api_files_rename_directory,
+    './routes/api/files/rename.tsx': $api_files_rename,
+    './routes/api/files/search.tsx': $api_files_search,
+    './routes/api/files/upload.tsx': $api_files_upload,
+    './routes/api/news/add-feed.tsx': $api_news_add_feed,
+    './routes/api/news/delete-feed.tsx': $api_news_delete_feed,
+    './routes/api/news/import-feeds.tsx': $api_news_import_feeds,
+    './routes/api/news/mark-read.tsx': $api_news_mark_read,
+    './routes/api/news/refresh-articles.tsx': $api_news_refresh_articles,
+    './routes/api/notes/save.tsx': $api_notes_save,
+    './routes/dashboard.tsx': $dashboard,
+    './routes/dav.tsx': $dav,
+    './routes/expenses.tsx': $expenses,
+    './routes/files.tsx': $files,
+    './routes/files/open/[fileName].tsx': $files_open_fileName_,
+    './routes/index.tsx': $index,
+    './routes/login.tsx': $login,
+    './routes/logout.tsx': $logout,
+    './routes/mfa-verify.tsx': $mfa_verify,
+    './routes/news.tsx': $news,
+    './routes/news/feeds.tsx': $news_feeds,
+    './routes/notes.tsx': $notes,
+    './routes/notes/open/[fileName].tsx': $notes_open_fileName_,
+    './routes/oidc/callback.tsx': $oidc_callback,
+    './routes/photos.tsx': $photos,
+    './routes/photos/thumbnail/[fileName].tsx': $photos_thumbnail_fileName_,
+    './routes/settings.tsx': $settings,
+    './routes/signup.tsx': $signup,
+  },
+  islands: {
+    './islands/Settings.tsx': $Settings,
+    './islands/auth/MultiFactorAuthSettings.tsx': $auth_MultiFactorAuthSettings,
+    './islands/auth/PasswordlessPasskeyLogin.tsx': $auth_PasswordlessPasskeyLogin,
+    './islands/dashboard/Links.tsx': $dashboard_Links,
+    './islands/dashboard/Notes.tsx': $dashboard_Notes,
+    './islands/expenses/ExpensesWrapper.tsx': $expenses_ExpensesWrapper,
+    './islands/files/FilesWrapper.tsx': $files_FilesWrapper,
+    './islands/news/Articles.tsx': $news_Articles,
+    './islands/news/Feeds.tsx': $news_Feeds,
+    './islands/notes/Note.tsx': $notes_Note,
+    './islands/notes/NotesWrapper.tsx': $notes_NotesWrapper,
+    './islands/photos/PhotosWrapper.tsx': $photos_PhotosWrapper,
+  },
+  baseUrl: import.meta.url,
+} satisfies Manifest;
+
+export default manifest;
--- a/islands/Settings.tsx
+++ b/islands/Settings.tsx
@ -0,0 +1,247 @@
+import { FormField, generateFieldHtml, getFormDataField } from '/lib/form-utils.tsx';
+import { convertObjectToFormData } from '/lib/utils/misc.ts';
+import { currencyMap, SupportedCurrencySymbol, User } from '/lib/types.ts';
+import MultiFactorAuthSettings from '/islands/auth/MultiFactorAuthSettings.tsx';
+import { getEnabledMultiFactorAuthMethodsFromUser } from '/lib/utils/multi-factor-auth.ts';
+
+interface SettingsProps {
+  formData: Record<string, any>;
+  error?: {
+    title: string;
+    message: string;
+  };
+  notice?: {
+    title: string;
+    message: string;
+  };
+  currency?: SupportedCurrencySymbol;
+  isExpensesAppEnabled: boolean;
+  isMultiFactorAuthEnabled: boolean;
+  helpEmail: string;
+  user: {
+    extra: Pick<User['extra'], 'multi_factor_auth_methods'>;
+  };
+}
+
+export type Action =
+  | 'change-email'
+  | 'verify-change-email'
+  | 'change-password'
+  | 'change-dav-password'
+  | 'delete-account'
+  | 'change-currency';
+
+export const actionWords = new Map<Action, string>([
+  ['change-email', 'change email'],
+  ['verify-change-email', 'change email'],
+  ['change-password', 'change password'],
+  ['change-dav-password', 'change WebDav password'],
+  ['delete-account', 'delete account'],
+  ['change-currency', 'change currency'],
+]);
+
+function formFields(action: Action, formData: FormData, currency?: SupportedCurrencySymbol) {
+  const fields: FormField[] = [
+    {
+      name: 'action',
+      label: '',
+      type: 'hidden',
+      value: action,
+      overrideValue: action,
+      required: true,
+      readOnly: true,
+    },
+  ];
+
+  if (action === 'change-email') {
+    fields.push({
+      name: 'email',
+      label: 'Email',
+      type: 'email',
+      placeholder: 'jane.doe@example.com',
+      value: getFormDataField(formData, 'email'),
+      required: true,
+    });
+  } else if (action === 'verify-change-email') {
+    fields.push({
+      name: 'email',
+      label: 'Email',
+      type: 'email',
+      placeholder: 'jane.doe@example.com',
+      value: getFormDataField(formData, 'email'),
+      required: true,
+    }, {
+      name: 'verification-code',
+      label: 'Verification Code',
+      description: `The verification code to validate your new email.`,
+      type: 'text',
+      placeholder: '000000',
+      required: true,
+    });
+  } else if (action === 'change-password') {
+    fields.push({
+      name: 'current-password',
+      label: 'Current Password',
+      type: 'password',
+      placeholder: 'super-SECRET-passphrase',
+      required: true,
+    }, {
+      name: 'new-password',
+      label: 'New Password',
+      type: 'password',
+      placeholder: 'super-SECRET-passphrase',
+      required: true,
+    });
+  } else if (action === 'change-dav-password') {
+    fields.push({
+      name: 'new-dav-password',
+      label: 'New WebDav Password',
+      type: 'password',
+      placeholder: 'super-SECRET-passphrase',
+      required: true,
+      description: 'Alternative password used for WebDav access and/or HTTP Basic Auth.',
+    });
+  } else if (action === 'delete-account') {
+    fields.push({
+      name: 'current-password',
+      label: 'Password',
+      type: 'password',
+      placeholder: 'super-SECRET-passphrase',
+      description: 'You need to input your password in order to delete your account.',
+      required: true,
+    });
+  } else if (action === 'change-currency') {
+    fields.push({
+      name: 'currency',
+      label: 'Currency',
+      type: 'select',
+      options: Array.from(currencyMap.keys()).map((currencySymbol) => ({
+        value: currencySymbol,
+        label: `${currencySymbol} (${currencyMap.get(currencySymbol)})`,
+      })),
+      value: getFormDataField(formData, 'currency') || currency,
+      required: true,
+    });
+  }
+  return fields;
+}
+
+export default function Settings(
+  {
+    formData: formDataObject,
+    error,
+    notice,
+    currency,
+    isExpensesAppEnabled,
+    isMultiFactorAuthEnabled,
+    helpEmail,
+    user,
+  }: SettingsProps,
+) {
+  const formData = convertObjectToFormData(formDataObject);
+
+  const multiFactorAuthMethods = getEnabledMultiFactorAuthMethodsFromUser(user);
+
+  return (
+    <>
+      <section class='mx-auto max-w-7xl my-8'>
+        {error
+          ? (
+            <section class='notification-error'>
+              <h3>{error.title}</h3>
+              <p>{error.message}</p>
+            </section>
+          )
+          : null}
+        {notice
+          ? (
+            <section class='notification-success'>
+              <h3>{notice.title}</h3>
+              <p>{notice.message}</p>
+            </section>
+          )
+          : null}
+
+        <h2 class='text-2xl mb-4 text-left px-4 max-w-screen-md mx-auto lg:min-w-96'>Change your email</h2>
+
+        <form method='POST' class='mb-12'>
+          {formFields(
+            'change-email',
+            formData,
+          ).map((field) => generateFieldHtml(field, formData))}
+          <section class='flex justify-end mt-8 mb-4'>
+            <button class='button-secondary' type='submit'>Change email</button>
+          </section>
+        </form>
+
+        <h2 class='text-2xl mb-4 text-left px-4 max-w-screen-md mx-auto lg:min-w-96'>Change your password</h2>
+
+        <form method='POST' class='mb-12'>
+          {formFields('change-password', formData).map((field) => generateFieldHtml(field, formData))}
+          <section class='flex justify-end mt-8 mb-4'>
+            <button class='button-secondary' type='submit'>Change password</button>
+          </section>
+        </form>
+
+        <h2 class='text-2xl mb-4 text-left px-4 max-w-screen-md mx-auto lg:min-w-96'>Change your WebDav password</h2>
+
+        <form method='POST' class='mb-12'>
+          {formFields('change-dav-password', formData).map((field) => generateFieldHtml(field, formData))}
+          <section class='flex justify-end mt-8 mb-4'>
+            <button class='button-secondary' type='submit'>Change WebDav password</button>
+          </section>
+        </form>
+
+        {isExpensesAppEnabled
+          ? (
+            <>
+              <h2 class='text-2xl mb-4 text-left px-4 max-w-screen-md mx-auto lg:min-w-96'>Change your currency</h2>
+              <p class='text-left mt-2 mb-6 px-4 max-w-screen-md mx-auto lg:min-w-96'>
+                This is only used in the expenses app, visually. It changes nothing about the stored data or values.
+              </p>
+
+              <form method='POST' class='mb-12'>
+                {formFields('change-currency', formData, currency).map((field) => generateFieldHtml(field, formData))}
+                <section class='flex justify-end mt-8 mb-4'>
+                  <button class='button-secondary' type='submit'>Change currency</button>
+                </section>
+              </form>
+            </>
+          )
+          : null}
+
+        {isMultiFactorAuthEnabled
+          ? (
+            <MultiFactorAuthSettings
+              methods={multiFactorAuthMethods.map((method) => ({
+                type: method.type,
+                id: method.id,
+                name: method.name,
+                enabled: method.enabled,
+                backupCodesCount: method.metadata.totp?.hashed_backup_codes?.length,
+              }))}
+            />
+          )
+          : null}
+
+        <h2 class='text-2xl mb-4 text-left px-4 max-w-screen-md mx-auto lg:min-w-96'>Delete your account</h2>
+        <p class='text-left mt-2 mb-6 px-4 max-w-screen-md mx-auto lg:min-w-96'>
+          Deleting your account is instant and deletes all your data. {helpEmail !== ''
+            ? (
+              <>
+                If you need help, please <a href={`mailto:${helpEmail}`}>reach out</a>.
+              </>
+            )
+            : null}
+        </p>
+
+        <form method='POST' class='mb-12'>
+          {formFields('delete-account', formData).map((field) => generateFieldHtml(field, formData))}
+          <section class='flex justify-end mt-8 mb-4'>
+            <button class='button-danger' type='submit'>Delete account</button>
+          </section>
+        </form>
+      </section>
+    </>
+  );
+}
--- a/components/auth/MultiFactorAuthSettings.tsx
+++ b/components/auth/MultiFactorAuthSettings.tsx
@ -2,21 +2,26 @@ import { useSignal } from '@preact/signals';
 import { startRegistration } from '@simplewebauthn/browser';

 import { MultiFactorAuthMethodType } from '/lib/types.ts';
-import { ResponseBody as PasskeySetupBeginResponseBody } from '/pages/api/auth/multi-factor/passkey/setup-begin.ts';
+import {
+  RequestBody as PasskeySetupBeginRequestBody,
+  ResponseBody as PasskeySetupBeginResponseBody,
+} from '/routes/api/auth/multi-factor/passkey/setup-begin.ts';
 import {
  RequestBody as PasskeySetupCompleteRequestBody,
  ResponseBody as PasskeySetupCompleteResponseBody,
-} from '/pages/api/auth/multi-factor/passkey/setup-complete.ts';
-import { ResponseBody as TOTPSetupResponseBody } from '/pages/api/auth/multi-factor/totp/setup.ts';
-import { ResponseBody as EmailSetupResponseBody } from '/pages/api/auth/multi-factor/email/setup.ts';
+} from '/routes/api/auth/multi-factor/passkey/setup-complete.ts';
+import {
+  RequestBody as TOTPSetupRequestBody,
+  ResponseBody as TOTPSetupResponseBody,
+} from '/routes/api/auth/multi-factor/totp/setup.ts';
 import {
  RequestBody as MultiFactorAuthEnableRequestBody,
  ResponseBody as MultiFactorAuthEnableResponseBody,
-} from '/pages/api/auth/multi-factor/enable.ts';
+} from '/routes/api/auth/multi-factor/enable.ts';
 import {
  RequestBody as MultiFactorAuthDisableRequestBody,
  ResponseBody as MultiFactorAuthDisableResponseBody,
-} from '/pages/api/auth/multi-factor/disable.ts';
+} from '/routes/api/auth/multi-factor/disable.ts';

 interface MultiFactorAuthMethod {
  type: MultiFactorAuthMethodType;
@ -43,27 +48,20 @@ interface PasskeySetupData {
  type: 'passkey';
 }

-interface EmailSetupData {
-  methodId: string;
-  type: 'email';
-}
-
 const methodTypeLabels: Record<MultiFactorAuthMethodType, string> = {
  totp: 'Authenticator App',
  passkey: 'Passkey',
-  email: 'Email',
 };

 const methodTypeDescriptions: Record<MultiFactorAuthMethodType, string> = {
-  totp: 'Use an authenticator app like Aegis Authenticator or Google Authenticator to generate codes.',
-  passkey: 'Use biometric authentication or security keys.',
-  email: 'Receive codes in your email.',
+  totp: 'Use an authenticator app like Aegis Authenticator or Google Authenticator to generate codes',
+  passkey: 'Use biometric authentication or security keys',
 };

-const availableMethodTypes = ['totp', 'passkey', 'email'] as MultiFactorAuthMethodType[];
+const availableMethodTypes = ['totp', 'passkey'] as MultiFactorAuthMethodType[];

 export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSettingsProps) {
-  const setupData = useSignal<TOTPSetupData | PasskeySetupData | EmailSetupData | null>(null);
+  const setupData = useSignal<TOTPSetupData | PasskeySetupData | null>(null);
  const isLoading = useSignal(false);
  const error = useSignal<string | null>(null);
  const success = useSignal<string | null>(null);
@ -75,9 +73,11 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
  const hasMultiFactorAuthEnabled = enabledMethods.length > 0;

  const setupPasskey = async () => {
+    const beginRequestBody: PasskeySetupBeginRequestBody = {};
+
    const beginResponse = await fetch('/api/auth/multi-factor/passkey/setup-begin', {
      method: 'POST',
-      body: JSON.stringify({}),
+      body: JSON.stringify(beginRequestBody),
    });

    if (!beginResponse.ok) {
@ -89,7 +89,7 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
    const beginData = await beginResponse.json() as PasskeySetupBeginResponseBody;

    if (!beginData.success) {
-      throw new Error(beginData.error || 'Failed to begin passkey registration.');
+      throw new Error(beginData.error || 'Failed to begin passkey registration');
    }

    const registrationResponse = await startRegistration({ optionsJSON: beginData.options! });
@ -114,7 +114,7 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
    const completeData = await completeResponse.json() as PasskeySetupCompleteResponseBody;

    if (!completeData.success) {
-      throw new Error(completeData.error || 'Failed to complete passkey registration.');
+      throw new Error(completeData.error || 'Failed to complete passkey registration');
    }

    setupData.value = {
@ -124,21 +124,17 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
  };

  const setupTOTP = async () => {
+    const requestBody: TOTPSetupRequestBody = {};
+
    const response = await fetch('/api/auth/multi-factor/totp/setup', {
      method: 'POST',
-      body: JSON.stringify({}),
+      body: JSON.stringify(requestBody),
    });

-    if (!response.ok) {
-      throw new Error(
-        `Failed to setup TOTP multi-factor authentication. ${response.statusText} ${await response.text()}`,
-      );
-    }
-
    const data = await response.json() as TOTPSetupResponseBody;

    if (!data.success || !data.data) {
-      throw new Error(data.error || 'Failed to setup TOTP multi-factor authentication.');
+      throw new Error(data.error || 'Failed to setup TOTP multi-factor authentication');
    }

    setupData.value = {
@ -150,31 +146,6 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
    };
  };

-  const setupEmail = async () => {
-    const response = await fetch('/api/auth/multi-factor/email/setup', {
-      method: 'POST',
-      body: JSON.stringify({}),
-    });
-
-    if (!response.ok) {
-      throw new Error(
-        `Failed to setup email multi-factor authentication. Please check your SMTP settings are valid and try again. ${response.statusText} ${await response
-          .text()}`,
-      );
-    }
-
-    const data = await response.json() as EmailSetupResponseBody;
-
-    if (!data.success || !data.data) {
-      throw new Error(data.error || 'Failed to setup email multi-factor authentication.');
-    }
-
-    setupData.value = {
-      type: 'email',
-      methodId: data.data.methodId!,
-    };
-  };
-
  const setupMultiFactorAuth = async (type: MultiFactorAuthMethodType) => {
    isLoading.value = true;
    error.value = null;
@ -184,8 +155,6 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
        await setupTOTP();
      } else if (type === 'passkey') {
        await setupPasskey();
-      } else if (type === 'email') {
-        await setupEmail();
      }
    } catch (setupError) {
      error.value = (setupError as Error).message;
@ -201,7 +170,7 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
    }

    if (setupData.value.type !== 'passkey' && !verificationToken.value) {
-      error.value = 'Please enter a verification code/token';
+      error.value = 'Please enter a verification token';
      return;
    }

@ -219,19 +188,13 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
        body: JSON.stringify(requestBody),
      });

-      if (!response.ok) {
-        throw new Error(
-          `Failed to enable multi-factor authentication method. ${response.statusText} ${await response.text()}`,
-        );
-      }
-
      const data = await response.json() as MultiFactorAuthEnableResponseBody;

      if (!data.success) {
-        throw new Error(data.error || 'Failed to enable multi-factor authentication method.');
+        throw new Error(data.error || 'Failed to enable multi-factor authentication');
      }

-      success.value = 'Multi-factor authentication method has been enabled successfully! Reloading...';
+      success.value = 'Multi-factor authentication has been enabled successfully! Reloading...';
      setupData.value = null;
      verificationToken.value = '';

@ -266,19 +229,13 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
        body: JSON.stringify(requestBody),
      });

-      if (!response.ok) {
-        throw new Error(
-          `Failed to disable multi-factor authentication method. ${response.statusText} ${await response.text()}`,
-        );
-      }
-
      const data = await response.json() as MultiFactorAuthDisableResponseBody;

      if (!data.success) {
-        throw new Error(data.error || 'Failed to disable multi-factor authentication method.');
+        throw new Error(data.error || 'Failed to disable multi-factor authentication');
      }

-      success.value = 'Multi-factor authentication method has been disabled successfully! Reloading...';
+      success.value = 'Multi-factor authentication has been disabled successfully! Reloading...';
      showDisableForm.value = null;
      disablePassword.value = '';

@ -306,11 +263,11 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett

  return (
    <section class='mb-16'>
-      <h2 class='text-2xl mb-4 text-left px-4 max-w-3xl mx-auto lg:min-w-96'>
+      <h2 class='text-2xl mb-4 text-left px-4 max-w-screen-md mx-auto lg:min-w-96'>
        Multi-Factor Authentication (MFA)
      </h2>

-      <section class='px-4 max-w-3xl mx-auto lg:min-w-96'>
+      <section class='px-4 max-w-screen-md mx-auto lg:min-w-96'>
        {error.value
          ? (
            <section class='notification-error mb-4'>
@ -367,7 +324,7 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
          )
          : null}

-        {setupData.value && setupData.value.type === 'totp'
+        {setupData.value && setupData.value.type !== 'passkey'
          ? (
            <section class='mb-6'>
              <h3 class='text-lg font-semibold mb-4'>Setup Authenticator App</h3>
@ -376,8 +333,8 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
                <p class='mb-4'>
                  1. Scan this QR code with your authenticator app (Aegis Authenticator, Google Authenticator, etc.):
                </p>
-                <section class='flex justify-center mb-4 max-w-sm mx-auto'>
-                  <img src={setupData.value.qrCodeUrl} alt='TOTP QR Code' class='border-8 border-white' />
+                <section class='flex justify-center mb-4'>
+                  <img src={setupData.value.qrCodeUrl} alt='TOTP QR Code' class='border' />
                </section>
                <p class='text-sm text-gray-400 mb-4'>
                  Or manually enter this secret:{' '}
@ -464,47 +421,6 @@ export default function MultiFactorAuthSettings({ methods }: MultiFactorAuthSett
          )
          : null}

-        {setupData.value && setupData.value.type === 'email'
-          ? (
-            <section class='mb-6'>
-              <h3 class='text-lg font-semibold mb-4'>Setup Email</h3>
-
-              <fieldset class='block mb-6'>
-                <label class='text-slate-300 block pb-1'>
-                  Enter the 6-digit code you received in your email:
-                </label>
-                <input
-                  type='text'
-                  value={verificationToken.value}
-                  onInput={(event) => verificationToken.value = (event.target as HTMLInputElement).value}
-                  placeholder='123456'
-                  class='mt-1 input-field'
-                  maxLength={6}
-                />
-              </fieldset>
-
-              <section class='flex justify-end gap-2 mt-8 mb-4'>
-                <button
-                  type='button'
-                  onClick={cancelSetup}
-                  disabled={isLoading.value}
-                  class='button-secondary'
-                >
-                  Cancel
-                </button>
-                <button
-                  type='button'
-                  onClick={enableMultiFactorAuth}
-                  disabled={isLoading.value || !verificationToken.value}
-                  class='button'
-                >
-                  {isLoading.value ? 'Enabling...' : 'Enable Email MFA'}
-                </button>
-              </section>
-            </section>
-          )
-          : null}
-
        {hasMultiFactorAuthEnabled && !showDisableForm.value
          ? (
            <section>
--- a/islands/auth/PasswordlessPasskeyLogin.tsx
+++ b/islands/auth/PasswordlessPasskeyLogin.tsx
@ -0,0 +1,116 @@
+import { useSignal } from '@preact/signals';
+import { startAuthentication } from '@simplewebauthn/browser';
+
+import {
+  RequestBody as PasskeyBeginRequestBody,
+  ResponseBody as PasskeyBeginResponseBody,
+} from '/routes/api/auth/multi-factor/passkey/begin.ts';
+
+import {
+  RequestBody as PasskeyVerifyRequestBody,
+  ResponseBody as PasskeyVerifyResponseBody,
+} from '/routes/api/auth/multi-factor/passkey/verify.ts';
+
+interface PasswordlessPasskeyLoginProps {
+  email?: string;
+  redirectUrl?: string;
+}
+
+export default function PasswordlessPasskeyLogin({ email: providedEmail, redirectUrl }: PasswordlessPasskeyLoginProps) {
+  const isLoading = useSignal(false);
+  const email = useSignal<string | null>(providedEmail || null);
+  const error = useSignal<string | null>(null);
+
+  const handlePasswordlessLogin = async () => {
+    if (isLoading.value) {
+      return;
+    }
+
+    if (!email.value) {
+      const promptEmail = prompt('Please enter your email');
+      if (!promptEmail) {
+        throw new Error('Email is required to login with Passkey');
+      }
+      email.value = promptEmail;
+    }
+
+    isLoading.value = true;
+    error.value = null;
+
+    try {
+      const beginRequestBody: PasskeyBeginRequestBody = {
+        email: email.value,
+      };
+
+      const beginResponse = await fetch('/api/auth/multi-factor/passkey/begin', {
+        method: 'POST',
+        body: JSON.stringify(beginRequestBody),
+      });
+
+      if (!beginResponse.ok) {
+        throw new Error(
+          `Failed to begin passwordless login! ${beginResponse.statusText} ${await beginResponse.text()}`,
+        );
+      }
+
+      const beginData = await beginResponse.json() as PasskeyBeginResponseBody;
+
+      if (!beginData.success) {
+        throw new Error(beginData.error || 'Failed to begin passwordless login');
+      }
+
+      const authenticationResponse = await startAuthentication({
+        optionsJSON: beginData.options!,
+      });
+
+      const verifyRequestBody: PasskeyVerifyRequestBody = {
+        email: email.value,
+        challenge: beginData.sessionData!.challenge,
+        authenticationResponse,
+        redirectUrl: redirectUrl || '/',
+      };
+
+      const verifyResponse = await fetch('/api/auth/multi-factor/passkey/verify', {
+        method: 'POST',
+        body: JSON.stringify(verifyRequestBody),
+      });
+
+      if (verifyResponse.ok) {
+        window.location.href = redirectUrl || '/';
+        return;
+      }
+
+      const verifyData = await verifyResponse.json() as PasskeyVerifyResponseBody;
+      throw new Error(
+        verifyData.error || `Authentication failed! ${verifyResponse.statusText} ${await verifyResponse.text()}`,
+      );
+    } catch (handleError) {
+      console.error('Passwordless passkey login failed:', handleError);
+      error.value = (handleError as Error).message;
+    } finally {
+      isLoading.value = false;
+    }
+  };
+
+  return (
+    <section class='space-y-4'>
+      <section class='flex justify-center mt-2 mb-4'>
+        <button
+          type='button'
+          onClick={handlePasswordlessLogin}
+          class='button-secondary'
+        >
+          {isLoading.value ? 'Authenticating...' : 'Login with Passkey'}
+        </button>
+      </section>
+
+      {error.value
+        ? (
+          <section class='notification-error'>
+            <p>{error.value}</p>
+          </section>
+        )
+        : null}
+    </section>
+  );
+}
--- a/components/dashboard/Links.tsx
+++ b/components/dashboard/Links.tsx
@ -2,8 +2,8 @@ import { useSignal } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

 import { DashboardLink } from '/lib/types.ts';
-import { validateUrl } from '/public/ts/utils/misc.ts';
-import { RequestBody, ResponseBody } from '/pages/api/dashboard/save-links.ts';
+import { validateUrl } from '/lib/utils/misc.ts';
+import { RequestBody, ResponseBody } from '/routes/api/dashboard/save-links.tsx';

 interface LinksProps {
  initialLinks: DashboardLink[];
@ -33,15 +33,10 @@ export default function Links({ initialLinks }: LinksProps) {
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to save link. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as ResponseBody;

      if (!result.success) {
-        throw new Error('Failed to save link!');
+        throw new Error('Failed to save notes!');
      }
    } catch (error) {
      console.error(error);
@ -118,13 +113,13 @@ export default function Links({ initialLinks }: LinksProps) {
      <section class='flex flex-row items-center justify-end mb-4'>
        <section class='flex items-center'>
          <button
-            class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2 cursor-pointer'
+            class='inline-block justify-center gap-x-1.5 rounded-md bg-[#51A4FB] px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-sky-400 ml-2'
            type='button'
            title='Add new link'
            onClick={() => onClickAddLink()}
          >
            <img
-              src='/public/images/add.svg'
+              src='/images/add.svg'
              alt='Add new link'
              class={`white`}
              width={20}
@ -148,7 +143,7 @@ export default function Links({ initialLinks }: LinksProps) {
                onClick={() => onClickDeleteLink(index)}
              >
                <img
-                  src='/public/images/delete.svg'
+                  src='/images/delete.svg'
                  class='red drop-shadow-md'
                  width={24}
                  height={24}
@ -163,7 +158,7 @@ export default function Links({ initialLinks }: LinksProps) {
                    onClick={() => onClickMoveLeftLink(index)}
                  >
                    <img
-                      src='/public/images/left-circle.svg'
+                      src='/images/left-circle.svg'
                      class='gray'
                      width={24}
                      height={24}
@ -185,14 +180,14 @@ export default function Links({ initialLinks }: LinksProps) {
          {isSaving.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
              </>
            )
            : null}
          {hasSaved.value
            ? (
              <>
-                <img src='/public/images/check.svg' class='green mr-2' width={18} height={18} />Saved!
+                <img src='/images/check.svg' class='green mr-2' width={18} height={18} />Saved!
              </>
            )
            : null}
--- a/components/dashboard/Notes.tsx
+++ b/components/dashboard/Notes.tsx
@ -1,7 +1,7 @@
 import { useSignal, useSignalEffect } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

-import { RequestBody, ResponseBody } from '/pages/api/dashboard/save-notes.ts';
+import { RequestBody, ResponseBody } from '/routes/api/dashboard/save-notes.tsx';

 interface NotesProps {
  initialNotes: string;
@ -28,11 +28,6 @@ export default function Notes({ initialNotes }: NotesProps) {
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to save notes. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as ResponseBody;

        if (!result.success) {
@ -85,14 +80,14 @@ export default function Notes({ initialNotes }: NotesProps) {
        {isSaving.value
          ? (
            <>
-              <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
+              <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
            </>
          )
          : null}
        {hasSaved.value
          ? (
            <>
-              <img src='/public/images/check.svg' class='green mr-2' width={18} height={18} />Saved!
+              <img src='/images/check.svg' class='green mr-2' width={18} height={18} />Saved!
            </>
          )
          : null}
--- a/islands/expenses/ExpensesWrapper.tsx
+++ b/islands/expenses/ExpensesWrapper.tsx
@ -0,0 +1,23 @@
+import { Budget, Expense, SupportedCurrencySymbol } from '/lib/types.ts';
+import MainExpenses from '/components/expenses/MainExpenses.tsx';
+
+interface ExpensesWrapperProps {
+  initialBudgets: Budget[];
+  initialExpenses: Expense[];
+  initialMonth: string;
+  currency: SupportedCurrencySymbol;
+}
+
+// This wrapper is necessary because islands need to be the first frontend component, but they don't support functions as props, so the more complex logic needs to live in the component itself
+export default function ExpensesWrapper(
+  { initialBudgets, initialExpenses, initialMonth, currency }: ExpensesWrapperProps,
+) {
+  return (
+    <MainExpenses
+      initialBudgets={initialBudgets}
+      initialExpenses={initialExpenses}
+      initialMonth={initialMonth}
+      currency={currency}
+    />
+  );
+}
--- a/islands/files/FilesWrapper.tsx
+++ b/islands/files/FilesWrapper.tsx
@ -0,0 +1,23 @@
+import { Directory, DirectoryFile } from '/lib/types.ts';
+import MainFiles from '/components/files/MainFiles.tsx';
+
+interface FilesWrapperProps {
+  initialDirectories: Directory[];
+  initialFiles: DirectoryFile[];
+  initialPath: string;
+  baseUrl: string;
+}
+
+// This wrapper is necessary because islands need to be the first frontend component, but they don't support functions as props, so the more complex logic needs to live in the component itself
+export default function FilesWrapper(
+  { initialDirectories, initialFiles, initialPath, baseUrl }: FilesWrapperProps,
+) {
+  return (
+    <MainFiles
+      initialDirectories={initialDirectories}
+      initialFiles={initialFiles}
+      initialPath={initialPath}
+      baseUrl={baseUrl}
+    />
+  );
+}
--- a/components/news/Articles.tsx
+++ b/components/news/Articles.tsx
@ -1,8 +1,11 @@
 import { useSignal } from '@preact/signals';

 import { NewsFeedArticle } from '/lib/types.ts';
-import { ResponseBody as RefreshResponseBody } from '/pages/api/news/refresh-articles.ts';
-import { RequestBody as ReadRequestBody, ResponseBody as ReadResponseBody } from '/pages/api/news/mark-read.ts';
+import {
+  RequestBody as RefreshRequestBody,
+  ResponseBody as RefreshResponseBody,
+} from '/routes/api/news/refresh-articles.tsx';
+import { RequestBody as ReadRequestBody, ResponseBody as ReadResponseBody } from '/routes/api/news/mark-read.tsx';

 interface ArticlesProps {
  initialArticles: NewsFeedArticle[];
@ -12,8 +15,6 @@ interface Filter {
  status: 'all' | 'unread';
 }

-let hasFetchedAllArticlesOnce = false;
-
 export default function Articles({ initialArticles }: ArticlesProps) {
  const isRefreshing = useSignal<boolean>(false);
  const articles = useSignal<NewsFeedArticle[]>(initialArticles);
@ -21,9 +22,7 @@ export default function Articles({ initialArticles }: ArticlesProps) {
  const sessionReadArticleIds = useSignal<Set<string>>(new Set());
  const isFilterDropdownOpen = useSignal<boolean>(false);

-  const dateFormatOptions: Intl.DateTimeFormatOptions = { dateStyle: 'medium' };
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', dateFormatOptions);
+  const dateFormat = new Intl.DateTimeFormat('en-GB', { dateStyle: 'medium' });

  async function refreshArticles() {
    if (isRefreshing.value) {
@ -33,15 +32,11 @@ export default function Articles({ initialArticles }: ArticlesProps) {
    isRefreshing.value = true;

    try {
+      const requestBody: RefreshRequestBody = {};
      const response = await fetch(`/api/news/refresh-articles`, {
        method: 'POST',
-        body: JSON.stringify({}),
+        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to refresh articles. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as RefreshResponseBody;

      if (!result.success) {
@ -92,11 +87,6 @@ export default function Articles({ initialArticles }: ArticlesProps) {
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to mark article as read. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as ReadResponseBody;

      if (!result.success) {
@ -124,11 +114,6 @@ export default function Articles({ initialArticles }: ArticlesProps) {
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to mark all articles as read. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as ReadResponseBody;

      if (!result.success) {
@ -146,11 +131,6 @@ export default function Articles({ initialArticles }: ArticlesProps) {
  function setNewFilter(newFilter: Partial<Filter>) {
    filter.value = { ...filter.value, ...newFilter };

-    if (newFilter.status === 'all' && !hasFetchedAllArticlesOnce) {
-      refreshArticles();
-      hasFetchedAllArticlesOnce = true;
-    }
-
    isFilterDropdownOpen.value = false;
  }

@ -181,7 +161,7 @@ export default function Articles({ initialArticles }: ArticlesProps) {
            </div>

            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
+              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
                !isFilterDropdownOpen.value ? 'hidden' : ''
              }`}
              role='menu'
@ -219,7 +199,7 @@ export default function Articles({ initialArticles }: ArticlesProps) {
            onClick={() => onClickMarkAllRead()}
          >
            <img
-              src='/public/images/check-all.svg'
+              src='/images/check-all.svg'
              alt='Mark all read'
              class={`white`}
              width={20}
@ -234,7 +214,7 @@ export default function Articles({ initialArticles }: ArticlesProps) {
            onClick={() => refreshArticles()}
          >
            <img
-              src='/public/images/refresh.svg'
+              src='/images/refresh.svg'
              alt='Fetch new articles'
              class={`white ${isRefreshing.value ? 'animate-spin' : ''}`}
              width={20}
@ -254,7 +234,7 @@ export default function Articles({ initialArticles }: ArticlesProps) {
                  class={`group order-first mx-auto max-w-full relative bg-slate-700 duration-150 first:rounded-tl-md first:rounded-tr-md last:rounded-bl-md last:rounded-br-md`}
                >
                  <summary
-                    class={`bg-slate-700 hover:bg-slate-600 px-4 py-4 cursor-pointer flex justify-between group-first:rounded-tl-md group-first:rounded-tr-md ${
+                    class={`bg-slate-700 hover:bg-slate-600 px-4 py-4 cursor-pointer flex justify-between group-[:first-child]:rounded-tl-md group-[:first-child]:rounded-tr-md ${
                      article.is_read ? 'opacity-50' : 'font-semibold'
                    }`}
                    onClick={() => onClickView(article.id)}
@ -269,7 +249,7 @@ export default function Articles({ initialArticles }: ArticlesProps) {
                  </article>
                  <a
                    href={article.article_url}
-                    class='py-4 px-8 flex justify-between text-right hover:bg-slate-600 group-last:rounded-bl-md group-last:rounded-br-md'
+                    class='py-4 px-8 flex justify-between text-right hover:bg-slate-600 group-[:last-child]:rounded-bl-md group-[:last-child]:rounded-br-md'
                    target='_blank'
                    rel='noreferrer noopener'
                    onClick={() => onClickView(article.id)}
--- a/components/news/Feeds.tsx
+++ b/components/news/Feeds.tsx
@ -1,10 +1,13 @@
 import { useSignal } from '@preact/signals';

 import { NewsFeed } from '/lib/types.ts';
-import { escapeHtml, validateUrl } from '/public/ts/utils/misc.ts';
-import { RequestBody as AddRequestBody, ResponseBody as AddResponseBody } from '/pages/api/news/add-feed.ts';
-import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/pages/api/news/delete-feed.ts';
-import { RequestBody as ImportRequestBody, ResponseBody as ImportResponseBody } from '/pages/api/news/import-feeds.ts';
+import { escapeHtml, validateUrl } from '/lib/utils/misc.ts';
+import { RequestBody as AddRequestBody, ResponseBody as AddResponseBody } from '/routes/api/news/add-feed.tsx';
+import { RequestBody as DeleteRequestBody, ResponseBody as DeleteResponseBody } from '/routes/api/news/delete-feed.tsx';
+import {
+  RequestBody as ImportRequestBody,
+  ResponseBody as ImportResponseBody,
+} from '/routes/api/news/import-feeds.tsx';

 interface FeedsProps {
  initialFeeds: NewsFeed[];
@ -54,9 +57,7 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
  const feeds = useSignal<NewsFeed[]>(initialFeeds);
  const isOptionsDropdownOpen = useSignal<boolean>(false);

-  const dateFormatOptions: Intl.DateTimeFormatOptions = { dateStyle: 'medium', timeStyle: 'short' };
-
-  const dateFormat = new Intl.DateTimeFormat('en-GB', dateFormatOptions);
+  const dateFormat = new Intl.DateTimeFormat('en-GB', { dateStyle: 'medium', timeStyle: 'short' });

  async function onClickAddFeed() {
    if (isAdding.value) {
@ -83,11 +84,6 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
        method: 'POST',
        body: JSON.stringify(requestBody),
      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to add feed. ${response.statusText} ${await response.text()}`);
-      }
-
      const result = await response.json() as AddResponseBody;

      if (!result.success) {
@ -120,11 +116,6 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to delete feed. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as DeleteResponseBody;

        if (!result.success) {
@ -177,11 +168,6 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
            method: 'POST',
            body: JSON.stringify(requestBody),
          });
-
-          if (!response.ok) {
-            throw new Error(`Failed to import feeds. ${response.statusText} ${await response.text()}`);
-          }
-
          const result = await response.json() as ImportResponseBody;

          if (!result.success) {
@ -254,7 +240,7 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
            </div>

            <div
-              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black/15 focus:outline-none ${
+              class={`absolute right-0 z-10 mt-2 w-44 origin-top-right rounded-md bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-15 focus:outline-none ${
                !isOptionsDropdownOpen.value ? 'hidden' : ''
              }`}
              role='menu'
@ -287,7 +273,7 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
            onClick={() => onClickAddFeed()}
          >
            <img
-              src='/public/images/add.svg'
+              src='/images/add.svg'
              alt='Add new feed'
              class={`white ${isAdding.value ? 'animate-spin' : ''}`}
              width={20}
@ -330,7 +316,7 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
                    onClick={() => onClickDeleteFeed(newsFeed.id)}
                  >
                    <img
-                      src='/public/images/delete.svg'
+                      src='/images/delete.svg'
                      class='red drop-shadow-md'
                      width={24}
                      height={24}
@ -361,21 +347,21 @@ export default function Feeds({ initialFeeds }: FeedsProps) {
          {isDeleting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Deleting...
              </>
            )
            : null}
          {isExporting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Exporting...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Exporting...
              </>
            )
            : null}
          {isImporting.value
            ? (
              <>
-                <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Importing...
+                <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Importing...
              </>
            )
            : null}
--- a/components/notes/Note.tsx
+++ b/components/notes/Note.tsx
@ -1,7 +1,7 @@
 import { useSignal, useSignalEffect } from '@preact/signals';
 import { useEffect } from 'preact/hooks';

-import { RequestBody, ResponseBody } from '/pages/api/notes/save.ts';
+import { RequestBody, ResponseBody } from '/routes/api/notes/save.tsx';
 import FilesBreadcrumb from '/components/files/FilesBreadcrumb.tsx';

 interface NoteProps {
@ -31,11 +31,6 @@ export default function Note({ fileName, currentPath, contents }: NoteProps) {
          method: 'POST',
          body: JSON.stringify(requestBody),
        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to save note. ${response.statusText} ${await response.text()}`);
-        }
-
        const result = await response.json() as ResponseBody;

        if (!result.success) {
@ -96,14 +91,14 @@ export default function Note({ fileName, currentPath, contents }: NoteProps) {
        {isSaving.value
          ? (
            <>
-              <img src='/public/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
+              <img src='/images/loading.svg' class='white mr-2' width={18} height={18} />Saving...
            </>
          )
          : null}
        {hasSaved.value
          ? (
            <>
-              <img src='/public/images/check.svg' class='green mr-2' width={18} height={18} />Saved!
+              <img src='/images/check.svg' class='green mr-2' width={18} height={18} />Saved!
            </>
          )
          : null}
--- a/islands/notes/NotesWrapper.tsx
+++ b/islands/notes/NotesWrapper.tsx
@ -0,0 +1,21 @@
+import { Directory, DirectoryFile } from '/lib/types.ts';
+import MainNotes from '/components/notes/MainNotes.tsx';
+
+interface NotesWrapperProps {
+  initialDirectories: Directory[];
+  initialFiles: DirectoryFile[];
+  initialPath: string;
+}
+
+// This wrapper is necessary because islands need to be the first frontend component, but they don't support functions as props, so the more complex logic needs to live in the component itself
+export default function NotesWrapper(
+  { initialDirectories, initialFiles, initialPath }: NotesWrapperProps,
+) {
+  return (
+    <MainNotes
+      initialDirectories={initialDirectories}
+      initialFiles={initialFiles}
+      initialPath={initialPath}
+    />
+  );
+}
--- a/islands/photos/PhotosWrapper.tsx
+++ b/islands/photos/PhotosWrapper.tsx
@ -0,0 +1,21 @@
+import { Directory, DirectoryFile } from '/lib/types.ts';
+import MainPhotos from '/components/photos/MainPhotos.tsx';
+
+interface PhotosWrapperProps {
+  initialDirectories: Directory[];
+  initialFiles: DirectoryFile[];
+  initialPath: string;
+}
+
+// This wrapper is necessary because islands need to be the first frontend component, but they don't support functions as props, so the more complex logic needs to live in the component itself
+export default function PhotosWrapper(
+  { initialDirectories, initialFiles, initialPath }: PhotosWrapperProps,
+) {
+  return (
+    <MainPhotos
+      initialDirectories={initialDirectories}
+      initialFiles={initialFiles}
+      initialPath={initialPath}
+    />
+  );
+}
--- a/lib/auth.ts
+++ b/lib/auth.ts
@ -1,11 +1,12 @@
-import { decodeBase64, decodeBase64Url, encodeBase64Url } from '@std/encoding';
-import { Cookie, getCookies, setCookie } from '@std/http';
-import '@std/dotenv/load';
+import { decodeBase64Url, encodeBase64Url } from 'std/encoding/base64url.ts';
+import { decodeBase64 } from 'std/encoding/base64.ts';
+import { Cookie, getCookies, setCookie } from 'std/http/cookie.ts';
+import 'std/dotenv/load.ts';

-import { generateHash, isRunningLocally } from '/public/ts/utils/misc.ts';
-import { User, UserSession } from '/lib/types.ts';
-import { UserModel, UserSessionModel, validateUserAndSession } from '/lib/models/user.ts';
-import { AppConfig } from '/lib/config.ts';
+import { generateHash, isRunningLocally } from './utils/misc.ts';
+import { User, UserSession } from './types.ts';
+import { UserModel, UserSessionModel, validateUserAndSession } from './models/user.ts';
+import { AppConfig } from './config.ts';

 export const JWT_SECRET = Deno.env.get('JWT_SECRET') || '';
 export const PASSWORD_SALT = Deno.env.get('PASSWORD_SALT') || '';
@ -29,7 +30,7 @@ export const dataToText = (data: Uint8Array) => new TextDecoder().decode(data);
 export const generateKey = async (key: string): Promise<CryptoKey> =>
  await crypto.subtle.importKey('raw', textToData(key), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign', 'verify']);

-async function signAuthJwt<T = JwtData>(key: CryptoKey, data: T): Promise<string> {
+async function signAuthJwt(key: CryptoKey, data: JwtData): Promise<string> {
  const payload = encodeBase64Url(textToData(JSON.stringify({ alg: 'HS256', typ: 'JWT' }))) + '.' +
    encodeBase64Url(textToData(JSON.stringify(data) || ''));
  const signature = encodeBase64Url(
@ -38,7 +39,7 @@ async function signAuthJwt<T = JwtData>(key: CryptoKey, data: T): Promise<string
  return `${payload}.${signature}`;
 }

-export async function verifyAuthJwt<T = JwtData>(key: CryptoKey, jwt: string): Promise<T> {
+export async function verifyAuthJwt(key: CryptoKey, jwt: string): Promise<JwtData> {
  const jwtParts = jwt.split('.');
  if (jwtParts.length !== 3) {
    throw new Error('Malformed JWT');
@ -46,7 +47,7 @@ export async function verifyAuthJwt<T = JwtData>(key: CryptoKey, jwt: string): P

  const data = textToData(jwtParts[0] + '.' + jwtParts[1]);
  if (await crypto.subtle.verify({ name: 'HMAC' }, key, decodeBase64Url(jwtParts[2]), data) === true) {
-    return JSON.parse(dataToText(decodeBase64Url(jwtParts[1]))) as T;
+    return JSON.parse(dataToText(decodeBase64Url(jwtParts[1]))) as JwtData;
  }

  throw new Error('Invalid JWT');
@ -144,10 +145,10 @@ async function getDataFromCookie(
  return null;
 }

-export async function generateToken<T = JwtData>(tokenData: T): Promise<string> {
+export async function generateToken(tokenData: JwtData['data']): Promise<string> {
  const key = await generateKey(JWT_SECRET);

-  const token = await signAuthJwt<{ data: T }>(key, { data: tokenData });
+  const token = await signAuthJwt(key, { data: tokenData });

  return token;
 }
@ -242,3 +243,31 @@ export async function createSessionCookie(

  return response;
 }
+
+export async function updateSessionCookie(
+  response: Response,
+  request: Request,
+  userSession: UserSession,
+  newSessionData: JwtData['data'],
+) {
+  const token = await generateToken(newSessionData);
+
+  const cookie: Cookie = {
+    name: COOKIE_NAME,
+    value: token,
+    expires: userSession.expires_at,
+    path: '/',
+    secure: isRunningLocally(request) ? false : true,
+    httpOnly: true,
+    sameSite: 'Lax',
+    domain: await resolveCookieDomain(request),
+  };
+
+  if (await AppConfig.isCookieDomainSecurityDisabled()) {
+    delete cookie.domain;
+  }
+
+  setCookie(response.headers, cookie);
+
+  return response;
+}
--- a/lib/config.ts
+++ b/lib/config.ts
@ -1,4 +1,3 @@
-import { isAbsolute, join } from '@std/path';
 import { UserModel } from './models/user.ts';
 import { Config, OptionalApp } from './types.ts';

@ -16,40 +15,72 @@ export class AppConfig {
        allowedCookieDomains: [],
        skipCookieDomainSecurity: false,
        enableSingleSignOn: false,
-        allowSignupsViaSingleSignOn: false,
        singleSignOnUrl: '',
        singleSignOnEmailAttribute: 'email',
        singleSignOnScopes: ['openid', 'email'],
      },
      files: {
        rootPath: 'data-files',
-        allowPublicSharing: false,
-        allowDirectoryDownloads: false,
-        maxUploadSizeInMegabytes: 100,
      },
      core: {
-        enabledApps: ['dashboard', 'files', 'news', 'notes', 'photos', 'expenses', 'contacts', 'calendar'],
-        maxRequestSizeInMegabytes: 12,
+        enabledApps: ['news', 'notes', 'photos', 'expenses'],
      },
      visuals: {
        title: '',
        description: '',
        helpEmail: 'help@bewcloud.com',
      },
-      email: {
-        from: 'help@bewcloud.com',
-        host: 'localhost',
-        port: 465,
-        tlsMode: 'auto',
-        tlsVerify: true,
+    };
+  }
+
+  /** This allows for backwards-compatibility with the old config format, which was in the .env file. */
+  private static async getLegacyConfigFromEnv(): Promise<Config> {
+    const defaultConfig = this.getDefaultConfig();
+
+    if (typeof Deno === 'undefined') {
+      return defaultConfig;
+    }
+
+    await import('std/dotenv/load.ts');
+
+    const baseUrl = Deno.env.get('BASE_URL') ?? defaultConfig.auth.baseUrl;
+    const allowSignups = Deno.env.get('CONFIG_ALLOW_SIGNUPS') === 'true';
+    const enabledApps = (Deno.env.get('CONFIG_ENABLED_APPS') ?? '').split(',') as OptionalApp[];
+    const filesRootPath = Deno.env.get('CONFIG_FILES_ROOT_PATH') ?? defaultConfig.files.rootPath;
+    const enableEmailVerification = (Deno.env.get('CONFIG_ENABLE_EMAILS') ?? 'false') === 'true';
+    const enableForeverSignup = (Deno.env.get('CONFIG_ENABLE_FOREVER_SIGNUP') ?? 'true') === 'true';
+    const allowedCookieDomains = (Deno.env.get('CONFIG_ALLOWED_COOKIE_DOMAINS') || '').split(',').filter(
+      Boolean,
+    ) as string[];
+    const skipCookieDomainSecurity = Deno.env.get('CONFIG_SKIP_COOKIE_DOMAIN_SECURITY') === 'true';
+    const title = Deno.env.get('CUSTOM_TITLE') ?? defaultConfig.visuals.title;
+    const description = Deno.env.get('CUSTOM_DESCRIPTION') ?? defaultConfig.visuals.description;
+    const helpEmail = Deno.env.get('HELP_EMAIL') ?? defaultConfig.visuals.helpEmail;
+
+    return {
+      ...defaultConfig,
+      auth: {
+        ...defaultConfig.auth,
+        baseUrl,
+        allowSignups,
+        enableEmailVerification,
+        enableForeverSignup,
+        allowedCookieDomains,
+        skipCookieDomainSecurity,
      },
-      contacts: {
-        enableCardDavServer: true,
-        cardDavUrl: 'http://radicale:5232',
+      files: {
+        ...defaultConfig.files,
+        rootPath: filesRootPath,
      },
-      calendar: {
-        enableCalDavServer: true,
-        calDavUrl: 'http://radicale:5232',
+      core: {
+        ...defaultConfig.core,
+        enabledApps,
+      },
+      visuals: {
+        ...defaultConfig.visuals,
+        title,
+        description,
+        helpEmail,
      },
    };
  }
@ -59,7 +90,18 @@ export class AppConfig {
      return;
    }

-    const initialConfig = this.getDefaultConfig();
+    let initialConfig = this.getDefaultConfig();
+
+    if (
+      typeof Deno.env.get('BASE_URL') === 'string' || typeof Deno.env.get('CONFIG_ALLOW_SIGNUPS') === 'string' ||
+      typeof Deno.env.get('CONFIG_ENABLED_APPS') === 'string'
+    ) {
+      console.warn(
+        '\nDEPRECATION WARNING: .env file has config variables. This will be used but is deprecated. Please use the bewcloud.config.ts file instead.',
+      );
+
+      initialConfig = await this.getLegacyConfigFromEnv();
+    }

    const config: Config = {
      ...initialConfig,
@ -86,29 +128,13 @@ export class AppConfig {
          ...config.visuals,
          ...configFromFile.visuals,
        },
-        email: {
-          ...config.email,
-          ...configFromFile.email,
-        },
-        contacts: {
-          ...config.contacts,
-          ...configFromFile.contacts,
-        },
-        calendar: {
-          ...config.calendar,
-          ...configFromFile.calendar,
-        },
      };

      console.info('\nConfig loaded from bewcloud.config.ts', JSON.stringify(this.config, null, 2), '\n');

-      if (this.config.core.enabledApps.length === 0) {
-        throw new Error('At least one app must be enabled. Please check the config.core.enabledApps array.');
-      }
-
      return;
    } catch (error) {
-      console.error('Error loading config from bewcloud.config.ts. Using default config instead.', error);
+      console.error('Error loading config from bewcloud.config.ts. Using default and legacy config instead.', error);
    }

    this.config = config;
@ -120,12 +146,11 @@ export class AppConfig {
    return this.config;
  }

-  static async isSignupAllowed({ viaSingleSignOn = false }: { viaSingleSignOn?: boolean } = {}): Promise<boolean> {
+  static async isSignupAllowed(): Promise<boolean> {
    await this.loadConfig();

-    const areSignupsAllowed = viaSingleSignOn && !this.config.auth.allowSignups
-      ? this.config.auth.allowSignupsViaSingleSignOn
-      : this.config.auth.allowSignups;
+    const areSignupsAllowed = this.config.auth.allowSignups;
+
    const areThereAdmins = await UserModel.isThereAnAdmin();

    if (areSignupsAllowed || !areThereAdmins) {
@ -185,43 +210,11 @@ export class AppConfig {
    return this.config.auth.enableSingleSignOn;
  }

-  static async isPublicFileSharingAllowed(): Promise<boolean> {
-    await this.loadConfig();
-
-    return this.config.files.allowPublicSharing;
-  }
-
-  static async areDirectoryDownloadsAllowed(): Promise<boolean> {
-    await this.loadConfig();
-
-    return this.config.files.allowDirectoryDownloads;
-  }
-
  static async getFilesRootPath(): Promise<string> {
    await this.loadConfig();

-    if (isAbsolute(this.config.files.rootPath)) {
-      return this.config.files.rootPath;
-    } else {
-      return join(Deno.cwd(), this.config.files.rootPath);
-    }
-  }
+    const filesRootPath = `${Deno.cwd()}/${this.config.files.rootPath}`;

-  static async getEmailConfig(): Promise<Config['email']> {
-    await this.loadConfig();
-
-    return this.config.email;
-  }
-
-  static async getContactsConfig(): Promise<Config['contacts']> {
-    await this.loadConfig();
-
-    return this.config.contacts;
-  }
-
-  static async getCalendarConfig(): Promise<Config['calendar']> {
-    await this.loadConfig();
-
-    return this.config.calendar;
+    return filesRootPath;
  }
 }
--- a/lib/feed.ts
+++ b/lib/feed.ts
@ -1,8 +1,7 @@
-import { DOMParser, initParser } from '@b-fuze/deno-dom/wasm-noinit';
-import { Feed, parseFeed } from '@mikaelporttila/rss';
-
-import { fetchUrl, fetchUrlAsGooglebot, fetchUrlWithProxy, fetchUrlWithRetries } from '/public/ts/utils/misc.ts';
-import { NewsFeed, NewsFeedCrawlType, NewsFeedType } from '/lib/types.ts';
+import { DOMParser, initParser } from 'https://deno.land/x/deno_dom@v0.1.45/deno-dom-wasm-noinit.ts';
+import { Feed, parseFeed } from 'https://deno.land/x/rss@1.0.0/mod.ts';
+import { fetchUrl, fetchUrlAsGooglebot, fetchUrlWithProxy, fetchUrlWithRetries } from './utils/misc.ts';
+import { NewsFeed, NewsFeedCrawlType, NewsFeedType } from './types.ts';

 export interface JsonFeedItem {
  id: string;
@ -222,20 +221,13 @@ export async function getUrlInfo(url: string): Promise<{ title: string; htmlBody
 }

 export async function parseTextFromHtml(html: string): Promise<string> {
-  if (!html || !html.trim()) {
-    return '';
-  }
+  let text = '';

  await initParser();

  const document = new DOMParser().parseFromString(html, 'text/html');

-  // Extract text from body to avoid any artifacts from the document wrapper
-  const text = (document?.querySelector('body')?.textContent || document?.textContent || '')
-    // Collapse runs of 2+ whitespace/newline characters, preserving single line breaks
-    .replace(/[^\S\n]{2,}/g, ' ')
-    .replace(/\n{3,}/g, '\n\n')
-    .trim();
+  text = document!.textContent;

  return text;
 }
--- a/lib/form-utils.tsx
+++ b/lib/form-utils.tsx
@ -0,0 +1,186 @@
+export interface FormField {
+  name: string;
+  label: string;
+  value?: string | null;
+  overrideValue?: string;
+  description?: string;
+  placeholder?: string;
+  type:
+    | 'text'
+    | 'email'
+    | 'tel'
+    | 'url'
+    | 'date'
+    | 'datetime-local'
+    | 'number'
+    | 'range'
+    | 'select'
+    | 'textarea'
+    | 'checkbox'
+    | 'hidden'
+    | 'password';
+  step?: string;
+  max?: string;
+  min?: string;
+  rows?: string;
+  options?: {
+    label: string;
+    value: string;
+  }[];
+  checked?: boolean;
+  multiple?: boolean;
+  required?: boolean;
+  disabled?: boolean;
+  readOnly?: boolean;
+  extraClasses?: string;
+}
+
+export function getFormDataField(formData: FormData, field: string) {
+  return ((formData.get(field) || '') as string).trim();
+}
+
+export function getFormDataFieldArray(formData: FormData, field: string) {
+  return ((formData.getAll(field) || []) as string[]).map((value) => value.trim());
+}
+
+export function generateFieldHtml(
+  field: FormField,
+  formData: FormData,
+) {
+  let value = field.overrideValue ||
+    (field.multiple ? getFormDataFieldArray(formData, field.name) : getFormDataField(formData, field.name)) ||
+    field.value;
+
+  if (typeof field.overrideValue !== 'undefined') {
+    value = field.overrideValue;
+  }
+
+  if (field.type === 'hidden') {
+    return generateInputHtml(field, value);
+  }
+
+  return (
+    <fieldset class={`block mb-4 ${field.extraClasses || ''}`}>
+      <label class='text-slate-300 block pb-1' for={`field_${field.name}`}>{field.label}</label>
+      {generateInputHtml(field, value)}
+      {field.description
+        ? (
+          <aside class={`text-sm text-slate-400 p-2 ${field.type === 'checkbox' ? 'inline' : ''}`}>
+            {field.description}
+          </aside>
+        )
+        : null}
+    </fieldset>
+  );
+}
+
+function generateInputHtml(
+  {
+    name,
+    placeholder,
+    type,
+    options,
+    step,
+    max,
+    min,
+    rows,
+    checked,
+    multiple,
+    disabled,
+    required,
+    readOnly,
+  }: FormField,
+  value?: string | string[] | null,
+) {
+  const additionalAttributes: Record<string, string | number | boolean> = {};
+
+  if (typeof step !== 'undefined') {
+    additionalAttributes.step = parseInt(step, 10);
+  }
+  if (typeof max !== 'undefined') {
+    additionalAttributes.max = parseInt(max, 10);
+  }
+  if (typeof min !== 'undefined') {
+    additionalAttributes.min = parseInt(min, 10);
+  }
+  if (typeof rows !== 'undefined') {
+    additionalAttributes.rows = parseInt(rows, 10);
+  }
+  if (checked === true && type === 'checkbox' && value) {
+    additionalAttributes.checked = true;
+  }
+  if (multiple === true) {
+    additionalAttributes.multiple = true;
+  }
+  if (required === true) {
+    additionalAttributes.required = true;
+  }
+  if (disabled === true) {
+    additionalAttributes.disabled = true;
+  }
+  if (readOnly === true) {
+    additionalAttributes.readonly = true;
+  }
+
+  if (type === 'select') {
+    return (
+      <select class='mt-1 input-field' id={`field_${name}`} name={name} type={type} {...additionalAttributes}>
+        {options?.map((option) => (
+          <option
+            value={option.value}
+            selected={option.value === value || (multiple && (value || [])?.includes(option.value))}
+          >
+            {option.label}
+          </option>
+        ))}
+      </select>
+    );
+  }
+
+  if (type === 'textarea') {
+    return (
+      <textarea
+        class='mt-1 input-field'
+        id={`field_${name}`}
+        name={name}
+        rows={6}
+        placeholder={placeholder}
+        {...additionalAttributes}
+      >
+        {(value as string) || ''}
+      </textarea>
+    );
+  }
+
+  if (type === 'checkbox') {
+    return (
+      <input id={`field_${name}`} name={name} type={type} value={value as string || ''} {...additionalAttributes} />
+    );
+  }
+
+  if (type === 'password') {
+    return (
+      <input
+        class='mt-1 input-field'
+        id={`field_${name}`}
+        name={name}
+        type={type}
+        placeholder={placeholder || ''}
+        value=''
+        {...additionalAttributes}
+      />
+    );
+  }
+
+  return (
+    <input
+      class='mt-1 input-field'
+      id={`field_${name}`}
+      name={name}
+      type={type}
+      placeholder={placeholder || ''}
+      value={value as string || ''}
+      {...additionalAttributes}
+    />
+  );
+}
--- a/lib/interfaces/database.ts
+++ b/lib/interfaces/database.ts
@ -1,5 +1,5 @@
-import { Client } from 'postgres';
-import '@std/dotenv/load';
+import { Client } from 'https://deno.land/x/postgres@v0.19.3/mod.ts';
+import 'std/dotenv/load.ts';

 const POSTGRESQL_HOST = Deno.env.get('POSTGRESQL_HOST') || '';
 const POSTGRESQL_USER = Deno.env.get('POSTGRESQL_USER') || '';
@ -21,14 +21,8 @@ const tls = POSTGRESQL_CAFILE

 export default class Database {
  protected db?: Client;
-  protected throwOnConnectionError?: boolean;
-
-  constructor(
-    { connectNow = false, throwOnConnectionError = false }: { connectNow?: boolean; throwOnConnectionError?: boolean } =
-      {},
-  ) {
-    this.throwOnConnectionError = throwOnConnectionError;

+  constructor(connectNow = false) {
    if (connectNow) {
      this.connectToPostgres();
    }
@ -70,10 +64,6 @@ export default class Database {
        console.log('Failed to connect to Postgres!');
        console.error(error);

-        if (this.throwOnConnectionError) {
-          throw error;
-        }
-
        // This allows tests (and the app) to work even if Postgres is not available
        const mockPostgresClient = {
          queryObject: () => {
--- a/lib/models/calendar.ts
+++ b/lib/models/calendar.ts
@ -1,338 +0,0 @@
-import { createDAVClient } from '/lib/models/dav.js';
-import { AppConfig } from '/lib/config.ts';
-import { getColorAsHex, parseVCalendar } from '/public/ts/utils/calendar.ts';
-import { concurrentPromises } from '/public/ts/utils/misc.ts';
-import { UserModel } from '/lib/models/user.ts';
-
-interface DAVObject extends Record<string, any> {
-  data?: string;
-  displayName?: string;
-  ctag?: string;
-  url: string;
-  uid?: string;
-}
-
-export interface Calendar extends DAVObject {
-  calendarColor?: string;
-  isVisible: boolean;
-}
-
-export interface CalendarEvent extends DAVObject {
-  calendarId: string;
-  startDate: Date;
-  endDate: Date;
-  title: string;
-  isAllDay: boolean;
-  organizerEmail: string;
-  attendees?: CalendarEventAttendee[];
-  reminders?: CalendarEventReminder[];
-  transparency: 'opaque' | 'transparent';
-  description?: string;
-  location?: string;
-  eventUrl?: string;
-  sequence?: number;
-  isRecurring?: boolean;
-  recurringRrule?: string;
-  recurrenceId?: string;
-  recurrenceMasterUid?: string;
-}
-
-export interface CalendarEventAttendee {
-  email: string;
-  status: 'accepted' | 'rejected' | 'invited';
-  name?: string;
-}
-
-export interface CalendarEventReminder {
-  uid?: string;
-  startDate: string;
-  type: 'email' | 'sound' | 'display';
-  acknowledgedAt?: string;
-  description?: string;
-}
-
-const calendarConfig = await AppConfig.getCalendarConfig();
-
-async function getClient(userId: string) {
-  const client = await createDAVClient({
-    serverUrl: calendarConfig.calDavUrl,
-    credentials: {},
-    authMethod: 'Custom',
-    // deno-lint-ignore require-await
-    authFunction: async () => {
-      return {
-        'X-Remote-User': userId,
-      };
-    },
-    fetchOptions: {
-      timeout: 15_000,
-    },
-    defaultAccountType: 'caldav',
-    rootUrl: `${calendarConfig.calDavUrl}/`,
-    principalUrl: `${calendarConfig.calDavUrl}/${userId}/`,
-    homeUrl: `${calendarConfig.calDavUrl}/${userId}/`,
-  });
-
-  return client;
-}
-
-export class CalendarModel {
-  static async list(
-    userId: string,
-  ): Promise<Calendar[]> {
-    const client = await getClient(userId);
-
-    const calendarUrl = `${calendarConfig.calDavUrl}/${userId}/`;
-
-    const davCalendars: DAVObject[] = await client.fetchCalendars({
-      calendar: {
-        url: calendarUrl,
-      },
-    });
-
-    const user = await UserModel.getById(userId);
-
-    const calendars: Calendar[] = davCalendars.map((davCalendar) => {
-      const uid = davCalendar.url.split('/').filter(Boolean).pop()!;
-
-      return {
-        ...davCalendar,
-        displayName: decodeURIComponent(davCalendar.displayName || '(empty)'),
-        calendarColor: decodeURIComponent(
-          typeof davCalendar.calendarColor === 'string' ? davCalendar.calendarColor : getColorAsHex('bg-gray-700'),
-        ),
-        isVisible: !user.extra.hidden_calendar_ids?.includes(uid),
-        uid,
-      };
-    });
-
-    return calendars;
-  }
-
-  static async get(
-    userId: string,
-    calendarId: string,
-  ): Promise<Calendar | undefined> {
-    const calendars = await this.list(userId);
-
-    return calendars.find((calendar) => calendar.uid === calendarId);
-  }
-
-  static async create(
-    userId: string,
-    name: string,
-    color: string,
-  ): Promise<void> {
-    const calendarId = crypto.randomUUID();
-    const calendarUrl = `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`;
-
-    const client = await getClient(userId);
-
-    await client.makeCalendar({
-      url: calendarUrl,
-      props: {
-        displayname: name,
-      },
-    });
-
-    // Cannot properly set color with makeCalendar, so we quickly update it instead
-    await this.update(userId, calendarUrl, name, color);
-  }
-
-  static async update(
-    userId: string,
-    calendarUrl: string,
-    displayName: string,
-    color?: string,
-  ): Promise<void> {
-    // Make "manual" request (https://www.rfc-editor.org/rfc/rfc4791.html#page-20) because the dav client doesn't have PROPPATCH
-    const xmlBody = `<?xml version="1.0" encoding="utf-8"?>
-<d:proppatch xmlns:d="DAV:" xmlns:a="http://apple.com/ns/ical/">
-  <d:set>
-    <d:prop>
-      <d:displayname>${encodeURIComponent(displayName)}</d:displayname>
-      ${color ? `<a:calendar-color>${encodeURIComponent(color)}</a:calendar-color>` : ''}
-    </d:prop>
-  </d:set>
-</d:proppatch>`;
-
-    await fetch(calendarUrl, {
-      method: 'PROPPATCH',
-      headers: {
-        'Content-Type': 'application/xml; charset=utf-8',
-        'X-Remote-User': userId,
-      },
-      body: xmlBody,
-    });
-  }
-
-  static async delete(
-    userId: string,
-    calendarId: string,
-  ): Promise<void> {
-    const calendarUrl = `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`;
-
-    const client = await getClient(userId);
-
-    await client.deleteObject({
-      url: calendarUrl,
-    });
-  }
-}
-
-export class CalendarEventModel {
-  private static async fetchByCalendarId(
-    userId: string,
-    calendarId: string,
-    dateRange?: { start: Date; end: Date },
-  ): Promise<CalendarEvent[]> {
-    const client = await getClient(userId);
-
-    const fetchOptions: { calendar: { url: string }; timeRange?: { start: string; end: string }; expand?: boolean } = {
-      calendar: {
-        url: `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`,
-      },
-    };
-
-    const davCalendarEvents: DAVObject[] = await client.fetchCalendarObjects(fetchOptions);
-
-    if (dateRange) {
-      fetchOptions.timeRange = {
-        start: dateRange.start.toISOString(),
-        end: dateRange.end.toISOString(),
-      };
-      fetchOptions.expand = true;
-
-      // Sometimes the expand option doesn't return anything, so we we fetch with and without it, when queried for a date range
-      const davCalendarEventsWithExpansion = await client.fetchCalendarObjects(fetchOptions);
-
-      for (const davCalendarEvent of davCalendarEventsWithExpansion) {
-        // Only add the events that are not already in the list
-        if (!davCalendarEvents.some((davCalendarEvent) => davCalendarEvent.url === davCalendarEvent.url)) {
-          davCalendarEvents.push(davCalendarEvent);
-        }
-      }
-    }
-
-    const calendarEvents: CalendarEvent[] = [];
-
-    for (const davCalendarEvent of davCalendarEvents) {
-      let uid = davCalendarEvent.url.split('/').filter(Boolean).pop()!;
-
-      const parsedEvents = parseVCalendar(davCalendarEvent.data || '');
-
-      for (const parsedEvent of parsedEvents) {
-        if (parsedEvent.uid) {
-          uid = parsedEvent.uid;
-        }
-
-        calendarEvents.push({
-          ...davCalendarEvent,
-          ...parsedEvent,
-          uid,
-          calendarId,
-        });
-      }
-    }
-
-    return calendarEvents;
-  }
-
-  static async list(
-    userId: string,
-    calendarIds: string[],
-    dateRange?: { start: Date; end: Date },
-  ): Promise<CalendarEvent[]> {
-    const allCalendarEvents: CalendarEvent[] = [];
-
-    await concurrentPromises(
-      calendarIds.map((calendarId) => async () => {
-        const calendarEvents = await this.fetchByCalendarId(userId, calendarId, dateRange);
-
-        allCalendarEvents.push(...calendarEvents);
-
-        return calendarEvents;
-      }),
-      5,
-    );
-
-    return allCalendarEvents;
-  }
-
-  static async get(
-    userId: string,
-    calendarId: string,
-    eventId: string,
-  ): Promise<CalendarEvent | undefined> {
-    const client = await getClient(userId);
-
-    const davCalendarEvents: DAVObject[] = await client.fetchCalendarObjects({
-      calendar: {
-        url: `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`,
-      },
-      objectUrls: [`${calendarConfig.calDavUrl}/${userId}/${calendarId}/${eventId}.ics`],
-    });
-
-    if (davCalendarEvents.length === 0) {
-      return undefined;
-    }
-
-    const davCalendarEvent = davCalendarEvents[0];
-
-    const calendarEvent: CalendarEvent = {
-      ...davCalendarEvent,
-      ...parseVCalendar(davCalendarEvent.data || '')[0],
-      uid: eventId,
-      calendarId,
-    };
-
-    return calendarEvent;
-  }
-
-  static async create(
-    userId: string,
-    calendarId: string,
-    eventId: string,
-    vCalendar: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    const calendarUrl = `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`;
-
-    await client.createCalendarObject({
-      calendar: {
-        url: calendarUrl,
-      },
-      iCalString: vCalendar,
-      filename: `${eventId}.ics`,
-    });
-  }
-
-  static async update(
-    userId: string,
-    eventUrl: string,
-    ics: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    await client.updateCalendarObject({
-      calendarObject: {
-        url: eventUrl,
-        data: ics,
-      },
-    });
-  }
-
-  static async delete(
-    userId: string,
-    eventUrl: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    await client.deleteCalendarObject({
-      calendarObject: {
-        url: eventUrl,
-      },
-    });
-  }
-}
--- a/lib/models/contacts.ts
+++ b/lib/models/contacts.ts
@ -1,202 +0,0 @@
-import { createDAVClient } from '/lib/models/dav.js';
-import { AppConfig } from '/lib/config.ts';
-import { parseVCard } from '/public/ts/utils/contacts.ts';
-
-interface DAVObject extends Record<string, any> {
-  data?: string;
-  displayName?: string;
-  ctag?: string;
-  url: string;
-  uid?: string;
-}
-
-export interface Contact extends DAVObject {
-  firstName?: string;
-  lastName?: string;
-  middleNames?: string[];
-  title?: string;
-  email?: string;
-  phone?: string;
-  notes?: string;
-}
-
-export interface AddressBook extends DAVObject {}
-
-const contactsConfig = await AppConfig.getContactsConfig();
-
-async function getClient(userId: string) {
-  const client = await createDAVClient({
-    serverUrl: contactsConfig.cardDavUrl,
-    credentials: {},
-    authMethod: 'Custom',
-    // deno-lint-ignore require-await
-    authFunction: async () => {
-      return {
-        'X-Remote-User': userId,
-      };
-    },
-    fetchOptions: {
-      timeout: 15_000,
-    },
-    defaultAccountType: 'carddav',
-    rootUrl: `${contactsConfig.cardDavUrl}/`,
-    principalUrl: `${contactsConfig.cardDavUrl}/${userId}/`,
-    homeUrl: `${contactsConfig.cardDavUrl}/${userId}/`,
-  });
-
-  return client;
-}
-
-export class ContactModel {
-  static async list(
-    userId: string,
-    addressBookId: string,
-  ): Promise<Contact[]> {
-    const client = await getClient(userId);
-
-    const addressBookUrl = `${contactsConfig.cardDavUrl}/${userId}/${addressBookId}/`;
-
-    const davContacts: DAVObject[] = await client.fetchVCards({
-      addressBook: {
-        url: addressBookUrl,
-      },
-    });
-
-    const contacts: Contact[] = davContacts.map((davContact) => {
-      return {
-        ...davContact,
-        ...parseVCard(davContact.data || '')[0],
-      };
-    });
-
-    return contacts;
-  }
-
-  static async get(
-    userId: string,
-    addressBookId: string,
-    contactId: string,
-  ): Promise<Contact | undefined> {
-    const contacts = await this.list(userId, addressBookId);
-
-    return contacts.find((contact) => contact.uid === contactId);
-  }
-
-  static async create(
-    userId: string,
-    addressBookId: string,
-    contactId: string,
-    vCard: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    const addressBookUrl = `${contactsConfig.cardDavUrl}/${userId}/${addressBookId}/`;
-
-    await client.createVCard({
-      addressBook: {
-        url: addressBookUrl,
-      },
-      vCardString: vCard,
-      filename: `${contactId}.vcf`,
-    });
-  }
-
-  static async update(
-    userId: string,
-    contactUrl: string,
-    vCard: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    await client.updateVCard({
-      vCard: {
-        url: contactUrl,
-        data: vCard,
-      },
-    });
-  }
-
-  static async delete(
-    userId: string,
-    contactUrl: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    await client.deleteVCard({
-      vCard: {
-        url: contactUrl,
-      },
-    });
-  }
-
-  static async listAddressBooks(
-    userId: string,
-  ): Promise<AddressBook[]> {
-    const client = await getClient(userId);
-
-    const davAddressBooks: DAVObject[] = await client.fetchAddressBooks();
-
-    const addressBooks: AddressBook[] = davAddressBooks.map((davAddressBook) => {
-      const uid = davAddressBook.url.split('/').filter(Boolean).pop()!;
-
-      return {
-        ...davAddressBook,
-        uid,
-      };
-    });
-
-    return addressBooks;
-  }
-
-  static async createAddressBook(
-    userId: string,
-    name: string,
-  ): Promise<void> {
-    const addressBookId = crypto.randomUUID();
-    const addressBookUrl = `${contactsConfig.cardDavUrl}/${userId}/${addressBookId}/`;
-
-    // For some reason this sends invalid XML
-    // await client.makeCollection({
-    //   url: addressBookUrl,
-    //   props: {
-    //     displayName: name,
-    //   },
-    // });
-
-    // Make "manual" request (https://www.rfc-editor.org/rfc/rfc6352.html#page-14)
-    const xmlBody = `<?xml version="1.0" encoding="utf-8"?>
-<d:mkcol xmlns:d="DAV:" xmlns:card="urn:ietf:params:xml:ns:carddav">
-  <d:set>
-    <d:prop>
-      <d:displayname>${encodeURIComponent(name)}</d:displayname>
-      <d:resourcetype>
-        <d:collection/>
-        <card:addressbook/>
-      </d:resourcetype>
-    </d:prop>
-  </d:set>
-</d:mkcol>`;
-
-    await fetch(addressBookUrl, {
-      method: 'MKCOL',
-      headers: {
-        'Content-Type': 'application/xml; charset=utf-8',
-        'X-Remote-User': userId,
-      },
-      body: xmlBody,
-    });
-  }
-
-  static async deleteAddressBook(
-    userId: string,
-    addressBookId: string,
-  ): Promise<void> {
-    const client = await getClient(userId);
-
-    const addressBookUrl = `${contactsConfig.cardDavUrl}/${userId}/${addressBookId}/`;
-
-    await client.deleteObject({
-      url: addressBookUrl,
-    });
-  }
-}
--- a/lib/models/dav.js
+++ b/lib/models/dav.js
--- a/lib/models/email.ts
+++ b/lib/models/email.ts
@ -1,630 +0,0 @@
-import nodemailer from 'nodemailer';
-import '@std/dotenv/load';
-
-import { escapeHtml } from '/public/ts/utils/misc.ts';
-import { AppConfig } from '/lib/config.ts';
-
-const SMTP_USERNAME = Deno.env.get('SMTP_USERNAME') || '';
-const SMTP_PASSWORD = Deno.env.get('SMTP_PASSWORD') || '';
-
-export class EmailModel {
-  private static async send(to: string, subject: string, htmlBody: string, textBody: string) {
-    const emailConfig = await AppConfig.getEmailConfig();
-
-    if (!emailConfig.from || !emailConfig.host || !emailConfig.port) {
-      throw new Error('config.email.from, config.email.host, or config.email.port is not set');
-    }
-
-    let tlsMode = emailConfig.tlsMode;
-    if (tlsMode === 'auto') {
-      tlsMode = Number(emailConfig.port) === 465 ? 'immediate' : 'starttls';
-    }
-
-    const transporterConfig = {
-      host: emailConfig.host,
-      port: emailConfig.port,
-
-      secure: tlsMode === 'immediate',
-      requireTLS: tlsMode === 'starttls',
-      ignoreTLS: tlsMode === 'none',
-      tls: emailConfig.tlsVerify === false
-        ? { rejectUnauthorized: false }
-        : emailConfig.tlsVerify !== true
-        ? { servername: emailConfig.tlsVerify }
-        : {},
-
-      auth: (SMTP_USERNAME || SMTP_PASSWORD)
-        ? {
-          user: SMTP_USERNAME,
-          pass: SMTP_PASSWORD,
-        }
-        : null,
-    };
-
-    const transporter = nodemailer.createTransport(transporterConfig);
-
-    const mailOptions = {
-      from: emailConfig.from,
-      to,
-      subject,
-      html: htmlBody,
-      text: textBody,
-    };
-
-    try {
-      await transporter.sendMail(mailOptions);
-      console.log(`Email sent to "${to}", "${subject}"`);
-    } catch (error) {
-      console.log(error);
-      throw new Error(`Failed to send email to "${to}", "${subject}"`);
-    }
-  }
-
-  /** Based off of https://github.com/ActiveCampaign/postmark-templates/tree/main/templates-inlined/basic/password-reset */
-  private static getHtmlBody(title: string, htmlBody: string) {
-    return `
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="x-apple-disable-message-reformatting" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="color-scheme" content="light dark" />
-    <meta name="supported-color-schemes" content="light dark" />
-    <title>${escapeHtml(title)}</title>
-    <style type="text/css" rel="stylesheet" media="all">
-    /* Base ------------------------------ */
-    
-    body {
-      width: 100% !important;
-      height: 100%;
-      margin: 0;
-      -webkit-text-size-adjust: none;
-    }
-    
-    a {
-      color: #3869D4;
-    }
-    
-    a img {
-      border: none;
-    }
-    
-    td {
-      word-break: break-word;
-    }
-    
-    .preheader {
-      display: none !important;
-      visibility: hidden;
-      mso-hide: all;
-      font-size: 1px;
-      line-height: 1px;
-      max-height: 0;
-      max-width: 0;
-      opacity: 0;
-      overflow: hidden;
-    }
-    /* Type ------------------------------ */
-    
-    body,
-    td,
-    th {
-      /* Source: https://fontsarena.com/blog/operating-systems-default-sans-serif-fonts/ */
-      font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
-    }
-    
-    h1 {
-      margin-top: 0;
-      color: #333333;
-      font-size: 22px;
-      font-weight: bold;
-      text-align: left;
-    }
-    
-    h2 {
-      margin-top: 0;
-      color: #333333;
-      font-size: 16px;
-      font-weight: bold;
-      text-align: left;
-    }
-    
-    h3 {
-      margin-top: 0;
-      color: #333333;
-      font-size: 14px;
-      font-weight: bold;
-      text-align: left;
-    }
-    
-    td,
-    th {
-      font-size: 16px;
-    }
-    
-    p,
-    ul,
-    ol,
-    blockquote {
-      margin: .4em 0 1.1875em;
-      font-size: 16px;
-      line-height: 1.625;
-    }
-    
-    p.sub {
-      font-size: 13px;
-    }
-    /* Utilities ------------------------------ */
-    
-    .align-right {
-      text-align: right;
-    }
-    
-    .align-left {
-      text-align: left;
-    }
-    
-    .align-center {
-      text-align: center;
-    }
-    
-    .u-margin-bottom-none {
-      margin-bottom: 0;
-    }
-    /* Buttons ------------------------------ */
-    
-    .button {
-      background-color: #3869D4;
-      border-top: 10px solid #3869D4;
-      border-right: 18px solid #3869D4;
-      border-bottom: 10px solid #3869D4;
-      border-left: 18px solid #3869D4;
-      display: inline-block;
-      color: #FFF;
-      text-decoration: none;
-      border-radius: 3px;
-      box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
-      -webkit-text-size-adjust: none;
-      box-sizing: border-box;
-    }
-    
-    .button--green {
-      background-color: #22BC66;
-      border-top: 10px solid #22BC66;
-      border-right: 18px solid #22BC66;
-      border-bottom: 10px solid #22BC66;
-      border-left: 18px solid #22BC66;
-    }
-    
-    .button--red {
-      background-color: #FF6136;
-      border-top: 10px solid #FF6136;
-      border-right: 18px solid #FF6136;
-      border-bottom: 10px solid #FF6136;
-      border-left: 18px solid #FF6136;
-    }
-    
-    @media only screen and (max-width: 500px) {
-      .button {
-        width: 100% !important;
-        text-align: center !important;
-      }
-    }
-    /* Attribute list ------------------------------ */
-    
-    .attributes {
-      margin: 0 0 21px;
-    }
-    
-    .attributes_content {
-      background-color: #F4F4F7;
-      padding: 16px;
-    }
-    
-    .attributes_item {
-      padding: 0;
-    }
-    /* Related Items ------------------------------ */
-    
-    .related {
-      width: 100%;
-      margin: 0;
-      padding: 25px 0 0 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .related_item {
-      padding: 10px 0;
-      color: #CBCCCF;
-      font-size: 15px;
-      line-height: 18px;
-    }
-    
-    .related_item-title {
-      display: block;
-      margin: .5em 0 0;
-    }
-    
-    .related_item-thumb {
-      display: block;
-      padding-bottom: 10px;
-    }
-    
-    .related_heading {
-      border-top: 1px solid #CBCCCF;
-      text-align: center;
-      padding: 25px 0 10px;
-    }
-    /* Discount Code ------------------------------ */
-    
-    .discount {
-      width: 100%;
-      margin: 0;
-      padding: 24px;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      background-color: #F4F4F7;
-      border: 2px dashed #CBCCCF;
-    }
-    
-    .discount_heading {
-      text-align: center;
-    }
-    
-    .discount_body {
-      text-align: center;
-      font-size: 15px;
-    }
-    /* Social Icons ------------------------------ */
-    
-    .social {
-      width: auto;
-    }
-    
-    .social td {
-      padding: 0;
-      width: auto;
-    }
-    
-    .social_icon {
-      height: 20px;
-      margin: 0 8px 10px 8px;
-      padding: 0;
-    }
-    /* Data table ------------------------------ */
-    
-    .purchase {
-      width: 100%;
-      margin: 0;
-      padding: 35px 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .purchase_content {
-      width: 100%;
-      margin: 0;
-      padding: 25px 0 0 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .purchase_item {
-      padding: 10px 0;
-      color: #51545E;
-      font-size: 15px;
-      line-height: 18px;
-    }
-    
-    .purchase_heading {
-      padding-bottom: 8px;
-      border-bottom: 1px solid #EAEAEC;
-    }
-    
-    .purchase_heading p {
-      margin: 0;
-      color: #85878E;
-      font-size: 12px;
-    }
-    
-    .purchase_footer {
-      padding-top: 15px;
-      border-top: 1px solid #EAEAEC;
-    }
-    
-    .purchase_total {
-      margin: 0;
-      text-align: right;
-      font-weight: bold;
-      color: #333333;
-    }
-    
-    .purchase_total--label {
-      padding: 0 15px 0 0;
-    }
-    
-    body {
-      background-color: #F2F4F6;
-      color: #51545E;
-    }
-    
-    p {
-      color: #51545E;
-    }
-    
-    .email-wrapper {
-      width: 100%;
-      margin: 0;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      background-color: #F2F4F6;
-    }
-    
-    .email-content {
-      width: 100%;
-      margin: 0;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    /* Masthead ----------------------- */
-    
-    .email-masthead {
-      padding: 25px 0;
-      text-align: center;
-    }
-    
-    .email-masthead_logo {
-      width: 94px;
-    }
-    
-    .email-masthead_name {
-      font-size: 16px;
-      font-weight: bold;
-      color: #A8AAAF;
-      text-decoration: none;
-      text-shadow: 0 1px 0 white;
-    }
-    /* Body ------------------------------ */
-    
-    .email-body {
-      width: 100%;
-      margin: 0;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-    }
-    
-    .email-body_inner {
-      width: 570px;
-      margin: 0 auto;
-      padding: 0;
-      -premailer-width: 570px;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      background-color: #FFFFFF;
-    }
-    
-    .email-footer {
-      width: 570px;
-      margin: 0 auto;
-      padding: 0;
-      -premailer-width: 570px;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      text-align: center;
-    }
-    
-    .email-footer p {
-      color: #A8AAAF;
-    }
-    
-    .body-action {
-      width: 100%;
-      margin: 30px auto;
-      padding: 0;
-      -premailer-width: 100%;
-      -premailer-cellpadding: 0;
-      -premailer-cellspacing: 0;
-      text-align: center;
-    }
-    
-    .body-sub {
-      margin-top: 25px;
-      padding-top: 25px;
-      border-top: 1px solid #EAEAEC;
-    }
-    
-    .content-cell {
-      padding: 45px;
-    }
-    /*Media Queries ------------------------------ */
-    
-    @media only screen and (max-width: 600px) {
-      .email-body_inner,
-      .email-footer {
-        width: 100% !important;
-      }
-    }
-    
-    @media (prefers-color-scheme: dark) {
-      body,
-      .email-body,
-      .email-body_inner,
-      .email-content,
-      .email-wrapper,
-      .email-masthead,
-      .email-footer {
-        background-color: #333333 !important;
-        color: #FFF !important;
-      }
-      p,
-      ul,
-      ol,
-      blockquote,
-      h1,
-      h2,
-      h3,
-      span,
-      .purchase_item {
-        color: #FFF !important;
-      }
-      .attributes_content,
-      .discount {
-        background-color: #222 !important;
-      }
-      .email-masthead_name {
-        text-shadow: none !important;
-      }
-    }
-    
-    :root {
-      color-scheme: light dark;
-      supported-color-schemes: light dark;
-    }
-    </style>
-    <!--[if mso]>
-    <style type="text/css">
-      .f-fallback  {
-        font-family: Arial, sans-serif;
-      }
-    </style>
-  <![endif]-->
-  </head>
-  <body>
-    <span class="preheader">${escapeHtml(title)}</span>
-    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-      <tr>
-        <td align="center">
-          <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-            <tr>
-              <td class="email-masthead">
-                <a href="https://bewcloud.com" class="f-fallback email-masthead_name">
-                  bewCloud
-                </a>
-              </td>
-            </tr>
-            <tr>
-              <td class="email-body" width="570" cellpadding="0" cellspacing="0">
-                <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-                  <tr>
-                    <td class="content-cell">
-                      <div class="f-fallback">
-                        ${htmlBody}
-                      </div>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
-    `;
-  }
-
-  static async sendVerificationEmail(
-    email: string,
-    verificationCode: string,
-  ) {
-    const emailTitle = 'Verify your email in bewCloud';
-
-    const textBody = `
-${emailTitle}
------------------------
-
-You or someone who knows your email is trying to verify it in bewCloud.
-
-Here's the verification code:
-
-**${verificationCode}**
-===============================
-
-This code will expire in 30 minutes.
-    `;
-
-    const htmlBody = this.getHtmlBody(
-      emailTitle,
-      `
-      <h1>${escapeHtml(emailTitle)}</h1>
-      <p>You or someone who knows your email is trying to verify it in bewCloud.</p>
-      <p>Here's the verification code:</p>
-      <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-        <tr>
-          <td align="center">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
-              <tr>
-                <td align="center">
-                  <span class="f-fallback button button--green">${escapeHtml(verificationCode)}</span>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <p>This code will expire in 30 minutes.</p>
-    `,
-    );
-
-    await this.send(email, emailTitle, htmlBody, textBody);
-  }
-
-  static async sendLoginVerificationEmail(
-    email: string,
-    verificationCode: string,
-  ) {
-    const emailTitle = 'Verify your login in bewCloud';
-
-    const textBody = `
-${emailTitle}
------------------------
-
-You or someone who knows your email and password is trying to login to bewCloud.
-
-Here's the verification code:
-
-**${verificationCode}**
-===============================
-
-This code will expire in 30 minutes.
-    `;
-
-    const htmlBody = this.getHtmlBody(
-      emailTitle,
-      `
-      <h1>${escapeHtml(emailTitle)}</h1>
-      <p>You or someone who knows your email and password is trying to login to bewCloud.</p>
-      <p>Here's the verification code:</p>
-      <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-        <tr>
-          <td align="center">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
-              <tr>
-                <td align="center">
-                  <span class="f-fallback button button--green">${escapeHtml(verificationCode)}</span>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <p>This code will expire in 30 minutes.</p>
-    `,
-    );
-
-    await this.send(email, emailTitle, htmlBody, textBody);
-  }
-}
--- a/lib/models/files.ts
+++ b/lib/models/files.ts
@ -1,30 +1,10 @@
-import { join, resolve } from '@std/path';
+import { join } from 'std/path/join.ts';
+import { resolve } from 'std/path/resolve.ts';
 import { lookup } from 'mrmime';
-import { Cookie, getCookies, setCookie } from '@std/http';

 import { AppConfig } from '/lib/config.ts';
-import { Directory, DirectoryFile, FileShare } from '/lib/types.ts';
-import {
-  bytesFromHumanFileSize,
-  sortDirectoriesByName,
-  sortEntriesByName,
-  sortFilesByName,
-  TRASH_PATH,
-} from '/public/ts/utils/files.ts';
-import Database, { sql } from '/lib/interfaces/database.ts';
-import {
-  COOKIE_NAME as AUTH_COOKIE_NAME,
-  generateKey,
-  generateToken,
-  JWT_SECRET,
-  resolveCookieDomain,
-  verifyAuthJwt,
-} from '/lib/auth.ts';
-import { isRunningLocally } from '/public/ts/utils/misc.ts';
-
-const COOKIE_NAME = `${AUTH_COOKIE_NAME}-file-share`;
-
-const db = new Database();
+import { Directory, DirectoryFile } from '/lib/types.ts';
+import { sortDirectoriesByName, sortEntriesByName, sortFilesByName, TRASH_PATH } from '/lib/utils/files.ts';

 export class DirectoryModel {
  static async list(userId: string, path: string): Promise<Directory[]> {
@ -38,22 +18,15 @@ export class DirectoryModel {
      entry.isDirectory || entry.isSymlink
    );

-    const fileShares = (await AppConfig.isPublicFileSharingAllowed())
-      ? await FileShareModel.getByParentFilePath(userId, path)
-      : [];
-
    for (const entry of directoryEntries) {
      const stat = await Deno.stat(join(rootPath, entry.name));

-      const directorySize = await getDirectorySize(join(rootPath, entry.name));
-
      const directory: Directory = {
        user_id: userId,
        parent_path: path,
        directory_name: entry.name,
        has_write_access: true,
-        size_in_bytes: directorySize || stat.size,
-        file_share_id: fileShares.find((fileShare) => fileShare.file_path === `${join(path, entry.name)}/`)?.id || null,
+        size_in_bytes: stat.size,
        updated_at: stat.mtime || new Date(),
        created_at: stat.birthtime || new Date(),
      };
@ -137,10 +110,6 @@ export class DirectoryModel {
      const matchingDirectories = output.split('\n').map((directoryPath) => directoryPath.trim()).filter(Boolean);

      for (const relativeDirectoryPath of matchingDirectories) {
-        const fileShares = (await AppConfig.isPublicFileSharingAllowed())
-          ? await FileShareModel.getByParentFilePath(userId, relativeDirectoryPath)
-          : [];
-
        const stat = await Deno.stat(join(rootPath, relativeDirectoryPath));
        let parentPath = `/${relativeDirectoryPath.replace('./', '/').split('/').slice(0, -1).join('')}/`;
        const directoryName = relativeDirectoryPath.split('/').pop()!;
@ -149,17 +118,12 @@ export class DirectoryModel {
          parentPath = '/';
        }

-        const directorySize = await getDirectorySize(join(rootPath, relativeDirectoryPath));
-
        const directory: Directory = {
          user_id: userId,
          parent_path: parentPath,
          directory_name: directoryName,
          has_write_access: true,
-          size_in_bytes: directorySize || stat.size,
-          file_share_id: fileShares.find((fileShare) =>
-            fileShare.file_path === `${join(relativeDirectoryPath, directoryName)}/`
-          )?.id || null,
+          size_in_bytes: stat.size,
          updated_at: stat.mtime || new Date(),
          created_at: stat.birthtime || new Date(),
        };
@ -186,10 +150,6 @@ export class FileModel {

    const fileEntries = (await getPathEntries(userId, path)).filter((entry) => entry.isFile);

-    const fileShares = (await AppConfig.isPublicFileSharingAllowed())
-      ? await FileShareModel.getByParentFilePath(userId, path)
-      : [];
-
    for (const entry of fileEntries) {
      const stat = await Deno.stat(join(rootPath, entry.name));

@ -199,7 +159,6 @@ export class FileModel {
        file_name: entry.name,
        has_write_access: true,
        size_in_bytes: stat.size,
-        file_share_id: fileShares.find((fileShare) => fileShare.file_path === join(path, entry.name))?.id || null,
        updated_at: stat.mtime || new Date(),
        created_at: stat.birthtime || new Date(),
      };
@ -356,10 +315,6 @@ export class FileModel {
      const matchingFiles = output.split('\n').map((filePath) => filePath.trim()).filter(Boolean);

      for (const relativeFilePath of matchingFiles) {
-        const fileShares = (await AppConfig.isPublicFileSharingAllowed())
-          ? await FileShareModel.getByParentFilePath(userId, relativeFilePath)
-          : [];
-
        const stat = await Deno.stat(join(rootPath, relativeFilePath));
        let parentPath = `/${relativeFilePath.replace('./', '/').split('/').slice(0, -1).join('')}/`;
        const fileName = relativeFilePath.split('/').pop()!;
@ -374,8 +329,6 @@ export class FileModel {
          file_name: fileName,
          has_write_access: true,
          size_in_bytes: stat.size,
-          file_share_id: fileShares.find((fileShare) => fileShare.file_path === join(relativeFilePath, fileName))?.id ||
-            null,
          updated_at: stat.mtime || new Date(),
          created_at: stat.birthtime || new Date(),
        };
@ -431,10 +384,6 @@ export class FileModel {
      const matchingFiles = output.split('\n').map((filePath) => filePath.trim()).filter(Boolean);

      for (const relativeFilePath of matchingFiles) {
-        const fileShares = (await AppConfig.isPublicFileSharingAllowed())
-          ? await FileShareModel.getByParentFilePath(userId, relativeFilePath)
-          : [];
-
        const stat = await Deno.stat(join(rootPath, relativeFilePath));
        let parentPath = `/${relativeFilePath.replace('./', '/').split('/').slice(0, -1).join('')}/`;
        const fileName = relativeFilePath.split('/').pop()!;
@ -449,8 +398,6 @@ export class FileModel {
          file_name: fileName,
          has_write_access: true,
          size_in_bytes: stat.size,
-          file_share_id: fileShares.find((fileShare) => fileShare.file_path === join(relativeFilePath, fileName))?.id ||
-            null,
          updated_at: stat.mtime || new Date(),
          created_at: stat.birthtime || new Date(),
        };
@ -467,133 +414,6 @@ export class FileModel {
  }
 }

-export interface FileShareJwtData {
-  data: {
-    file_share_id: string;
-    hashed_password: string;
-  };
-}
-
-export class FileShareModel {
-  static async getById(id: string): Promise<FileShare | null> {
-    const fileShare = (await db.query<FileShare>(sql`SELECT * FROM "bewcloud_file_shares" WHERE "id" = $1 LIMIT 1`, [
-      id,
-    ]))[0];
-
-    return fileShare;
-  }
-
-  static async getByParentFilePath(userId: string, parentFilePath: string): Promise<FileShare[]> {
-    const fileShares = await db.query<FileShare>(
-      sql`SELECT * FROM "bewcloud_file_shares" WHERE "user_id" = $1 AND "file_path" LIKE $2`,
-      [userId, `${parentFilePath}%`],
-    );
-
-    return fileShares;
-  }
-
-  static async create(fileShare: Omit<FileShare, 'id' | 'created_at'>): Promise<FileShare> {
-    const newFileShare = (await db.query<FileShare>(
-      sql`INSERT INTO "bewcloud_file_shares" (
-        "user_id",
-        "file_path",
-        "extra"
-      ) VALUES ($1, $2, $3)
-      RETURNING *`,
-      [
-        fileShare.user_id,
-        fileShare.file_path,
-        JSON.stringify(fileShare.extra),
-      ],
-    ))[0];
-
-    return newFileShare;
-  }
-
-  static async update(fileShare: FileShare): Promise<void> {
-    await db.query(
-      sql`UPDATE "bewcloud_file_shares" SET "extra" = $2 WHERE "id" = $1`,
-      [fileShare.id, JSON.stringify(fileShare.extra)],
-    );
-  }
-
-  static async delete(fileShareId: string): Promise<void> {
-    await db.query(
-      sql`DELETE FROM "bewcloud_file_shares" WHERE "id" = $1`,
-      [fileShareId],
-    );
-  }
-
-  static async createSessionCookie(
-    request: Request,
-    response: Response,
-    fileShareId: string,
-    hashedPassword: string,
-  ) {
-    const token = await generateToken<FileShareJwtData['data']>({
-      file_share_id: fileShareId,
-      hashed_password: hashedPassword,
-    });
-
-    const cookie: Cookie = {
-      name: COOKIE_NAME,
-      value: token,
-      expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7), // 7 days
-      path: `/file-share/${fileShareId}`,
-      secure: isRunningLocally(request) ? false : true,
-      httpOnly: true,
-      sameSite: 'Lax',
-      domain: await resolveCookieDomain(request),
-    };
-
-    if (await AppConfig.isCookieDomainSecurityDisabled()) {
-      delete cookie.domain;
-    }
-
-    setCookie(response.headers, cookie);
-
-    return response;
-  }
-
-  static async getDataFromRequest(request: Request): Promise<{ fileShareId: string; hashedPassword: string } | null> {
-    const cookies = getCookies(request.headers);
-
-    if (cookies[COOKIE_NAME]) {
-      const result = await this.getDataFromCookie(cookies[COOKIE_NAME]);
-
-      if (result) {
-        return result;
-      }
-    }
-
-    return null;
-  }
-
-  private static async getDataFromCookie(
-    cookieValue: string,
-  ): Promise<{ fileShareId: string; hashedPassword: string } | null> {
-    if (!cookieValue) {
-      return null;
-    }
-
-    const key = await generateKey(JWT_SECRET);
-
-    try {
-      const token = await verifyAuthJwt<FileShareJwtData>(key, cookieValue);
-
-      if (!token.data.file_share_id || !token.data.hashed_password) {
-        throw new Error('Not Found');
-      }
-
-      return { fileShareId: token.data.file_share_id, hashedPassword: token.data.hashed_password };
-    } catch (error) {
-      console.error(error);
-    }
-
-    return null;
-  }
-}
-
 /**
 * Ensures the user path is valid and securely accessible (meaning it's not trying to access files outside of the user's root directory).
 * Does not check if the path exists.
@ -608,39 +428,7 @@ export async function ensureUserPathIsValidAndSecurelyAccessible(userId: string,

  const resolvedFullPath = `${resolve(fullPath)}/`;

-  // Normalize path separators for consistent comparison on Windows
-  const normalizedUserRootPath = userRootPath.replaceAll('\\', '/');
-  const normalizedResolvedFullPath = resolvedFullPath.replaceAll('\\', '/');
-
-  if (!normalizedResolvedFullPath.startsWith(normalizedUserRootPath)) {
-    throw new Error('Invalid file path');
-  }
-}
-
-/**
- * Ensures the file share path is valid and securely accessible (meaning it's not trying to access files outside of the file share's root directory).
- * Does not check if the path exists.
- *
- * @param userId - The user ID
- * @param fileSharePath - The file share path
- * @param path - The relative path (user-provided) to check
- */
-export async function ensureFileSharePathIsValidAndSecurelyAccessible(
-  userId: string,
-  fileSharePath: string,
-  path: string,
-): Promise<void> {
-  await ensureUserPathIsValidAndSecurelyAccessible(userId, fileSharePath);
-
-  const userRootPath = join(await AppConfig.getFilesRootPath(), userId, '/');
-
-  const fileShareRootPath = join(userRootPath, fileSharePath);
-
-  const fullPath = join(fileShareRootPath, path);
-
-  const resolvedFullPath = `${resolve(fullPath)}/`;
-
-  if (!resolvedFullPath.startsWith(fileShareRootPath)) {
+  if (!resolvedFullPath.startsWith(userRootPath)) {
    throw new Error('Invalid file path');
  }
 }
@ -711,14 +499,6 @@ async function deleteDirectoryOrFile(userId: string, path: string, name: string)

  const rootPath = join(await AppConfig.getFilesRootPath(), userId, path);

-  const fileShares = (await AppConfig.isPublicFileSharingAllowed())
-    ? await FileShareModel.getByParentFilePath(userId, path)
-    : [];
-
-  const fileSharesForPath = fileShares.filter((fileShare) =>
-    fileShare.file_path === `${join(path, name)}/` || fileShare.file_path === join(path, name)
-  );
-
  try {
    if (path.startsWith(TRASH_PATH)) {
      await Deno.remove(join(rootPath, name), { recursive: true });
@ -726,11 +506,6 @@ async function deleteDirectoryOrFile(userId: string, path: string, name: string)
      const trashPath = join(await AppConfig.getFilesRootPath(), userId, TRASH_PATH);
      await Deno.rename(join(rootPath, name), join(trashPath, name));
    }
-
-    // Delete all file shares for this path
-    for (const fileShare of fileSharesForPath) {
-      await FileShareModel.delete(fileShare.id);
-    }
  } catch (error) {
    console.error(error);
    return false;
@ -761,58 +536,3 @@ export async function searchFilesAndDirectories(
    files,
  };
 }
-
-export async function getPathInfo(userId: string, path: string): Promise<{ isDirectory: boolean; isFile: boolean }> {
-  await ensureUserPathIsValidAndSecurelyAccessible(userId, path);
-
-  const rootPath = join(await AppConfig.getFilesRootPath(), userId);
-
-  const stat = await Deno.stat(join(rootPath, path));
-
-  return {
-    isDirectory: stat.isDirectory,
-    isFile: stat.isFile,
-  };
-}
-
-// NOTE: We're using `-h` (human readable) and parsing the output because that's more stable than `-B 1B` across different systems for a reliable byte size.
-async function getDirectorySize(path: string): Promise<number> {
-  try {
-    const controller = new AbortController();
-    const commandTimeout = setTimeout(() => controller.abort(), 5_000);
-
-    const command = new Deno.Command(`du`, {
-      args: [
-        `-sh`,
-        path,
-      ],
-      signal: controller.signal,
-    });
-
-    const { code, stdout, stderr } = await command.output();
-
-    if (commandTimeout) {
-      clearTimeout(commandTimeout);
-    }
-
-    if (code !== 0) {
-      if (stderr) {
-        throw new Error(new TextDecoder().decode(stderr));
-      }
-
-      throw new Error(`Unknown error running "du"`);
-    }
-
-    const output = new TextDecoder().decode(stdout);
-
-    const value = output.split('\t')[0].trim();
-
-    const number = Number.parseFloat(value.match(/\d+(\.\d+)?/)?.[0] || '0');
-    const unit = value.match(/[A-Z]+/)?.[0] || 'B'.toUpperCase();
-
-    return bytesFromHumanFileSize(`${number} ${unit}B`);
-  } catch (error) {
-    console.error(error);
-    return 0;
-  }
-}
--- a/lib/models/multi-factor-auth.ts
+++ b/lib/models/multi-factor-auth.ts
@ -1,10 +1,7 @@
-import { Cookie, getCookies, setCookie } from '@std/http';
+import { Cookie, getCookies, setCookie } from 'std/http/cookie.ts';

 import { MultiFactorAuthMethod, User } from '/lib/types.ts';
-import {
-  getEnabledMultiFactorAuthMethodsFromUser,
-  getMultiFactorAuthMethodByIdFromUser,
-} from '/public/ts/utils/multi-factor-auth.ts';
+import { getMultiFactorAuthMethodByIdFromUser } from '/lib/utils/multi-factor-auth.ts';
 import {
  COOKIE_NAME as AUTH_COOKIE_NAME,
  generateKey,
@ -14,10 +11,9 @@ import {
  resolveCookieDomain,
  verifyAuthJwt,
 } from '/lib/auth.ts';
-import { isRunningLocally } from '/public/ts/utils/misc.ts';
+import { isRunningLocally } from '/lib/utils/misc.ts';
 import { AppConfig } from '/lib/config.ts';
 import { UserModel } from './user.ts';
-import { EmailModel } from './multi-factor-auth/email.ts';

 const COOKIE_NAME = `${AUTH_COOKIE_NAME}-mfa`;
 const MFA_SESSION_ID = 'mfa';
@ -74,18 +70,6 @@ export class MultiFactorAuthModel {
      },
    });

-    try {
-      const enabledMultiFactorAuthMethods = getEnabledMultiFactorAuthMethodsFromUser(user);
-
-      const emailMethod = enabledMultiFactorAuthMethods.find((method) => method.type === 'email');
-
-      if (emailMethod) {
-        await EmailModel.createAndSendCode(emailMethod.id, user);
-      }
-    } catch (error) {
-      console.error(error);
-    }
-
    const responseWithCookie = await this.createSessionCookie(request, user, response);

    return responseWithCookie;
--- a/lib/models/multi-factor-auth/email.ts
+++ b/lib/models/multi-factor-auth/email.ts
@ -1,50 +0,0 @@
-import { MultiFactorAuthMethod, User } from '/lib/types.ts';
-import { MultiFactorAuthSetup } from '/lib/models/multi-factor-auth.ts';
-import { VerificationCodeModel } from '/lib/models/user.ts';
-import { EmailModel as EmailTransportModel } from '/lib/models/email.ts';
-
-export class EmailModel {
-  static async createMethod(
-    id: string,
-    name: string,
-    user: User,
-  ): Promise<MultiFactorAuthSetup> {
-    const method: MultiFactorAuthMethod = {
-      type: 'email',
-      id,
-      name,
-      enabled: false,
-      created_at: new Date(),
-      metadata: {},
-    };
-
-    await this.createAndSendCode(id, user);
-
-    return {
-      method,
-    };
-  }
-
-  static async createAndSendCode(
-    id: string,
-    user: User,
-  ): Promise<void> {
-    const code = await VerificationCodeModel.create(user, `${user.email}-${id}`, 'email');
-
-    await EmailTransportModel.sendLoginVerificationEmail(user.email, code);
-  }
-
-  static async verifyCode(
-    methodId: string,
-    code: string,
-    user: User,
-  ): Promise<boolean> {
-    try {
-      await VerificationCodeModel.validate(user, `${user.email}-${methodId}`, code, 'email');
-
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}
--- a/lib/models/multi-factor-auth/totp.ts
+++ b/lib/models/multi-factor-auth/totp.ts
@ -1,10 +1,11 @@
 import { Secret, TOTP } from 'otpauth';
-import { qrcode } from '@libs/qrcode';
-import { decodeBase64, encodeBase32, encodeBase64 } from '@std/encoding';
+import QRCode from 'qrcode';
+import { encodeBase32 } from 'std/encoding/base32.ts';
+import { decodeBase64, encodeBase64 } from 'std/encoding/base64.ts';

 import { MultiFactorAuthMethod } from '/lib/types.ts';
 import { MFA_KEY, MFA_SALT } from '/lib/auth.ts';
-import { generateHash } from '/public/ts/utils/misc.ts';
+import { generateHash } from '/lib/utils/misc.ts';
 import { MultiFactorAuthSetup } from '/lib/models/multi-factor-auth.ts';

 export class TOTPModel {
@ -132,8 +133,7 @@ export class TOTPModel {
  private static async generateQRCodeDataURL(secret: string, issuer: string, accountName: string): Promise<string> {
    const totp = this.createTOTP(secret, issuer, accountName);
    const uri = totp.toString();
-    const svgString = await qrcode(uri, { output: 'svg', border: 0 });
-    return `data:image/svg+xml;base64,${encodeBase64(svgString)}`;
+    return await QRCode.toDataURL(uri);
  }

  private static verifyTOTPToken(secret: string, token: string, window = 1): boolean {
--- a/lib/models/news.ts
+++ b/lib/models/news.ts
@ -1,4 +1,4 @@
-import { Feed } from '@mikaelporttila/rss';
+import { Feed } from 'https://deno.land/x/rss@1.0.0/mod.ts';

 import Database, { sql } from '/lib/interfaces/database.ts';
 import Locker from '/lib/interfaces/locker.ts';
@ -132,15 +132,9 @@ export class FeedModel {
          continue;
        }

-        let url = (feedArticle as JsonFeedArticle).url || getArticleUrl((feedArticle as FeedArticle).links) ||
+        const url = (feedArticle as JsonFeedArticle).url || getArticleUrl((feedArticle as FeedArticle).links) ||
          feedArticle.id;

-        // Fix relative URLs in the feeds
-        if (url!.startsWith('/')) {
-          const feedUrl = new URL(newsFeed.feed_url);
-          url = `${feedUrl.origin}${url}`;
-        }
-
        const articleIsoDate = (feedArticle as JsonFeedArticle).date_published ||
          (feedArticle as FeedArticle).published?.toISOString() || (feedArticle as JsonFeedArticle).date_modified ||
          (feedArticle as FeedArticle).updated?.toISOString();
@ -214,17 +208,6 @@ export class ArticleModel {
    return articles;
  }

-  static async listUnread(userId: string) {
-    const articles = await db.query<NewsFeedArticle>(
-      sql`SELECT * FROM "bewcloud_news_feed_articles" WHERE "user_id" = $1 AND "is_read" = FALSE ORDER BY "article_date" DESC`,
-      [
-        userId,
-      ],
-    );
-
-    return articles;
-  }
-
  static async listByFeedId(feedId: string) {
    const articles = await db.query<NewsFeedArticle>(
      sql`SELECT * FROM "bewcloud_news_feed_articles" WHERE "feed_id" = $1 ORDER BY "article_date" DESC`,
--- a/lib/models/oidc.ts
+++ b/lib/models/oidc.ts
@ -1,10 +1,10 @@
-import { decodeBase64Url } from '@std/encoding';
+import { decodeBase64Url } from 'std/encoding/base64url.ts';
 import * as openIdClient from 'openid-client';
-import '@std/dotenv/load';
+import 'std/dotenv/load.ts';

 import { createSessionResponse, dataToText } from '/lib/auth.ts';
 import { UserModel } from '/lib/models/user.ts';
-import { generateRandomCode } from '/public/ts/utils/misc.ts';
+import { generateRandomCode } from '/lib/utils/misc.ts';
 import { AppConfig } from '/lib/config.ts';
 import SimpleCache from '/lib/interfaces/simple-cache.ts';

@ -21,15 +21,15 @@ interface OidcJwtIdToken extends Record<string, string | undefined> {
  sub?: string;
 }

-const redirectUrlPath = '/oidc/callback';
-
 export class OidcModel {
  static async getSignInUrl(
    {
      requestPermissions,
+      redirectUrlPath = '/oidc/callback',
      extraState = {},
    }: {
      requestPermissions: string[];
+      redirectUrlPath?: string;
      extraState?: OidcExtraState;
    },
  ): Promise<string> {
@ -137,7 +137,6 @@ export class OidcModel {

    const config = await AppConfig.getConfig();

-    const baseUrl = config.auth.baseUrl;
    const oidcBaseUrl = config.auth.singleSignOnUrl;
    const emailAttribute = config.auth.singleSignOnEmailAttribute;
    const oidcOptions = oidcBaseUrl.startsWith('http://')
@ -154,7 +153,7 @@ export class OidcModel {

    const tokens = await openIdClient.authorizationCodeGrant(
      oidcConfig,
-      new URL(`${baseUrl}${redirectUrlPath}?${urlSearchParams.toString()}`),
+      new URL(request.url),
      {
        pkceCodeVerifier: expectedCodeVerifier,
        expectedState,
@ -169,7 +168,7 @@ export class OidcModel {
      throw new Error(`Missing user/${emailAttribute}`);
    }

-    const isSignupAllowed = await AppConfig.isSignupAllowed({ viaSingleSignOn: true });
+    const isSignupAllowed = await AppConfig.isSignupAllowed();
    const isThereAnAdmin = await UserModel.isThereAnAdmin();

    // Confirm the user exists (or signup if allowed)
@ -181,16 +180,10 @@ export class OidcModel {
    }

    if (!user) {
-      if (!config.auth.allowSignupsViaSingleSignOn) {
-        throw new Error('Sign up via SSO is not allowed!');
-      }
-
      throw new Error('There was a problem signing up or logging in!');
    }

-    const firstEnabledApp = config.core.enabledApps[0];
-
-    let urlToRedirectTo = `/${firstEnabledApp}`;
+    let urlToRedirectTo = '/dashboard';

    if (urlSearchParams.has('state')) {
      const state = this.parseState(urlSearchParams.get('state')!);
--- a/lib/models/user.ts
+++ b/lib/models/user.ts
@ -1,6 +1,6 @@
 import Database, { sql } from '/lib/interfaces/database.ts';
 import { User, UserSession, VerificationCode } from '/lib/types.ts';
-import { generateRandomCode } from '/public/ts/utils/misc.ts';
+import { generateRandomCode } from '/lib/utils/misc.ts';
 import { AppConfig } from '/lib/config.ts';

 const db = new Database();
--- a/lib/page.ts
+++ b/lib/page.ts
@ -1,69 +0,0 @@
-import { User, UserSession } from './types.ts';
-import { JwtData } from './auth.ts';
-
-export type RequestHandlerParams = {
-  request: Request;
-  match: URLPatternResult;
-  user?: User | null;
-  session?: { userSession?: UserSession; tokenData?: JwtData['data'] } | null;
-  isRunningLocally: boolean;
-};
-export type RequestHandler<T = Response> = (params: RequestHandlerParams) => T | Promise<T>;
-
-export interface Page {
-  get?: RequestHandler;
-  post?: RequestHandler;
-  put?: RequestHandler;
-  patch?: RequestHandler;
-  delete?: RequestHandler;
-  options?: RequestHandler;
-  catchAll?: RequestHandler;
-}
-
-type AccessMode = 'public' | 'user';
-interface PermissionsParams {
-  accessMode: AccessMode;
-}
-
-type Params = Page & PermissionsParams;
-
-function permissioned(handler: RequestHandler, accessMode: AccessMode) {
-  return ({ request, match, user, session, isRunningLocally }: RequestHandlerParams) => {
-    if (accessMode !== 'public') {
-      if (!user) {
-        const url = new URL(request.url);
-        const redirectTo = encodeURIComponent(`${url.pathname}${url.search}`);
-        return new Response('Redirect', { status: 302, headers: { 'Location': `/login?redirectTo=${redirectTo}` } });
-      }
-    }
-
-    if (!handler) {
-      return new Response('Not Implemented', { status: 501 });
-    }
-
-    return handler({ request, match, user, session, isRunningLocally });
-  };
-}
-
-export default function page(
-  {
-    get,
-    post,
-    put,
-    patch,
-    delete: deleteAction,
-    options,
-    catchAll,
-    accessMode,
-  }: Params,
-): Page {
-  return {
-    get: get ? permissioned(get, accessMode) : undefined,
-    post: post ? permissioned(post, accessMode) : undefined,
-    put: put ? permissioned(put, accessMode) : undefined,
-    patch: patch ? permissioned(patch, accessMode) : undefined,
-    delete: deleteAction ? permissioned(deleteAction, accessMode) : undefined,
-    options: options ? permissioned(options, accessMode) : undefined,
-    catchAll: catchAll ? permissioned(catchAll, accessMode) : undefined,
-  };
-}
--- a/lib/providers/brevo.ts
+++ b/lib/providers/brevo.ts
@ -0,0 +1,86 @@
+import 'std/dotenv/load.ts';
+
+import { AppConfig } from '/lib/config.ts';
+
+const BREVO_API_KEY = Deno.env.get('BREVO_API_KEY') || '';
+
+enum BrevoTemplateId {
+  BEWCLOUD_VERIFY_EMAIL = 20, // NOTE: This will likely be different in your own Brevo account
+}
+
+interface BrevoResponse {
+  messageId?: string;
+  code?: string;
+  message?: string;
+}
+
+function getApiRequestHeaders() {
+  return {
+    'Api-Key': BREVO_API_KEY,
+    'Accept': 'application/json; charset=utf-8',
+    'Content-Type': 'application/json; charset=utf-8',
+  };
+}
+
+interface BrevoRequestBody {
+  templateId?: number;
+  params: Record<string, any> | null;
+  to: { email: string; name?: string }[];
+  cc?: { email: string; name?: string }[];
+  bcc?: { email: string; name?: string }[];
+  htmlContent?: string;
+  textContent?: string;
+  subject?: string;
+  replyTo: { email: string; name?: string };
+  tags?: string[];
+  attachment?: { name: string; content: string; url: string }[];
+}
+
+async function sendEmailWithTemplate(
+  to: string,
+  templateId: BrevoTemplateId,
+  data: BrevoRequestBody['params'],
+  attachments: BrevoRequestBody['attachment'] = [],
+  cc?: string,
+) {
+  const config = await AppConfig.getConfig();
+  const helpEmail = config.visuals.helpEmail;
+
+  const email: BrevoRequestBody = {
+    templateId,
+    params: data,
+    to: [{ email: to }],
+    replyTo: { email: helpEmail },
+  };
+
+  if (attachments?.length) {
+    email.attachment = attachments;
+  }
+
+  if (cc) {
+    email.cc = [{ email: cc }];
+  }
+
+  const brevoResponse = await fetch('https://api.brevo.com/v3/smtp/email', {
+    method: 'POST',
+    headers: getApiRequestHeaders(),
+    body: JSON.stringify(email),
+  });
+  const brevoResult = (await brevoResponse.json()) as BrevoResponse;
+
+  if (brevoResult.code || brevoResult.message) {
+    console.log(JSON.stringify({ brevoResult }, null, 2));
+    throw new Error(`Failed to send email "${templateId}"`);
+  }
+}
+
+export async function sendVerifyEmailEmail(
+  email: string,
+  verificationCode: string,
+) {
+  const data = {
+    verificationCode,
+  };
+
+  await sendEmailWithTemplate(email, BrevoTemplateId.BEWCLOUD_VERIFY_EMAIL, data);
+}
--- a/lib/types.ts
+++ b/lib/types.ts
@ -14,11 +14,6 @@ export interface User {
    dav_hashed_password?: string;
    expenses_currency?: SupportedCurrencySymbol;
    multi_factor_auth_methods?: MultiFactorAuthMethod[];
-    hidden_calendar_ids?: string[];
-    timezone?: {
-      id: string;
-      utcOffset: number;
-    };
  };
  created_at: Date;
 }
@ -31,6 +26,11 @@ export interface UserSession {
  created_at: Date;
 }

+export interface FreshContextState {
+  user?: User;
+  session?: UserSession;
+}
+
 export interface VerificationCode {
  id: string;
  user_id: string;
@ -93,7 +93,6 @@ export interface Directory {
  directory_name: string;
  has_write_access: boolean;
  size_in_bytes: number;
-  file_share_id: string | null;
  updated_at: Date;
  created_at: Date;
 }
@ -104,7 +103,6 @@ export interface DirectoryFile {
  file_name: string;
  has_write_access: boolean;
  size_in_bytes: number;
-  file_share_id: string | null;
  updated_at: Date;
  created_at: Date;
 }
@ -135,23 +133,31 @@ export interface Expense {
 }

 export type SupportedCurrencySymbol = '$' | '€' | '£' | '¥' | '₹';
-export type SupportedCurrency = 'USD' | 'EUR' | 'GBP' | 'JPY' | 'INR';
+type SupportedCurrency = 'USD' | 'EUR' | 'GBP' | 'JPY' | 'INR';
+
+export const currencyMap = new Map<SupportedCurrencySymbol, SupportedCurrency>([
+  ['$', 'USD'],
+  ['€', 'EUR'],
+  ['£', 'GBP'],
+  ['¥', 'JPY'],
+  ['₹', 'INR'],
+]);

 export type PartialDeep<T> = (T extends (infer U)[] ? PartialDeep<U>[] : { [P in keyof T]?: PartialDeep<T[P]> }) | T;

-export type OptionalApp = 'dashboard' | 'files' | 'news' | 'notes' | 'photos' | 'expenses' | 'contacts' | 'calendar';
+export type OptionalApp = 'news' | 'notes' | 'photos' | 'expenses';

 export interface Config {
  auth: {
-    /** The base URL of the application you use to access the app, i.e. "http://localhost:8000" or "https://cloud.example.com" (note authentication won't work without https:// except for localhost; SSO redirect, if enabled, will be this + /oidc/callback, so "https://cloud.example.com/oidc/callback") */
+    /** The base URL of the application you use to access the app, i.e. "http://localhost:8000" or "https://cloud.example.com" */
    baseUrl: string;
    /** If true, anyone can sign up for an account. Note that it's always possible to sign up for the first user, and they will be an admin */
    allowSignups: boolean;
-    /** If true, email verification will be required for signups (using SMTP settings below) */
+    /** If true, email verification will be required for signups (using Brevo) */
    enableEmailVerification: boolean;
    /** If true, all signups become active for 100 years */
    enableForeverSignup: boolean;
-    /** If true, users can enable multi-factor authentication (TOTP, Passkeys, or Email if the SMTP settings below are set) */
+    /** If true, users can enable multi-factor authentication (TOTP or Passkeys) */
    enableMultiFactor: boolean;
    /** Can be set to allow more than the baseUrl's domain for session cookies */
    allowedCookieDomains: string[];
@ -159,8 +165,6 @@ export interface Config {
    skipCookieDomainSecurity: boolean;
    /** If true, single sign-on will be enabled */
    enableSingleSignOn: boolean;
-    /** If true, signups via single sign-on will be allowed, overriding allowSignups */
-    allowSignupsViaSingleSignOn: boolean;
    /** The Discovery URL (AKA Issuer) of the identity/single sign-on provider */
    singleSignOnUrl: string;
    /** The attribute to prefer as email of the identity/single sign-on provider */
@ -171,18 +175,10 @@ export interface Config {
  files: {
    /** The root-relative root path for files, i.e. "data-files" */
    rootPath: string;
-    /** If true, public file sharing will be allowed (still requires a user to enable sharing for a given file or directory) */
-    allowPublicSharing: boolean;
-    /** If true, directories can be downloaded as zip files */
-    allowDirectoryDownloads: boolean;
-    /** The maximum upload size in megabytes. Overrides the core.maxRequestSizeInMegabytes setting on /dav and /api/files/upload endpoints. */
-    maxUploadSizeInMegabytes: number;
  };
  core: {
-    /** The apps to show, in order of appearance in the header. The first app will be the default one shown after logging in. At least one is required. */
+    /** dashboard and files cannot be disabled */
    enabledApps: OptionalApp[];
-    /** The maximum request size in megabytes. */
-    maxRequestSizeInMegabytes: number;
  };
  visuals: {
    /** An override title of the application. Empty shows the default title. */
@ -192,33 +188,9 @@ export interface Config {
    /** The email address to contact for help. Empty will disable/hide the "need help" sections. */
    helpEmail: string;
  };
-  email: {
-    /** The email address to send emails from */
-    from: string;
-    /** The SMTP host to send emails from */
-    host: string;
-    /** The SMTP port to send emails from */
-    port: number;
-    /** "auto" means "immediate" on port 465, "starttls" otherwise. */
-    tlsMode: 'auto' | 'immediate' | 'starttls' | 'none';
-    /** Whether to verify the TLS certificate. If a string is used the hostname will be verified using that name. */
-    tlsVerify: boolean | string;
-  };
-  contacts: {
-    /** If true, the CardDAV server will be enabled (proxied) */
-    enableCardDavServer: boolean;
-    /** The CardDAV server URL to proxy to */
-    cardDavUrl: string;
-  };
-  calendar: {
-    /** If true, the CalDAV server will be enabled (proxied) */
-    enableCalDavServer: boolean;
-    /** The CalDAV server URL to proxy to */
-    calDavUrl: string;
-  };
 }

-export type MultiFactorAuthMethodType = 'totp' | 'passkey' | 'email';
+export type MultiFactorAuthMethodType = 'totp' | 'passkey';

 export interface MultiFactorAuthMethod {
  type: MultiFactorAuthMethodType;
@ -241,13 +213,3 @@ export interface MultiFactorAuthMethod {
    };
  };
 }
-
-export interface FileShare {
-  id: string;
-  user_id: string;
-  file_path: string;
-  extra: {
-    hashed_password?: string;
-  };
-  created_at: Date;
-}
--- a/public/ts/utils/files.ts
+++ b/public/ts/utils/files.ts
@ -17,30 +17,15 @@ export function humanFileSize(bytes: number) {
    ++unitIndex;
  } while (Math.round(Math.abs(bytes) * roundedPower) / roundedPower >= 1024 && unitIndex < units.length - 1);

-  if (bytes.toFixed(2).split('.')[1] === '00') {
-    return `${bytes.toFixed(0)} ${units[unitIndex]}`;
-  }
-
  return `${bytes.toFixed(2)} ${units[unitIndex]}`;
 }

-export function bytesFromHumanFileSize(humanFileSize: string) {
-  const [numberString, unit] = humanFileSize.split(' ');
-  const number = Number.parseFloat(numberString);
-
-  return number *
-    (unit === 'B' ? 1 : 1024 ** (['KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'].indexOf(unit) + 1));
-}
-
 export function sortEntriesByName(entryA: Deno.DirEntry, entryB: Deno.DirEntry) {
-  const nameA = entryA.name.toLocaleLowerCase();
-  const nameB = entryB.name.toLocaleLowerCase();
-
-  if (nameA > nameB) {
+  if (entryA.name > entryB.name) {
    return 1;
  }

-  if (nameA < nameB) {
+  if (entryA.name < entryB.name) {
    return -1;
  }

@ -48,14 +33,11 @@ export function sortEntriesByName(entryA: Deno.DirEntry, entryB: Deno.DirEntry)
 }

 export function sortDirectoriesByName(directoryA: Directory, directoryB: Directory) {
-  const nameA = directoryA.directory_name.toLocaleLowerCase();
-  const nameB = directoryB.directory_name.toLocaleLowerCase();
-
-  if (nameA > nameB) {
+  if (directoryA.directory_name > directoryB.directory_name) {
    return 1;
  }

-  if (nameA < nameB) {
+  if (directoryA.directory_name < directoryB.directory_name) {
    return -1;
  }

@ -63,14 +45,11 @@ export function sortDirectoriesByName(directoryA: Directory, directoryB: Directo
 }

 export function sortFilesByName(fileA: DirectoryFile, fileB: DirectoryFile) {
-  const nameA = fileA.file_name.toLocaleLowerCase();
-  const nameB = fileB.file_name.toLocaleLowerCase();
-
-  if (nameA > nameB) {
+  if (fileA.file_name > fileB.file_name) {
    return 1;
  }

-  if (nameA < nameB) {
+  if (fileA.file_name < fileB.file_name) {
    return -1;
  }

--- a/lib/utils/files_test.ts
+++ b/lib/utils/files_test.ts
@ -0,0 +1,36 @@
+import { assertEquals } from 'std/assert/assert_equals.ts';
+import { humanFileSize } from './files.ts';
+
+Deno.test('that humanFileSize works', () => {
+  const tests: { input: number; expected: string }[] = [
+    {
+      input: 1000,
+      expected: '1000 B',
+    },
+    {
+      input: 1024,
+      expected: '1.00 KB',
+    },
+    {
+      input: 10000,
+      expected: '9.77 KB',
+    },
+    {
+      input: 1,
+      expected: '1 B',
+    },
+    {
+      input: 1048576,
+      expected: '1.00 MB',
+    },
+    {
+      input: 1073741824,
+      expected: '1.00 GB',
+    },
+  ];
+
+  for (const test of tests) {
+    const output = humanFileSize(test.input);
+    assertEquals(output, test.expected);
+  }
+});
--- a/lib/utils/layout.tsx
+++ b/lib/utils/layout.tsx
@ -1,91 +0,0 @@
-import { renderToString } from 'preact-render-to-string';
-
-import denoConfig from '/deno.json' with { type: 'json' };
-import { RequestHandlerParams } from '/lib/page.ts';
-import { AppConfig } from '/lib/config.ts';
-import { escapeHtml, html } from '/public/ts/utils/misc.ts';
-
-import Header from '/components/Header.tsx';
-
-interface BasicLayoutOptions
-  extends Pick<RequestHandlerParams, 'user' | 'session' | 'request' | 'match' | 'isRunningLocally'> {
-  currentPath: string;
-  titlePrefix: string;
-  description?: string;
-}
-
-async function basicLayout(
-  htmlContent: string,
-  { currentPath, titlePrefix, description, user }: BasicLayoutOptions,
-) {
-  const config = await AppConfig.getConfig();
-
-  const defaultTitle = config.visuals.title || 'bewCloud is a modern and simpler alternative to Nextcloud and ownCloud';
-  const defaultDescription = config.visuals.description || `Have your files under your own control.`;
-  const enabledApps = config.core.enabledApps;
-
-  let title = defaultTitle;
-
-  if (titlePrefix) {
-    title = `${titlePrefix} - bewCloud`;
-  }
-
-  const headerReactNode = <Header route={currentPath} user={user} enabledApps={enabledApps} />;
-
-  const headerHtml = renderToString(headerReactNode);
-
-  return html`
-    <!DOCTYPE html>
-    <html lang="en" dir="ltr" class="h-full bg-slate-800">
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>${escapeHtml(title)}</title>
-        <meta name="description" content="${escapeHtml(description || defaultDescription)}">
-        <meta name="author" content="Bruno Bernardino">
-        <meta property="og:title" content="${escapeHtml(defaultTitle)}" />
-        <link rel="icon" href="/public/images/favicon-dark.png" type="image/png" />
-        <link rel="apple-touch-icon" href="/public/images/favicon-dark.png" />
-        <link rel="manifest" href="/public/manifest.json" />
-        <link rel="stylesheet" href="/public/scss/style.scss" />
-        <link rel="stylesheet" href="/public/css/tailwind.css" />
-      </head>
-
-      <script type="importmap">
-      ${JSON.stringify(importMap)}
-      </script>
-
-      <body class="h-full">
-        ${headerHtml} ${htmlContent}
-      </body>
-    </html>
-  `;
-}
-
-const importMap = denoConfig.frontendImports.reduce(
-  (importsObject: { imports: Record<string, string> }, importName: string) => {
-    const url = new URL(denoConfig.imports[importName as keyof typeof denoConfig.imports]).toString();
-    let fileName = url.replace('https://esm.sh/', '').split('?')[0].trim();
-    if (!fileName.endsWith('.mjs')) {
-      fileName = `${fileName}.mjs`;
-    }
-    importsObject.imports[importName] = `/public/js/${fileName}`;
-    return importsObject;
-  },
-  { imports: {} },
-);
-
-export async function basicLayoutResponse(htmlContent: string, options: BasicLayoutOptions) {
-  const headers: HeadersInit = {
-    'content-type': 'text/html; charset=utf-8',
-    'content-security-policy':
-      `default-src 'self'; child-src 'none'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'`,
-    'x-frame-options': 'DENY',
-    'x-content-type-options': 'nosniff',
-    'strict-transport-security': 'max-age=31536000; includeSubDomains; preload',
-  };
-
-  return new Response(await basicLayout(htmlContent, options), {
-    headers,
-  });
-}
--- a/lib/utils/misc.ts
+++ b/lib/utils/misc.ts
@ -1,64 +1,270 @@
-import { serveFile } from '@std/http/file-server';
-import { transpile } from 'deno/emit';
-import sass from 'sass';
+import { currencyMap } from '/lib/types.ts';
+import { SupportedCurrencySymbol } from '/lib/types.ts';

-async function transpileTs(content: string, specifier: URL) {
-  const urlStr = specifier.toString();
-  const result = await transpile(specifier, {
-    load(specifier: string) {
-      if (specifier !== urlStr) {
-        return Promise.resolve({ kind: 'module', specifier, content: '' });
+export function isRunningLocally(request: Request): boolean {
+  try {
+    const url = new URL(request.url);
+    const hostname = url.hostname;
+
+    // Local hostnames check
+    if (['localhost', '127.0.0.1', '0.0.0.0'].includes(hostname)) {
+      return true;
+    }
+
+    // Private IP ranges check
+    const ipParts = hostname.split('.').map(Number);
+
+    // Check if the IP address is valid
+    if (ipParts.length !== 4 || ipParts.some((part) => isNaN(part) || part < 0 || part > 255)) {
+      return false;
+    }
+
+    // 10.0.0.0 - 10.255.255.255
+    if (ipParts[0] === 10) {
+      return true;
+    }
+
+    // 172.16.0.0 - 172.31.255.255
+    if (ipParts[0] === 172 && ipParts[1] >= 16 && ipParts[1] <= 31) {
+      return true;
+    }
+
+    // 192.168.0.0 - 192.168.255.255
+    if (ipParts[0] === 192 && ipParts[1] === 168) {
+      return true;
+    }
+
+    return false;
+  } catch (error) {
+    console.info('Failed to check if the request is running locally', error);
+    return false;
+  }
+}
+
+export function escapeHtml(unsafe: string) {
+  return unsafe.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;')
+    .replaceAll("'", '&#039;');
+}
+
+export function escapeXml(unsafe: string) {
+  return escapeHtml(unsafe).replaceAll('\r', '&#13;');
+}
+
+export function generateRandomCode(length = 6) {
+  const getRandomDigit = () => Math.floor(Math.random() * (10)); // 0-9
+
+  const codeDigits = Array.from({ length }).map(getRandomDigit);
+
+  return codeDigits.join('');
+}
+
+/** This generates a random string, including unicode characters. */
+export function generateRandomString(length = 10) {
+  const array = new Uint8Array(length * 2);
+  crypto.getRandomValues(array);
+
+  return Array.from(array)
+    .map((byte) => String.fromCharCode(byte))
+    .join('')
+    .slice(0, length);
+}
+
+export async function generateHash(value: string, algorithm: AlgorithmIdentifier) {
+  const hashedValueData = await crypto.subtle.digest(
+    algorithm,
+    new TextEncoder().encode(value),
+  );
+
+  const hashedValue = Array.from(new Uint8Array(hashedValueData)).map(
+    (byte) => byte.toString(16).padStart(2, '0'),
+  ).join('');
+
+  return hashedValue;
+}
+
+export function splitArrayInChunks<T = any>(array: T[], chunkLength: number) {
+  const chunks = [];
+  let chunkIndex = 0;
+  const arrayLength = array.length;
+
+  while (chunkIndex < arrayLength) {
+    chunks.push(array.slice(chunkIndex, chunkIndex += chunkLength));
+  }
+
+  return chunks;
+}
+
+export function validateEmail(email: string) {
+  const trimmedEmail = (email || '').trim().toLocaleLowerCase();
+  if (!trimmedEmail) {
+    return false;
+  }
+
+  const requiredCharsNotInEdges = ['@', '.'];
+  return requiredCharsNotInEdges.every((char) =>
+    trimmedEmail.includes(char) && !trimmedEmail.startsWith(char) && !trimmedEmail.endsWith(char)
+  );
+}
+
+export function validateUrl(url: string) {
+  const trimmedUrl = (url || '').trim().toLocaleLowerCase();
+  if (!trimmedUrl) {
+    return false;
+  }
+
+  if (!trimmedUrl.includes('://')) {
+    return false;
+  }
+
+  const protocolIndex = trimmedUrl.indexOf('://');
+  const urlAfterProtocol = trimmedUrl.substring(protocolIndex + 3);
+
+  if (!urlAfterProtocol) {
+    return false;
+  }
+
+  return true;
+}
+
+// Adapted from https://gist.github.com/fasiha/7f20043a12ce93401d8473aee037d90a
+export async function concurrentPromises<T>(
+  generators: (() => Promise<T>)[],
+  maxConcurrency: number,
+): Promise<T[]> {
+  const iterator = generators.entries();
+
+  const results: T[] = [];
+
+  let hasFailed = false;
+
+  await Promise.all(
+    Array.from(Array(maxConcurrency), async () => {
+      for (const [index, promiseToExecute] of iterator) {
+        if (hasFailed) {
+          break;
+        }
+        try {
+          results[index] = await promiseToExecute();
+        } catch (error) {
+          hasFailed = true;
+          throw error;
+        }
      }
-      return Promise.resolve({ kind: 'module', specifier, content });
+    }),
+  );
+
+  return results;
+}
+
+const MAX_RESPONSE_TIME_IN_MS = 10_000;
+
+export async function fetchUrl(url: string) {
+  const abortController = new AbortController();
+  const requestCancelTimeout = setTimeout(() => {
+    abortController.abort();
+  }, MAX_RESPONSE_TIME_IN_MS);
+
+  const response = await fetch(url, {
+    signal: abortController.signal,
+  });
+
+  if (requestCancelTimeout) {
+    clearTimeout(requestCancelTimeout);
+  }
+
+  const urlContents = await response.text();
+  return urlContents;
+}
+
+export async function fetchUrlAsGooglebot(url: string) {
+  const abortController = new AbortController();
+  const requestCancelTimeout = setTimeout(() => {
+    abortController.abort();
+  }, MAX_RESPONSE_TIME_IN_MS);
+
+  const response = await fetch(url, {
+    headers: {
+      'User-Agent': 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)',
    },
+    signal: abortController.signal,
  });
-  return result.get(urlStr) || '';
-}

-export async function serveFileWithTs(request: Request, filePath: string, extraHeaders?: ResponseInit['headers']) {
-  const response = await serveFile(request, filePath);
-
-  if (response.status !== 200) {
-    return response;
+  if (requestCancelTimeout) {
+    clearTimeout(requestCancelTimeout);
  }

-  const tsCode = await response.text();
-  const jsCode = await transpileTs(tsCode, new URL('file:///src.ts'));
-  const { headers } = response;
-  headers.set('content-type', 'application/javascript; charset=utf-8');
-  headers.delete('content-length');
+  const urlContents = await response.text();
+  return urlContents;
+}

-  return new Response(jsCode, {
-    status: response.status,
-    statusText: response.statusText,
-    headers,
-    ...(extraHeaders || {}),
+export async function fetchUrlWithProxy(url: string) {
+  const abortController = new AbortController();
+  const requestCancelTimeout = setTimeout(() => {
+    abortController.abort();
+  }, MAX_RESPONSE_TIME_IN_MS);
+
+  const response = await fetch(`https://api.allorigins.win/raw?url=${url}`, {
+    signal: abortController.signal,
  });
-}

-function transpileSass(content: string) {
-  const compiler = sass(content);
-
-  return compiler.to_string('compressed') as string;
-}
-
-export async function serveFileWithSass(request: Request, filePath: string, extraHeaders?: ResponseInit['headers']) {
-  const response = await serveFile(request, filePath);
-
-  if (response.status !== 200) {
-    return response;
+  if (requestCancelTimeout) {
+    clearTimeout(requestCancelTimeout);
  }

-  const sassCode = await response.text();
-  const cssCode = transpileSass(sassCode);
-  const { headers } = response;
-  headers.set('content-type', 'text/css; charset=utf-8');
-  headers.delete('content-length');
-
-  return new Response(cssCode, {
-    status: response.status,
-    statusText: response.statusText,
-    headers,
-    ...(extraHeaders || {}),
-  });
+  const urlContents = await response.text();
+  return urlContents;
+}
+
+export async function fetchUrlWithRetries(url: string) {
+  try {
+    const text = await fetchUrl(url);
+    return text;
+  } catch (_error) {
+    try {
+      const text = await fetchUrlAsGooglebot(url);
+      return text;
+    } catch (_error) {
+      const text = await fetchUrlWithProxy(url);
+      return text;
+    }
+  }
+}
+
+export function convertFormDataToObject(formData: FormData): Record<string, any> {
+  return JSON.parse(JSON.stringify(Object.fromEntries(formData)));
+}
+
+export function convertObjectToFormData(formDataObject: Record<string, any>): FormData {
+  const formData = new FormData();
+
+  for (const key of Object.keys(formDataObject || {})) {
+    if (Array.isArray(formDataObject[key])) {
+      formData.append(key, formDataObject[key].join(','));
+    } else {
+      formData.append(key, formDataObject[key]);
+    }
+  }
+
+  return formData;
+}
+
+export const capitalizeWord = (string: string) => {
+  return `${string.charAt(0).toLocaleUpperCase()}${string.slice(1)}`;
+};
+
+export function getRandomItem<T>(items: Readonly<Array<T>>): T {
+  return items[Math.floor(Math.random() * items.length)];
+}
+
+export function formatNumber(currency: SupportedCurrencySymbol, number: number) {
+  return new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: currencyMap.get(currency) || 'USD',
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+  }).format(Number.parseFloat(`${number}`.replace(',', '.')));
+}
+
+export function formatInputToNumber(numberInput: number | string): number {
+  return Number.parseFloat(`${numberInput}`.replace(',', '.'));
 }
--- a/public/ts/utils/misc_test.ts
+++ b/public/ts/utils/misc_test.ts
@ -1,4 +1,4 @@
-import { assertEquals } from '@std/assert';
+import { assertEquals } from 'std/assert/assert_equals.ts';

 import { SupportedCurrencySymbol } from '/lib/types.ts';
 import {
--- a/public/ts/utils/multi-factor-auth.ts
+++ b/public/ts/utils/multi-factor-auth.ts
@ -2,7 +2,7 @@

 import { MultiFactorAuthMethod, User } from '/lib/types.ts';

-function getMultiFactorAuthMethodsFromUser(
+export function getMultiFactorAuthMethodsFromUser(
  user: { extra: Pick<User['extra'], 'multi_factor_auth_methods'> },
 ): MultiFactorAuthMethod[] {
  return user.extra.multi_factor_auth_methods || [];
--- a/Show more
+++ b/Show more
 @ -1 +1 @@
 .6.10
 .3.3