updated dockerfile

export cli
fix(mobile): run user sync operation with lock (#4984 )
2025-12-18 02:19:18 -08:00 · 2023-11-12 18:03:08 -05:00 · 2023-11-12 18:01:12 -05:00 · 2023-11-12 10:35:08 -06:00 · 2023-11-12 17:07:55 +01:00 · 2023-11-12 15:15:44 +00:00
371 changed files with 9592 additions and 12823 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -33,91 +33,10 @@ jobs:
          - context: "nginx"
            image: "immich-proxy"
            platforms: "linux/amd64,linux/arm64"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-        # Workaround to fix error:
-        # failed to push: failed to copy: io: read/write on closed pipe
-        # See https://github.com/docker/build-push-action/issues/761
-        with:
-          driver-opts: |
-            image=moby/buildkit:v0.10.6
-
-      - name: Login to Docker Hub
-        # Only push to Docker Hub when making a release
-        if: ${{ github.event_name == 'release' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        # Skip when PR from a fork
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Generate docker image tags
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          flavor: |
-            # Disable latest tag
-            latest=false
-          images: |
-            name=ghcr.io/${{ github.repository_owner }}/${{matrix.image}}
-            name=altran1502/${{matrix.image}},enable=${{ github.event_name == 'release' }}
-          tags: |
-            # Tag with branch name
-            type=ref,event=branch
-            # Tag with pr-number
-            type=ref,event=pr
-            # Tag with git tag on release
-            type=ref,event=tag
-            type=raw,value=release,enable=${{ github.event_name == 'release' }}
-
-      - name: Determine build cache output
-        id: cache-target
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            # Essentially just ignore the cache output (PR can't write to registry cache)
-            echo "cache-to=type=local,dest=/tmp/discard,ignore-error=true" >> $GITHUB_OUTPUT
-          else
-            echo "cache-to=type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/immich-build-cache:${{ matrix.image }}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Build and push image
-        uses: docker/build-push-action@v5.0.0
-        with:
-          context: ${{ matrix.context }}
-          platforms: ${{ matrix.platforms }}
-          # Skip pushing when PR from a fork
-          push: ${{ !github.event.pull_request.head.repo.fork }}
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/immich-build-cache:${{matrix.image}}
-          cache-to: ${{ steps.cache-target.outputs.cache-to }}
-          tags: ${{ steps.metadata.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}
-
-  build_and_push_server_arm_64:
-    runs-on: self-hosted
-    strategy:
-      # Prevent a failure in one image from stopping the other builds
-      fail-fast: false
-      matrix:
-        include:
          - context: "server"
            image: "immich-server"
            platforms: "linux/arm64,linux/amd64"
+
    steps:
      - name: Checkout
        uses: actions/checkout@v4
--- a/18
+++ b/18
@@ -1,35 +1,29 @@
 dev:
-	docker-compose -f ./docker/docker-compose.dev.yml up --remove-orphans
-
-dev-new:
 	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans || make dev-down

 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans

-dev-new-update:
+dev-update:
 	docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans

-dev-update:
-	docker-compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
-
 dev-scale:
-	docker-compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
+	docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans

 stage:
-	docker-compose -f ./docker/docker-compose.staging.yml up --build -V --remove-orphans
+	docker compose -f ./docker/docker-compose.staging.yml up --build -V --remove-orphans

 pull-stage:
-	docker-compose -f ./docker/docker-compose.staging.yml pull
+	docker compose -f ./docker/docker-compose.staging.yml pull

 test-e2e:
 	docker compose -f ./docker/docker-compose.test.yml up --renew-anon-volumes --abort-on-container-exit --exit-code-from immich-server --remove-orphans --build

 prod:
-	docker-compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
+	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans

 prod-scale:
-	docker-compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
+	docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans

 api:
 	cd ./server && npm run api:generate
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -1489,21 +1489,21 @@
      }
    },
    "node_modules/@types/byte-size": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@types/byte-size/-/byte-size-8.1.0.tgz",
-      "integrity": "sha512-LCIlZh8vyx+I2fgRycE1D34c33QDppYY6quBYYoaOpQ1nGhJ/avSP2VlrAefVotjJxgSk6WkKo0rTcCJwGG7vA==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@types/byte-size/-/byte-size-8.1.2.tgz",
+      "integrity": "sha512-jGyVzYu6avI8yuqQCNTZd65tzI8HZrLjKX9sdMqZrGWVlNChu0rf6p368oVEDCYJe5BMx2Ov04tD1wqtgTwGSA==",
      "dev": true
    },
    "node_modules/@types/chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==",
      "dev": true
    },
    "node_modules/@types/cli-progress": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.3.tgz",
-      "integrity": "sha512-/+C9xAdVtc+g5yHHkGBThgAA8rYpi5B+2ve3wLtybYj0JHEBs57ivR4x/zGfSsplRnV+psE91Nfin1soNKqz5Q==",
+      "version": "3.11.5",
+      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz",
+      "integrity": "sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==",
      "dev": true,
      "dependencies": {
        "@types/node": "*"
@@ -1543,9 +1543,9 @@
      }
    },
    "node_modules/@types/jest": {
-      "version": "29.5.5",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.5.tgz",
-      "integrity": "sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==",
+      "version": "29.5.8",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.8.tgz",
+      "integrity": "sha512-fXEFTxMV2Co8ZF5aYFJv+YeA08RTYJfhtN5c9JSv/mFEMe+xxjufCb+PHL+bJcMs/ebPUsBu+UNTEz+ydXrR6g==",
      "dev": true,
      "dependencies": {
        "expect": "^29.0.0",
@@ -1553,9 +1553,9 @@
      }
    },
    "node_modules/@types/js-yaml": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.6.tgz",
-      "integrity": "sha512-ACTuifTSIIbyksx2HTon3aFtCKWcID7/h3XEmRpDYdMCXxPbl+m9GteOJeaAkiAta/NJaSFuA7ahZ0NkwajDSw==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
+      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
      "dev": true
    },
    "node_modules/@types/json-schema": {
@@ -1565,25 +1565,28 @@
      "dev": true
    },
    "node_modules/@types/mime-types": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.2.tgz",
-      "integrity": "sha512-q9QGHMGCiBJCHEvd4ZLdasdqXv570agPsUW0CeIm/B8DzhxsYMerD0l3IlI+EQ1A2RWHY2mmM9x1YIuuWxisCg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
+      "integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
      "dev": true
    },
    "node_modules/@types/mock-fs": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@types/mock-fs/-/mock-fs-4.13.2.tgz",
-      "integrity": "sha512-mSIMAOjrNTVUFmZgJEigSIm+GlS4hbrk8U5+M8EB45uMrykKdN9TidjjSaOY1yFph2+TD7bsIfB4r+IrMYVyPQ==",
+      "version": "4.13.4",
+      "resolved": "https://registry.npmjs.org/@types/mock-fs/-/mock-fs-4.13.4.tgz",
+      "integrity": "sha512-mXmM0o6lULPI8z3XNnQCpL0BGxPwx1Ul1wXYEPBGl4efShyxW2Rln0JOPEWGyZaYZMM6OVXM/15zUuFMY52ljg==",
      "dev": true,
      "dependencies": {
        "@types/node": "*"
      }
    },
    "node_modules/@types/node": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-      "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-      "dev": true
+      "version": "20.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
+      "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
    },
    "node_modules/@types/normalize-package-data": {
      "version": "2.4.2",
@@ -3867,9 +3870,9 @@
      }
    },
    "node_modules/jest-extended": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.1.tgz",
-      "integrity": "sha512-KM6dwuBUAgy6QONuR19CGubZB9Hkjqvl/d5Yc/FXsdB8+gsGxB2VQ+NEdOrr95J4GMPeLnDoPOKyi6+mKCCnZQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.2.tgz",
+      "integrity": "sha512-FH7aaPgtGYHc9mRjriS0ZEHYM5/W69tLrFTIdzm+yJgeoCmmrSB/luSfMSqWP9O29QWHPEmJ4qmU6EwsZideog==",
      "dev": true,
      "dependencies": {
        "jest-diff": "^29.0.0",
@@ -5862,6 +5865,12 @@
        "node": ">=4.2.0"
      }
    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
    "node_modules/update-browserslist-db": {
      "version": "1.0.13",
      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
@@ -7270,21 +7279,21 @@
      }
    },
    "@types/byte-size": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@types/byte-size/-/byte-size-8.1.0.tgz",
-      "integrity": "sha512-LCIlZh8vyx+I2fgRycE1D34c33QDppYY6quBYYoaOpQ1nGhJ/avSP2VlrAefVotjJxgSk6WkKo0rTcCJwGG7vA==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@types/byte-size/-/byte-size-8.1.2.tgz",
+      "integrity": "sha512-jGyVzYu6avI8yuqQCNTZd65tzI8HZrLjKX9sdMqZrGWVlNChu0rf6p368oVEDCYJe5BMx2Ov04tD1wqtgTwGSA==",
      "dev": true
    },
    "@types/chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==",
      "dev": true
    },
    "@types/cli-progress": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.3.tgz",
-      "integrity": "sha512-/+C9xAdVtc+g5yHHkGBThgAA8rYpi5B+2ve3wLtybYj0JHEBs57ivR4x/zGfSsplRnV+psE91Nfin1soNKqz5Q==",
+      "version": "3.11.5",
+      "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz",
+      "integrity": "sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==",
      "dev": true,
      "requires": {
        "@types/node": "*"
@@ -7324,9 +7333,9 @@
      }
    },
    "@types/jest": {
-      "version": "29.5.5",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.5.tgz",
-      "integrity": "sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==",
+      "version": "29.5.8",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.8.tgz",
+      "integrity": "sha512-fXEFTxMV2Co8ZF5aYFJv+YeA08RTYJfhtN5c9JSv/mFEMe+xxjufCb+PHL+bJcMs/ebPUsBu+UNTEz+ydXrR6g==",
      "dev": true,
      "requires": {
        "expect": "^29.0.0",
@@ -7334,9 +7343,9 @@
      }
    },
    "@types/js-yaml": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.6.tgz",
-      "integrity": "sha512-ACTuifTSIIbyksx2HTon3aFtCKWcID7/h3XEmRpDYdMCXxPbl+m9GteOJeaAkiAta/NJaSFuA7ahZ0NkwajDSw==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
+      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
      "dev": true
    },
    "@types/json-schema": {
@@ -7346,25 +7355,28 @@
      "dev": true
    },
    "@types/mime-types": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.2.tgz",
-      "integrity": "sha512-q9QGHMGCiBJCHEvd4ZLdasdqXv570agPsUW0CeIm/B8DzhxsYMerD0l3IlI+EQ1A2RWHY2mmM9x1YIuuWxisCg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
+      "integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
      "dev": true
    },
    "@types/mock-fs": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@types/mock-fs/-/mock-fs-4.13.2.tgz",
-      "integrity": "sha512-mSIMAOjrNTVUFmZgJEigSIm+GlS4hbrk8U5+M8EB45uMrykKdN9TidjjSaOY1yFph2+TD7bsIfB4r+IrMYVyPQ==",
+      "version": "4.13.4",
+      "resolved": "https://registry.npmjs.org/@types/mock-fs/-/mock-fs-4.13.4.tgz",
+      "integrity": "sha512-mXmM0o6lULPI8z3XNnQCpL0BGxPwx1Ul1wXYEPBGl4efShyxW2Rln0JOPEWGyZaYZMM6OVXM/15zUuFMY52ljg==",
      "dev": true,
      "requires": {
        "@types/node": "*"
      }
    },
    "@types/node": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-      "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-      "dev": true
+      "version": "20.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
+      "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
+      "dev": true,
+      "requires": {
+        "undici-types": "~5.26.4"
+      }
    },
    "@types/normalize-package-data": {
      "version": "2.4.2",
@@ -8969,9 +8981,9 @@
      }
    },
    "jest-extended": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.1.tgz",
-      "integrity": "sha512-KM6dwuBUAgy6QONuR19CGubZB9Hkjqvl/d5Yc/FXsdB8+gsGxB2VQ+NEdOrr95J4GMPeLnDoPOKyi6+mKCCnZQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.2.tgz",
+      "integrity": "sha512-FH7aaPgtGYHc9mRjriS0ZEHYM5/W69tLrFTIdzm+yJgeoCmmrSB/luSfMSqWP9O29QWHPEmJ4qmU6EwsZideog==",
      "dev": true,
      "requires": {
        "jest-diff": "^29.0.0",
@@ -10419,6 +10431,12 @@
      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
      "dev": true
    },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
    "update-browserslist-db": {
      "version": "1.0.13",
      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
--- a/cli/src/api/open-api/api.ts
+++ b/cli/src/api/open-api/api.ts
@@ -209,43 +209,6 @@ export interface AddUsersDto {
     */
    'sharedUserIds': Array<string>;
 }
-/**
- * 
- * @export
- * @interface AdminSignupResponseDto
- */
-export interface AdminSignupResponseDto {
-    /**
-     * 
-     * @type {string}
-     * @memberof AdminSignupResponseDto
-     */
-    'createdAt': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof AdminSignupResponseDto
-     */
-    'email': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof AdminSignupResponseDto
-     */
-    'firstName': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof AdminSignupResponseDto
-     */
-    'id': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof AdminSignupResponseDto
-     */
-    'lastName': string;
-}
 /**
 * 
 * @export
@@ -1378,24 +1341,18 @@ export interface CreateUserDto {
     * @memberof CreateUserDto
     */
    'externalPath'?: string | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateUserDto
-     */
-    'firstName': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateUserDto
-     */
-    'lastName': string;
    /**
     * 
     * @type {boolean}
     * @memberof CreateUserDto
     */
    'memoriesEnabled'?: boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof CreateUserDto
+     */
+    'name': string;
    /**
     * 
     * @type {string}
@@ -2174,12 +2131,6 @@ export interface LoginResponseDto {
     * @memberof LoginResponseDto
     */
    'accessToken': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof LoginResponseDto
-     */
-    'firstName': string;
    /**
     * 
     * @type {boolean}
@@ -2191,7 +2142,7 @@ export interface LoginResponseDto {
     * @type {string}
     * @memberof LoginResponseDto
     */
-    'lastName': string;
+    'name': string;
    /**
     * 
     * @type {string}
@@ -2261,6 +2212,20 @@ export interface MapMarkerResponseDto {
     */
    'lon': number;
 }
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+
+export const MapTheme = {
+    Light: 'light',
+    Dark: 'dark'
+} as const;
+
+export type MapTheme = typeof MapTheme[keyof typeof MapTheme];
+
+
 /**
 * 
 * @export
@@ -2384,6 +2349,97 @@ export interface OAuthConfigResponseDto {
     */
    'url'?: string;
 }
+/**
+ * 
+ * @export
+ * @interface PartnerResponseDto
+ */
+export interface PartnerResponseDto {
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'createdAt': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'deletedAt': string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'email': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'externalPath': string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'id': string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof PartnerResponseDto
+     */
+    'inTimeline'?: boolean;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof PartnerResponseDto
+     */
+    'isAdmin': boolean;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof PartnerResponseDto
+     */
+    'memoriesEnabled'?: boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'name': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'oauthId': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'profileImagePath': string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof PartnerResponseDto
+     */
+    'shouldChangePassword': boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'storageLabel': string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'updatedAt': string;
+}
 /**
 * 
 * @export
@@ -2593,6 +2649,20 @@ export interface QueueStatusDto {
     */
    'isPaused': boolean;
 }
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+
+export const ReactionLevel = {
+    Album: 'album',
+    Asset: 'asset'
+} as const;
+
+export type ReactionLevel = typeof ReactionLevel[keyof typeof ReactionLevel];
+
+
 /**
 * 
 * @export
@@ -2859,12 +2929,6 @@ export interface ServerConfigDto {
     * @memberof ServerConfigDto
     */
    'loginPageMessage': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ServerConfigDto
-     */
-    'mapTileUrl': string;
    /**
     * 
     * @type {string}
@@ -3349,13 +3413,7 @@ export interface SignUpDto {
     * @type {string}
     * @memberof SignUpDto
     */
-    'firstName': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof SignUpDto
-     */
-    'lastName': string;
+    'name': string;
    /**
     * 
     * @type {string}
@@ -3732,6 +3790,12 @@ export interface SystemConfigMachineLearningDto {
 * @interface SystemConfigMapDto
 */
 export interface SystemConfigMapDto {
+    /**
+     * 
+     * @type {string}
+     * @memberof SystemConfigMapDto
+     */
+    'darkStyle': string;
    /**
     * 
     * @type {boolean}
@@ -3743,7 +3807,7 @@ export interface SystemConfigMapDto {
     * @type {string}
     * @memberof SystemConfigMapDto
     */
-    'tileUrl': string;
+    'lightStyle': string;
 }
 /**
 * 
@@ -4229,6 +4293,19 @@ export interface UpdateLibraryDto {
     */
    'name'?: string;
 }
+/**
+ * 
+ * @export
+ * @interface UpdatePartnerDto
+ */
+export interface UpdatePartnerDto {
+    /**
+     * 
+     * @type {boolean}
+     * @memberof UpdatePartnerDto
+     */
+    'inTimeline': boolean;
+}
 /**
 * 
 * @export
@@ -4279,12 +4356,6 @@ export interface UpdateUserDto {
     * @memberof UpdateUserDto
     */
    'externalPath'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof UpdateUserDto
-     */
-    'firstName'?: string;
    /**
     * 
     * @type {string}
@@ -4297,18 +4368,18 @@ export interface UpdateUserDto {
     * @memberof UpdateUserDto
     */
    'isAdmin'?: boolean;
-    /**
-     * 
-     * @type {string}
-     * @memberof UpdateUserDto
-     */
-    'lastName'?: string;
    /**
     * 
     * @type {boolean}
     * @memberof UpdateUserDto
     */
    'memoriesEnabled'?: boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof UpdateUserDto
+     */
+    'name'?: string;
    /**
     * 
     * @type {string}
@@ -4346,12 +4417,6 @@ export interface UsageByUserDto {
     * @memberof UsageByUserDto
     */
    'usage': number;
-    /**
-     * 
-     * @type {string}
-     * @memberof UsageByUserDto
-     */
-    'userFirstName': string;
    /**
     * 
     * @type {string}
@@ -4363,7 +4428,7 @@ export interface UsageByUserDto {
     * @type {string}
     * @memberof UsageByUserDto
     */
-    'userLastName': string;
+    'userName': string;
    /**
     * 
     * @type {number}
@@ -4383,12 +4448,6 @@ export interface UserDto {
     * @memberof UserDto
     */
    'email': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof UserDto
-     */
-    'firstName': string;
    /**
     * 
     * @type {string}
@@ -4400,7 +4459,7 @@ export interface UserDto {
     * @type {string}
     * @memberof UserDto
     */
-    'lastName': string;
+    'name': string;
    /**
     * 
     * @type {string}
@@ -4438,12 +4497,6 @@ export interface UserResponseDto {
     * @memberof UserResponseDto
     */
    'externalPath': string | null;
-    /**
-     * 
-     * @type {string}
-     * @memberof UserResponseDto
-     */
-    'firstName': string;
    /**
     * 
     * @type {string}
@@ -4456,18 +4509,18 @@ export interface UserResponseDto {
     * @memberof UserResponseDto
     */
    'isAdmin': boolean;
-    /**
-     * 
-     * @type {string}
-     * @memberof UserResponseDto
-     */
-    'lastName': string;
    /**
     * 
     * @type {boolean}
     * @memberof UserResponseDto
     */
    'memoriesEnabled'?: boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserResponseDto
+     */
+    'name': string;
    /**
     * 
     * @type {string}
@@ -5088,11 +5141,12 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat
         * @param {string} albumId 
         * @param {string} [assetId] 
         * @param {ReactionType} [type] 
+         * @param {ReactionLevel} [level] 
         * @param {string} [userId] 
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        getActivities: async (albumId: string, assetId?: string, type?: ReactionType, userId?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getActivities: async (albumId: string, assetId?: string, type?: ReactionType, level?: ReactionLevel, userId?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
            // verify required parameter 'albumId' is not null or undefined
            assertParamExists('getActivities', 'albumId', albumId)
            const localVarPath = `/activity`;
@@ -5128,6 +5182,10 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat
                localVarQueryParameter['type'] = type;
            }

+            if (level !== undefined) {
+                localVarQueryParameter['level'] = level;
+            }
+
            if (userId !== undefined) {
                localVarQueryParameter['userId'] = userId;
            }
@@ -5228,12 +5286,13 @@ export const ActivityApiFp = function(configuration?: Configuration) {
         * @param {string} albumId 
         * @param {string} [assetId] 
         * @param {ReactionType} [type] 
+         * @param {ReactionLevel} [level] 
         * @param {string} [userId] 
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async getActivities(albumId: string, assetId?: string, type?: ReactionType, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<ActivityResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(albumId, assetId, type, userId, options);
+        async getActivities(albumId: string, assetId?: string, type?: ReactionType, level?: ReactionLevel, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<ActivityResponseDto>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(albumId, assetId, type, level, userId, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
        /**
@@ -5282,7 +5341,7 @@ export const ActivityApiFactory = function (configuration?: Configuration, baseP
         * @throws {RequiredError}
         */
        getActivities(requestParameters: ActivityApiGetActivitiesRequest, options?: AxiosRequestConfig): AxiosPromise<Array<ActivityResponseDto>> {
-            return localVarFp.getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.userId, options).then((request) => request(axios, basePath));
+            return localVarFp.getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.level, requestParameters.userId, options).then((request) => request(axios, basePath));
        },
        /**
         * 
@@ -5351,6 +5410,13 @@ export interface ActivityApiGetActivitiesRequest {
     */
    readonly type?: ReactionType

+    /**
+     * 
+     * @type {ReactionLevel}
+     * @memberof ActivityApiGetActivities
+     */
+    readonly level?: ReactionLevel
+
    /**
     * 
     * @type {string}
@@ -5417,7 +5483,7 @@ export class ActivityApi extends BaseAPI {
     * @memberof ActivityApi
     */
    public getActivities(requestParameters: ActivityApiGetActivitiesRequest, options?: AxiosRequestConfig) {
-        return ActivityApiFp(this.configuration).getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.userId, options).then((request) => request(this.axios, this.basePath));
+        return ActivityApiFp(this.configuration).getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.level, requestParameters.userId, options).then((request) => request(this.axios, this.basePath));
    }

    /**
@@ -7270,11 +7336,12 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
         * @param {boolean} [isFavorite] 
         * @param {boolean} [isTrashed] 
         * @param {boolean} [withStacked] 
+         * @param {boolean} [withPartners] 
         * @param {string} [key] 
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        getTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
            // verify required parameter 'size' is not null or undefined
            assertParamExists('getTimeBucket', 'size', size)
            // verify required parameter 'timeBucket' is not null or undefined
@@ -7332,6 +7399,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
                localVarQueryParameter['withStacked'] = withStacked;
            }

+            if (withPartners !== undefined) {
+                localVarQueryParameter['withPartners'] = withPartners;
+            }
+
            if (timeBucket !== undefined) {
                localVarQueryParameter['timeBucket'] = timeBucket;
            }
@@ -7361,11 +7432,12 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
         * @param {boolean} [isFavorite] 
         * @param {boolean} [isTrashed] 
         * @param {boolean} [withStacked] 
+         * @param {boolean} [withPartners] 
         * @param {string} [key] 
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        getTimeBuckets: async (size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getTimeBuckets: async (size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
            // verify required parameter 'size' is not null or undefined
            assertParamExists('getTimeBuckets', 'size', size)
            const localVarPath = `/asset/time-buckets`;
@@ -7421,6 +7493,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
                localVarQueryParameter['withStacked'] = withStacked;
            }

+            if (withPartners !== undefined) {
+                localVarQueryParameter['withPartners'] = withPartners;
+            }
+
            if (key !== undefined) {
                localVarQueryParameter['key'] = key;
            }
@@ -8223,12 +8299,13 @@ export const AssetApiFp = function(configuration?: Configuration) {
         * @param {boolean} [isFavorite] 
         * @param {boolean} [isTrashed] 
         * @param {boolean} [withStacked] 
+         * @param {boolean} [withPartners] 
         * @param {string} [key] 
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async getTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AssetResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key, options);
+        async getTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AssetResponseDto>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, withPartners, key, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
        /**
@@ -8241,12 +8318,13 @@ export const AssetApiFp = function(configuration?: Configuration) {
         * @param {boolean} [isFavorite] 
         * @param {boolean} [isTrashed] 
         * @param {boolean} [withStacked] 
+         * @param {boolean} [withPartners] 
         * @param {string} [key] 
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async getTimeBuckets(size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<TimeBucketResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key, options);
+        async getTimeBuckets(size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<TimeBucketResponseDto>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, withPartners, key, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
        /**
@@ -8543,7 +8621,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
         * @throws {RequiredError}
         */
        getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise<Array<AssetResponseDto>> {
-            return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(axios, basePath));
+            return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(axios, basePath));
        },
        /**
         * 
@@ -8552,7 +8630,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
         * @throws {RequiredError}
         */
        getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: AxiosRequestConfig): AxiosPromise<Array<TimeBucketResponseDto>> {
-            return localVarFp.getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(axios, basePath));
+            return localVarFp.getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(axios, basePath));
        },
        /**
         * Get all asset of a device that are in the database, ID only.
@@ -9039,6 +9117,13 @@ export interface AssetApiGetTimeBucketRequest {
     */
    readonly withStacked?: boolean

+    /**
+     * 
+     * @type {boolean}
+     * @memberof AssetApiGetTimeBucket
+     */
+    readonly withPartners?: boolean
+
    /**
     * 
     * @type {string}
@@ -9109,6 +9194,13 @@ export interface AssetApiGetTimeBucketsRequest {
     */
    readonly withStacked?: boolean

+    /**
+     * 
+     * @type {boolean}
+     * @memberof AssetApiGetTimeBuckets
+     */
+    readonly withPartners?: boolean
+
    /**
     * 
     * @type {string}
@@ -9588,7 +9680,7 @@ export class AssetApi extends BaseAPI {
     * @memberof AssetApi
     */
    public getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig) {
-        return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(this.axios, this.basePath));
+        return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(this.axios, this.basePath));
    }

    /**
@@ -9599,7 +9691,7 @@ export class AssetApi extends BaseAPI {
     * @memberof AssetApi
     */
    public getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: AxiosRequestConfig) {
-        return AssetApiFp(this.configuration).getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.key, options).then((request) => request(this.axios, this.basePath));
+        return AssetApiFp(this.configuration).getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(this.axios, this.basePath));
    }

    /**
@@ -10509,7 +10601,7 @@ export const AuthenticationApiFp = function(configuration?: Configuration) {
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async signUpAdmin(signUpDto: SignUpDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AdminSignupResponseDto>> {
+        async signUpAdmin(signUpDto: SignUpDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
            const localVarAxiosArgs = await localVarAxiosParamCreator.signUpAdmin(signUpDto, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
@@ -10589,7 +10681,7 @@ export const AuthenticationApiFactory = function (configuration?: Configuration,
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        signUpAdmin(requestParameters: AuthenticationApiSignUpAdminRequest, options?: AxiosRequestConfig): AxiosPromise<AdminSignupResponseDto> {
+        signUpAdmin(requestParameters: AuthenticationApiSignUpAdminRequest, options?: AxiosRequestConfig): AxiosPromise<UserResponseDto> {
            return localVarFp.signUpAdmin(requestParameters.signUpDto, options).then((request) => request(axios, basePath));
        },
        /**
@@ -12308,6 +12400,54 @@ export const PartnerApiAxiosParamCreator = function (configuration?: Configurati
            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};

+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {string} id 
+         * @param {UpdatePartnerDto} updatePartnerDto 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updatePartner: async (id: string, updatePartnerDto: UpdatePartnerDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updatePartner', 'id', id)
+            // verify required parameter 'updatePartnerDto' is not null or undefined
+            assertParamExists('updatePartner', 'updatePartnerDto', updatePartnerDto)
+            const localVarPath = `/partner/{id}`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication cookie required
+
+            // authentication api_key required
+            await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(updatePartnerDto, localVarRequestOptions, configuration)
+
            return {
                url: toPathString(localVarUrlObj),
                options: localVarRequestOptions,
@@ -12329,7 +12469,7 @@ export const PartnerApiFp = function(configuration?: Configuration) {
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async createPartner(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
+        async createPartner(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PartnerResponseDto>> {
            const localVarAxiosArgs = await localVarAxiosParamCreator.createPartner(id, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
@@ -12339,7 +12479,7 @@ export const PartnerApiFp = function(configuration?: Configuration) {
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async getPartners(direction: 'shared-by' | 'shared-with', options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserResponseDto>>> {
+        async getPartners(direction: 'shared-by' | 'shared-with', options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<PartnerResponseDto>>> {
            const localVarAxiosArgs = await localVarAxiosParamCreator.getPartners(direction, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
@@ -12353,6 +12493,17 @@ export const PartnerApiFp = function(configuration?: Configuration) {
            const localVarAxiosArgs = await localVarAxiosParamCreator.removePartner(id, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
+        /**
+         * 
+         * @param {string} id 
+         * @param {UpdatePartnerDto} updatePartnerDto 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updatePartner(id: string, updatePartnerDto: UpdatePartnerDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PartnerResponseDto>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updatePartner(id, updatePartnerDto, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
    }
 };

@@ -12369,7 +12520,7 @@ export const PartnerApiFactory = function (configuration?: Configuration, basePa
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        createPartner(requestParameters: PartnerApiCreatePartnerRequest, options?: AxiosRequestConfig): AxiosPromise<UserResponseDto> {
+        createPartner(requestParameters: PartnerApiCreatePartnerRequest, options?: AxiosRequestConfig): AxiosPromise<PartnerResponseDto> {
            return localVarFp.createPartner(requestParameters.id, options).then((request) => request(axios, basePath));
        },
        /**
@@ -12378,7 +12529,7 @@ export const PartnerApiFactory = function (configuration?: Configuration, basePa
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        getPartners(requestParameters: PartnerApiGetPartnersRequest, options?: AxiosRequestConfig): AxiosPromise<Array<UserResponseDto>> {
+        getPartners(requestParameters: PartnerApiGetPartnersRequest, options?: AxiosRequestConfig): AxiosPromise<Array<PartnerResponseDto>> {
            return localVarFp.getPartners(requestParameters.direction, options).then((request) => request(axios, basePath));
        },
        /**
@@ -12390,6 +12541,15 @@ export const PartnerApiFactory = function (configuration?: Configuration, basePa
        removePartner(requestParameters: PartnerApiRemovePartnerRequest, options?: AxiosRequestConfig): AxiosPromise<void> {
            return localVarFp.removePartner(requestParameters.id, options).then((request) => request(axios, basePath));
        },
+        /**
+         * 
+         * @param {PartnerApiUpdatePartnerRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updatePartner(requestParameters: PartnerApiUpdatePartnerRequest, options?: AxiosRequestConfig): AxiosPromise<PartnerResponseDto> {
+            return localVarFp.updatePartner(requestParameters.id, requestParameters.updatePartnerDto, options).then((request) => request(axios, basePath));
+        },
    };
 };

@@ -12435,6 +12595,27 @@ export interface PartnerApiRemovePartnerRequest {
    readonly id: string
 }

+/**
+ * Request parameters for updatePartner operation in PartnerApi.
+ * @export
+ * @interface PartnerApiUpdatePartnerRequest
+ */
+export interface PartnerApiUpdatePartnerRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerApiUpdatePartner
+     */
+    readonly id: string
+
+    /**
+     * 
+     * @type {UpdatePartnerDto}
+     * @memberof PartnerApiUpdatePartner
+     */
+    readonly updatePartnerDto: UpdatePartnerDto
+}
+
 /**
 * PartnerApi - object-oriented interface
 * @export
@@ -12474,6 +12655,17 @@ export class PartnerApi extends BaseAPI {
    public removePartner(requestParameters: PartnerApiRemovePartnerRequest, options?: AxiosRequestConfig) {
        return PartnerApiFp(this.configuration).removePartner(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
    }
+
+    /**
+     * 
+     * @param {PartnerApiUpdatePartnerRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PartnerApi
+     */
+    public updatePartner(requestParameters: PartnerApiUpdatePartnerRequest, options?: AxiosRequestConfig) {
+        return PartnerApiFp(this.configuration).updatePartner(requestParameters.id, requestParameters.updatePartnerDto, options).then((request) => request(this.axios, this.basePath));
+    }
 }


@@ -15100,6 +15292,51 @@ export const SystemConfigApiAxiosParamCreator = function (configuration?: Config


    
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {MapTheme} theme 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getMapStyle: async (theme: MapTheme, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'theme' is not null or undefined
+            assertParamExists('getMapStyle', 'theme', theme)
+            const localVarPath = `/system-config/map/style.json`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication cookie required
+
+            // authentication api_key required
+            await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+            if (theme !== undefined) {
+                localVarQueryParameter['theme'] = theme;
+            }
+
+
+    
            setSearchParams(localVarUrlObj, localVarQueryParameter);
            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -15219,6 +15456,16 @@ export const SystemConfigApiFp = function(configuration?: Configuration) {
            const localVarAxiosArgs = await localVarAxiosParamCreator.getConfigDefaults(options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
+        /**
+         * 
+         * @param {MapTheme} theme 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async getMapStyle(theme: MapTheme, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<object>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getMapStyle(theme, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
        /**
         * 
         * @param {*} [options] Override http request option.
@@ -15264,6 +15511,15 @@ export const SystemConfigApiFactory = function (configuration?: Configuration, b
        getConfigDefaults(options?: AxiosRequestConfig): AxiosPromise<SystemConfigDto> {
            return localVarFp.getConfigDefaults(options).then((request) => request(axios, basePath));
        },
+        /**
+         * 
+         * @param {SystemConfigApiGetMapStyleRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getMapStyle(requestParameters: SystemConfigApiGetMapStyleRequest, options?: AxiosRequestConfig): AxiosPromise<object> {
+            return localVarFp.getMapStyle(requestParameters.theme, options).then((request) => request(axios, basePath));
+        },
        /**
         * 
         * @param {*} [options] Override http request option.
@@ -15284,6 +15540,20 @@ export const SystemConfigApiFactory = function (configuration?: Configuration, b
    };
 };

+/**
+ * Request parameters for getMapStyle operation in SystemConfigApi.
+ * @export
+ * @interface SystemConfigApiGetMapStyleRequest
+ */
+export interface SystemConfigApiGetMapStyleRequest {
+    /**
+     * 
+     * @type {MapTheme}
+     * @memberof SystemConfigApiGetMapStyle
+     */
+    readonly theme: MapTheme
+}
+
 /**
 * Request parameters for updateConfig operation in SystemConfigApi.
 * @export
@@ -15325,6 +15595,17 @@ export class SystemConfigApi extends BaseAPI {
        return SystemConfigApiFp(this.configuration).getConfigDefaults(options).then((request) => request(this.axios, this.basePath));
    }

+    /**
+     * 
+     * @param {SystemConfigApiGetMapStyleRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SystemConfigApi
+     */
+    public getMapStyle(requestParameters: SystemConfigApiGetMapStyleRequest, options?: AxiosRequestConfig) {
+        return SystemConfigApiFp(this.configuration).getMapStyle(requestParameters.theme, options).then((request) => request(this.axios, this.basePath));
+    }
+
    /**
     * 
     * @param {*} [options] Override http request option.
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -4,6 +4,8 @@

 version: "3.8"

+name: immich-dev
+
 services:
  immich-server:
    container_name: immich_server
@@ -121,11 +123,11 @@ services:

  redis:
    container_name: immich_redis
-    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
+    image: redis:6.2-alpine@sha256:3995fe6ea6a619313e31046bd3c8643f9e70f8f2b294ff82659d409b47d06abb

  database:
    container_name: immich_postgres
-    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
+    image: postgres:14-alpine@sha256:874f566dd512d79cf74f59754833e869ae76ece96716d153b0fa3e64aec88d92
    env_file:
      - .env
    environment:
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -1,5 +1,7 @@
 version: "3.8"

+name: immich-prod
+
 services:
  immich-server:
    container_name: immich_server
@@ -77,12 +79,12 @@ services:

  redis:
    container_name: immich_redis
-    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
+    image: redis:6.2-alpine@sha256:3995fe6ea6a619313e31046bd3c8643f9e70f8f2b294ff82659d409b47d06abb
    restart: always

  database:
    container_name: immich_postgres
-    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
+    image: postgres:14-alpine@sha256:874f566dd512d79cf74f59754833e869ae76ece96716d153b0fa3e64aec88d92
    env_file:
      - .env
    environment:
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -23,7 +23,7 @@ services:
      - database

  database:
-    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
+    image: postgres:14-alpine@sha256:874f566dd512d79cf74f59754833e869ae76ece96716d153b0fa3e64aec88d92
    command: -c fsync=off
    environment:
      POSTGRES_PASSWORD: postgres
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,10 +1,12 @@
 version: "3.8"

+name: immich
+
 services:
  immich-server:
    container_name: immich_server
    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    command: ["start.sh", "immich"]
+    command: [ "start.sh", "immich" ]
    volumes:
      - ${UPLOAD_LOCATION}:/usr/src/app/upload
      - /etc/localtime:/etc/localtime:ro
@@ -22,7 +24,7 @@ services:
    # extends:
    #   file: hwaccel.yml
    #   service: hwaccel
-    command: ["start.sh", "microservices"]
+    command: [ "start.sh", "microservices" ]
    volumes:
      - ${UPLOAD_LOCATION}:/usr/src/app/upload
      - /etc/localtime:/etc/localtime:ro
@@ -64,12 +66,12 @@ services:

  redis:
    container_name: immich_redis
-    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
+    image: redis:6.2-alpine@sha256:3995fe6ea6a619313e31046bd3c8643f9e70f8f2b294ff82659d409b47d06abb
    restart: always

  database:
    container_name: immich_postgres
-    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
+    image: postgres:14-alpine@sha256:874f566dd512d79cf74f59754833e869ae76ece96716d153b0fa3e64aec88d92
    env_file:
      - .env
    environment:
--- a/docs/docs/administration/server-commands.md
+++ b/docs/docs/administration/server-commands.md
@@ -51,8 +51,7 @@ immich-admin list-users
  {
    id: 'e65e6f88-2a30-4dbe-8dd9-1885f4889b53',
    email: 'immich@example.com.com',
-    firstName: 'Immich',
-    lastName: 'Admin',
+    name: 'Immich Admin',
    storageLabel: 'admin',
    externalPath: null,
    profileImagePath: 'upload/profile/e65e6f88-2a30-4dbe-8dd9-1885f4889b53/e65e6f88-2a30-4dbe-8dd9-1885f4889b53.jpg',
--- a/docs/docs/developer/database-migrations.md
+++ b/docs/docs/developer/database-migrations.md
@@ -9,6 +9,6 @@ npm run typeorm:migrations:generate ./src/infra/<migration-name>
 ```

 2. Check if the migration file makes sense.
-3. Move the migration file to folder `./src/infra/database/migrations` in your code editor.
+3. Move the migration file to folder `./server/src/infra/migrations` in your code editor.

 The server will automatically detect `*.ts` file changes and restart. Part of the server start-up process includes running any new migrations, so it will be applied immediately.
--- a/docs/docs/features/libraries.md
+++ b/docs/docs/features/libraries.md
@@ -75,7 +75,7 @@ Some basic examples:
 - `*.tif` will exclude all files with the extension `.tif`
 - `hidden.jpg` will exclude all files named `hidden.jpg`
 - `**/Raw/**` will exclude all files in any directory named `Raw`
- `*.(tif,jpg)` will exclude all files with the extension `.tif` or `.jpg`
+- `*.{tif,jpg}` will exclude all files with the extension `.tif` or `.jpg`

 ### Nightly job

--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -13232,19 +13232,19 @@
      }
    },
    "node_modules/tailwindcss": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
-      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
      "dependencies": {
        "@alloc/quick-lru": "^5.2.0",
        "arg": "^5.0.2",
        "chokidar": "^3.5.3",
        "didyoumean": "^1.2.2",
        "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.0",
        "glob-parent": "^6.0.2",
        "is-glob": "^4.0.3",
-        "jiti": "^1.18.2",
+        "jiti": "^1.19.1",
        "lilconfig": "^2.1.0",
        "micromatch": "^4.0.5",
        "normalize-path": "^3.0.0",
@@ -24517,19 +24517,19 @@
      }
    },
    "tailwindcss": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
-      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
      "requires": {
        "@alloc/quick-lru": "^5.2.0",
        "arg": "^5.0.2",
        "chokidar": "^3.5.3",
        "didyoumean": "^1.2.2",
        "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.0",
        "glob-parent": "^6.0.2",
        "is-glob": "^4.0.3",
-        "jiti": "^1.18.2",
+        "jiti": "^1.19.1",
        "lilconfig": "^2.1.0",
        "micromatch": "^4.0.5",
        "normalize-path": "^3.0.0",
--- a/machine-learning/app/config.py
+++ b/machine-learning/app/config.py
@@ -38,8 +38,16 @@ class LogSettings(BaseSettings):
 _clean_name = str.maketrans(":\\/", "___", ".")


+def clean_name(model_name: str) -> str:
+    return model_name.split("/")[-1].translate(_clean_name)
+
+
 def get_cache_dir(model_name: str, model_type: ModelType) -> Path:
-    return Path(settings.cache_folder) / model_type.value / model_name.translate(_clean_name)
+    return Path(settings.cache_folder) / model_type.value / clean_name(model_name)
+
+
+def get_hf_model_name(model_name: str) -> str:
+    return f"immich-app/{clean_name(model_name)}"


 LOG_LEVELS: dict[str, int] = {
--- a/machine-learning/app/models/init.py
+++ b/machine-learning/app/models/init.py
@@ -3,7 +3,8 @@ from typing import Any
 from app.schemas import ModelType

 from .base import InferenceModel
-from .clip import MCLIPEncoder, OpenCLIPEncoder, is_mclip, is_openclip
+from .clip import MCLIPEncoder, OpenCLIPEncoder
+from .constants import is_insightface, is_mclip, is_openclip
 from .facial_recognition import FaceRecognizer
 from .image_classification import ImageClassifier

@@ -15,11 +16,12 @@ def from_model_type(model_type: ModelType, model_name: str, **model_kwargs: Any)
                return OpenCLIPEncoder(model_name, **model_kwargs)
            elif is_mclip(model_name):
                return MCLIPEncoder(model_name, **model_kwargs)
-            else:
-                raise ValueError(f"Unknown CLIP model {model_name}")
        case ModelType.FACIAL_RECOGNITION:
-            return FaceRecognizer(model_name, **model_kwargs)
+            if is_insightface(model_name):
+                return FaceRecognizer(model_name, **model_kwargs)
        case ModelType.IMAGE_CLASSIFICATION:
            return ImageClassifier(model_name, **model_kwargs)
        case _:
            raise ValueError(f"Unknown model type {model_type}")
+
+    raise ValueError(f"Unknown ${model_type} model {model_name}")
--- a/machine-learning/app/models/base.py
+++ b/machine-learning/app/models/base.py
@@ -7,8 +7,9 @@ from shutil import rmtree
 from typing import Any

 import onnxruntime as ort
+from huggingface_hub import snapshot_download

-from ..config import get_cache_dir, log, settings
+from ..config import get_cache_dir, get_hf_model_name, log, settings
 from ..schemas import ModelType


@@ -78,9 +79,13 @@ class InferenceModel(ABC):
    def configure(self, **model_kwargs: Any) -> None:
        pass

-    @abstractmethod
    def _download(self) -> None:
-        ...
+        snapshot_download(
+            get_hf_model_name(self.model_name),
+            cache_dir=self.cache_dir,
+            local_dir=self.cache_dir,
+            local_dir_use_symlinks=False,
+        )

    @abstractmethod
    def _load(self) -> None:
--- a/machine-learning/app/models/clip.py
+++ b/machine-learning/app/models/clip.py
@@ -7,11 +7,10 @@ from typing import Any, Literal

 import numpy as np
 import onnxruntime as ort
-from huggingface_hub import snapshot_download
 from PIL import Image
 from transformers import AutoTokenizer

-from app.config import log
+from app.config import clean_name, log
 from app.models.transforms import crop, get_pil_resampling, normalize, resize, to_numpy
 from app.schemas import ModelType, ndarray_f32, ndarray_i32, ndarray_i64

@@ -117,15 +116,7 @@ class OpenCLIPEncoder(BaseCLIPEncoder):
        mode: Literal["text", "vision"] | None = None,
        **model_kwargs: Any,
    ) -> None:
-        super().__init__(_clean_model_name(model_name), cache_dir, mode, **model_kwargs)
-
-    def _download(self) -> None:
-        snapshot_download(
-            f"immich-app/{self.model_name}",
-            cache_dir=self.cache_dir,
-            local_dir=self.cache_dir,
-            local_dir_use_symlinks=False,
-        )
+        super().__init__(clean_name(model_name), cache_dir, mode, **model_kwargs)

    def _load(self) -> None:
        super()._load()
@@ -171,52 +162,3 @@ class MCLIPEncoder(OpenCLIPEncoder):
    def tokenize(self, text: str) -> dict[str, ndarray_i32]:
        tokens: dict[str, ndarray_i64] = self.tokenizer(text, return_tensors="np")
        return {k: v.astype(np.int32) for k, v in tokens.items()}
-
-
-_OPENCLIP_MODELS = {
-    "RN50__openai",
-    "RN50__yfcc15m",
-    "RN50__cc12m",
-    "RN101__openai",
-    "RN101__yfcc15m",
-    "RN50x4__openai",
-    "RN50x16__openai",
-    "RN50x64__openai",
-    "ViT-B-32__openai",
-    "ViT-B-32__laion2b_e16",
-    "ViT-B-32__laion400m_e31",
-    "ViT-B-32__laion400m_e32",
-    "ViT-B-32__laion2b-s34b-b79k",
-    "ViT-B-16__openai",
-    "ViT-B-16__laion400m_e31",
-    "ViT-B-16__laion400m_e32",
-    "ViT-B-16-plus-240__laion400m_e31",
-    "ViT-B-16-plus-240__laion400m_e32",
-    "ViT-L-14__openai",
-    "ViT-L-14__laion400m_e31",
-    "ViT-L-14__laion400m_e32",
-    "ViT-L-14__laion2b-s32b-b82k",
-    "ViT-L-14-336__openai",
-    "ViT-H-14__laion2b-s32b-b79k",
-    "ViT-g-14__laion2b-s12b-b42k",
-}
-
-
-_MCLIP_MODELS = {
-    "LABSE-Vit-L-14",
-    "XLM-Roberta-Large-Vit-B-32",
-    "XLM-Roberta-Large-Vit-B-16Plus",
-    "XLM-Roberta-Large-Vit-L-14",
-}
-
-
-def _clean_model_name(model_name: str) -> str:
-    return model_name.split("/")[-1].replace("::", "__")
-
-
-def is_openclip(model_name: str) -> bool:
-    return _clean_model_name(model_name) in _OPENCLIP_MODELS
-
-
-def is_mclip(model_name: str) -> bool:
-    return _clean_model_name(model_name) in _MCLIP_MODELS
--- a/machine-learning/app/models/constants.py
+++ b/machine-learning/app/models/constants.py
@@ -0,0 +1,57 @@
+from app.config import clean_name
+
+_OPENCLIP_MODELS = {
+    "RN50__openai",
+    "RN50__yfcc15m",
+    "RN50__cc12m",
+    "RN101__openai",
+    "RN101__yfcc15m",
+    "RN50x4__openai",
+    "RN50x16__openai",
+    "RN50x64__openai",
+    "ViT-B-32__openai",
+    "ViT-B-32__laion2b_e16",
+    "ViT-B-32__laion400m_e31",
+    "ViT-B-32__laion400m_e32",
+    "ViT-B-32__laion2b-s34b-b79k",
+    "ViT-B-16__openai",
+    "ViT-B-16__laion400m_e31",
+    "ViT-B-16__laion400m_e32",
+    "ViT-B-16-plus-240__laion400m_e31",
+    "ViT-B-16-plus-240__laion400m_e32",
+    "ViT-L-14__openai",
+    "ViT-L-14__laion400m_e31",
+    "ViT-L-14__laion400m_e32",
+    "ViT-L-14__laion2b-s32b-b82k",
+    "ViT-L-14-336__openai",
+    "ViT-H-14__laion2b-s32b-b79k",
+    "ViT-g-14__laion2b-s12b-b42k",
+}
+
+
+_MCLIP_MODELS = {
+    "LABSE-Vit-L-14",
+    "XLM-Roberta-Large-Vit-B-32",
+    "XLM-Roberta-Large-Vit-B-16Plus",
+    "XLM-Roberta-Large-Vit-L-14",
+}
+
+
+_INSIGHTFACE_MODELS = {
+    "antelopev2",
+    "buffalo_l",
+    "buffalo_m",
+    "buffalo_s",
+}
+
+
+def is_openclip(model_name: str) -> bool:
+    return clean_name(model_name) in _OPENCLIP_MODELS
+
+
+def is_mclip(model_name: str) -> bool:
+    return clean_name(model_name) in _MCLIP_MODELS
+
+
+def is_insightface(model_name: str) -> bool:
+    return clean_name(model_name) in _INSIGHTFACE_MODELS
--- a/machine-learning/app/models/facial_recognition.py
+++ b/machine-learning/app/models/facial_recognition.py
@@ -1,4 +1,3 @@
-import zipfile
 from pathlib import Path
 from typing import Any

@@ -7,8 +6,8 @@ import numpy as np
 import onnxruntime as ort
 from insightface.model_zoo import ArcFaceONNX, RetinaFace
 from insightface.utils.face_align import norm_crop
-from insightface.utils.storage import BASE_REPO_URL, download_file

+from app.config import clean_name
 from app.schemas import ModelType, ndarray_f32

 from .base import InferenceModel
@@ -25,37 +24,21 @@ class FaceRecognizer(InferenceModel):
        **model_kwargs: Any,
    ) -> None:
        self.min_score = model_kwargs.pop("minScore", min_score)
-        super().__init__(model_name, cache_dir, **model_kwargs)
-
-    def _download(self) -> None:
-        zip_file = self.cache_dir / f"{self.model_name}.zip"
-        download_file(f"{BASE_REPO_URL}/{self.model_name}.zip", zip_file)
-        with zipfile.ZipFile(zip_file, "r") as zip:
-            members = zip.namelist()
-            det_file = next(model for model in members if model.startswith("det_"))
-            rec_file = next(model for model in members if model.startswith("w600k_"))
-            zip.extractall(self.cache_dir, members=[det_file, rec_file])
-        zip_file.unlink()
+        super().__init__(clean_name(model_name), cache_dir, **model_kwargs)

    def _load(self) -> None:
-        try:
-            det_file = next(self.cache_dir.glob("det_*.onnx"))
-            rec_file = next(self.cache_dir.glob("w600k_*.onnx"))
-        except StopIteration:
-            raise FileNotFoundError("Facial recognition models not found in cache directory")
-
        self.det_model = RetinaFace(
            session=ort.InferenceSession(
-                det_file.as_posix(),
+                self.det_file.as_posix(),
                sess_options=self.sess_options,
                providers=self.providers,
                provider_options=self.provider_options,
            ),
        )
        self.rec_model = ArcFaceONNX(
-            rec_file.as_posix(),
+            self.rec_file.as_posix(),
            session=ort.InferenceSession(
-                rec_file.as_posix(),
+                self.rec_file.as_posix(),
                sess_options=self.sess_options,
                providers=self.providers,
                provider_options=self.provider_options,
@@ -103,7 +86,15 @@ class FaceRecognizer(InferenceModel):

    @property
    def cached(self) -> bool:
-        return self.cache_dir.is_dir() and any(self.cache_dir.glob("*.onnx"))
+        return self.det_file.is_file() and self.rec_file.is_file()
+
+    @property
+    def det_file(self) -> Path:
+        return self.cache_dir / "detection" / "model.onnx"
+
+    @property
+    def rec_file(self) -> Path:
+        return self.cache_dir / "recognition" / "model.onnx"

    def configure(self, **model_kwargs: Any) -> None:
        self.det_model.det_thresh = model_kwargs.pop("minScore", self.det_model.det_thresh)
--- a/machine-learning/app/test_main.py
+++ b/machine-learning/app/test_main.py
@@ -106,13 +106,13 @@ class TestCLIP:
 class TestFaceRecognition:
    def test_set_min_score(self, mocker: MockerFixture) -> None:
        mocker.patch.object(FaceRecognizer, "load")
-        face_recognizer = FaceRecognizer("test_model_name", cache_dir="test_cache", min_score=0.5)
+        face_recognizer = FaceRecognizer("buffalo_s", cache_dir="test_cache", min_score=0.5)

        assert face_recognizer.min_score == 0.5

    def test_basic(self, cv_image: cv2.Mat, mocker: MockerFixture) -> None:
        mocker.patch.object(FaceRecognizer, "load")
-        face_recognizer = FaceRecognizer("test_model_name", min_score=0.0, cache_dir="test_cache")
+        face_recognizer = FaceRecognizer("buffalo_s", min_score=0.0, cache_dir="test_cache")

        det_model = mock.Mock()
        num_faces = 2
--- a/machine-learning/export/Dockerfile
+++ b/machine-learning/export/Dockerfile
@@ -14,8 +14,7 @@ RUN micromamba install -y -n base -f /tmp/conda-lock.yml && \

 WORKDIR /usr/src/app

-COPY --chown=$MAMBA_USER:$MAMBA_USER start.sh .
-COPY --chown=$MAMBA_USER:$MAMBA_USER app .
+COPY --chown=$MAMBA_USER:$MAMBA_USER export .

 ENTRYPOINT ["/usr/local/bin/_entrypoint.sh"]
-CMD ["./start.sh"]
+CMD ["python -m run"]
--- a/machine-learning/export/init.py
+++ b/machine-learning/export/init.py
--- a/machine-learning/export/models/constants.py
+++ b/machine-learning/export/models/constants.py
@@ -0,0 +1,9 @@
+from export.models.openclip import OpenCLIPModelConfig
+
+
+MCLIP_TO_OPENCLIP = {
+    "XLM-Roberta-Large-Vit-B-32": OpenCLIPModelConfig("ViT-B-32", "openai"),
+    "XLM-Roberta-Large-Vit-B-16Plus": OpenCLIPModelConfig("ViT-B-16-plus-240", "laion400m_e32"),
+    "LABSE-Vit-L-14": OpenCLIPModelConfig("ViT-L-14", "openai"),
+    "XLM-Roberta-Large-Vit-L-14": OpenCLIPModelConfig("ViT-L-14", "openai"),
+}
--- a/machine-learning/export/models/mclip.py
+++ b/machine-learning/export/models/mclip.py
@@ -1,22 +1,15 @@
 import tempfile
 import warnings
 from pathlib import Path
+from export.models.constants import MCLIP_TO_OPENCLIP

 import torch
 from multilingual_clip.pt_multilingual_clip import MultilingualCLIP
 from transformers import AutoTokenizer

-from .openclip import OpenCLIPModelConfig
 from .openclip import to_onnx as openclip_to_onnx
 from .optimize import optimize
-from .util import get_model_path
-
-_MCLIP_TO_OPENCLIP = {
-    "M-CLIP/XLM-Roberta-Large-Vit-B-32": OpenCLIPModelConfig("ViT-B-32", "openai"),
-    "M-CLIP/XLM-Roberta-Large-Vit-B-16Plus": OpenCLIPModelConfig("ViT-B-16-plus-240", "laion400m_e32"),
-    "M-CLIP/LABSE-Vit-L-14": OpenCLIPModelConfig("ViT-L-14", "openai"),
-    "M-CLIP/XLM-Roberta-Large-Vit-L-14": OpenCLIPModelConfig("ViT-L-14", "openai"),
-}
+from .util import get_model_path, clean_name


 def to_onnx(
@@ -33,7 +26,7 @@ def to_onnx(
            param.requires_grad_(False)

        export_text_encoder(model, textual_path)
-        openclip_to_onnx(_MCLIP_TO_OPENCLIP[model_name], output_dir_visual)
+        openclip_to_onnx(MCLIP_TO_OPENCLIP[clean_name(model_name)], output_dir_visual)
        optimize(textual_path)


--- a/machine-learning/export/models/util.py
+++ b/machine-learning/export/models/util.py
@@ -3,6 +3,9 @@ from pathlib import Path
 from typing import Any


+_clean_name = str.maketrans(":\\/", "___", ".")
+
+
 def get_model_path(output_dir: Path | str) -> Path:
    output_dir = Path(output_dir)
    output_dir.mkdir(parents=True, exist_ok=True)
@@ -13,3 +16,7 @@ def save_config(config: Any, output_path: Path | str) -> None:
    output_path = Path(output_path)
    output_path.parent.mkdir(parents=True, exist_ok=True)
    json.dump(config, output_path.open("w"))
+
+
+def clean_name(model_name: str) -> str:
+    return model_name.split("/")[-1].translate(_clean_name)
--- a/machine-learning/export/run.py
+++ b/machine-learning/export/run.py
@@ -1,76 +1,131 @@
+from enum import StrEnum
 import gc
 import os
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from typing import Optional

-from huggingface_hub import create_repo, login, upload_folder
-from models import mclip, openclip
+from huggingface_hub import create_repo, upload_folder
+from export.models import mclip, openclip, insightface
+from export.models.util import clean_name
 from rich.progress import Progress
+import typer

-models = [
-    "RN50::openai",
-    "RN50::yfcc15m",
-    "RN50::cc12m",
-    "RN101::openai",
-    "RN101::yfcc15m",
-    "RN50x4::openai",
-    "RN50x16::openai",
-    "RN50x64::openai",
-    "ViT-B-32::openai",
-    "ViT-B-32::laion2b_e16",
-    "ViT-B-32::laion400m_e31",
-    "ViT-B-32::laion400m_e32",
-    "ViT-B-32::laion2b-s34b-b79k",
-    "ViT-B-16::openai",
-    "ViT-B-16::laion400m_e31",
-    "ViT-B-16::laion400m_e32",
-    "ViT-B-16-plus-240::laion400m_e31",
-    "ViT-B-16-plus-240::laion400m_e32",
-    "ViT-L-14::openai",
-    "ViT-L-14::laion400m_e31",
-    "ViT-L-14::laion400m_e32",
-    "ViT-L-14::laion2b-s32b-b82k",
-    "ViT-L-14-336::openai",
-    "ViT-H-14::laion2b-s32b-b79k",
-    "ViT-g-14::laion2b-s12b-b42k",
-    "M-CLIP/LABSE-Vit-L-14",
-    "M-CLIP/XLM-Roberta-Large-Vit-B-32",
-    "M-CLIP/XLM-Roberta-Large-Vit-B-16Plus",
-    "M-CLIP/XLM-Roberta-Large-Vit-L-14",
-]

-login(token=os.environ["HF_AUTH_TOKEN"])
+app = typer.Typer()

-with Progress() as progress:
-    task1 = progress.add_task("[green]Exporting models...", total=len(models))
-    task2 = progress.add_task("[yellow]Uploading models...", total=len(models))

-    with TemporaryDirectory() as tmp:
-        tmpdir = Path(tmp)
-        for model in models:
-            model_name = model.split("/")[-1].replace("::", "__")
-            config_path = tmpdir / model_name / "config.json"
+class ModelLibrary(StrEnum):
+    MCLIP = "mclip"
+    OPENCLIP = "openclip"
+    INSIGHTFACE = "insightface"

-            def upload() -> None:
-                progress.update(task2, description=f"[yellow]Uploading {model_name}")
-                repo_id = f"immich-app/{model_name}"

-                create_repo(repo_id, exist_ok=True)
-                upload_folder(repo_id=repo_id, folder_path=tmpdir / model_name)
-                progress.update(task2, advance=1)
+def _export(model_name: str, library: ModelLibrary, export_dir: Path) -> None:
+    visual_dir = export_dir / "visual"
+    textual_dir = export_dir / "textual"
+    match library:
+        case ModelLibrary.MCLIP:
+            insightface.to_onnx(model_name, visual_dir, textual_dir)
+        case ModelLibrary.OPENCLIP:
+            mclip.to_onnx(model_name, visual_dir, textual_dir)
+        case ModelLibrary.INSIGHTFACE:
+            name, _, pretrained = model_name.partition("__")
+            openclip.to_onnx(openclip.OpenCLIPModelConfig(name, pretrained), visual_dir, textual_dir)

-            def export() -> None:
-                progress.update(task1, description=f"[green]Exporting {model_name}")
-                visual_dir = tmpdir / model_name / "visual"
-                textual_dir = tmpdir / model_name / "textual"
-                if model.startswith("M-CLIP"):
-                    mclip.to_onnx(model, visual_dir, textual_dir)
-                else:
-                    name, _, pretrained = model_name.partition("__")
-                    openclip.to_onnx(openclip.OpenCLIPModelConfig(name, pretrained), visual_dir, textual_dir)
+    gc.collect()

-                progress.update(task1, advance=1)
-                gc.collect()

-            export()
-            upload()
+def _upload(repo_id: str, upload_dir: Path, auth_token: str | None = os.environ.get("HF_AUTH_TOKEN", None)) -> None:
+    create_repo(repo_id, exist_ok=True, token=auth_token)
+    upload_folder(repo_id=repo_id, folder_path=upload_dir, token=auth_token)
+
+
+@app.command()
+def export(
+    models: list[str] = typer.Argument(
+        ..., help="The model(s) to be exported. Model names should be the same as used in the associated library."
+    ),
+    library: ModelLibrary = typer.Option(
+        ..., "--library", "-l", help="The library associated with the models to be exported."
+    ),
+    output_dir: Optional[Path] = typer.Option(
+        None,
+        "--output-dir",
+        "-o",
+        help="Directory where exported models will be stored. Defaults to a temporary directory.",
+    ),
+    should_upload: bool = typer.Option(False, "--upload", "-u", help="Whether to upload the exported models."),
+    auth_token: Optional[str] = typer.Option(
+        os.environ.get("HF_AUTH_TOKEN", None),
+        "--auth_token",
+        "-t",
+        help="If uploading models to Hugging Face, the auth token of the user or organisation.",
+    ),
+    repo_prefix: str = typer.Option(
+        "immich-app",
+        "--repo_prefix",
+        "-p",
+        help="If uploading models to Hugging Face, the prefix to put before the model name. Can be a username or organisation.",
+    ),
+) -> None:
+    if not models:
+        raise ValueError("No models specified")
+
+    with Progress() as progress:
+        task1 = progress.add_task("[green]Exporting model(s)...", total=len(models))
+
+        with TemporaryDirectory() as tmp:
+            output_dir = output_dir if output_dir else Path(tmp)
+            for model_name in models:
+                cleaned_name = clean_name(model_name)
+                model_dir = output_dir / cleaned_name
+                progress.update(task1, description=f"[green]Exporting {cleaned_name}")
+                _export(model_name, library, model_dir)
+                progress.update(task1, advance=1, description=f"[green]Exported {cleaned_name}")
+
+            if should_upload:
+                upload(models, output_dir, auth_token, repo_prefix)
+
+
+@app.command()
+def upload(
+    models: list[str] = typer.Argument(
+        ..., help="The model(s) to be uploaded. Model names should be the same as used in the associated library."
+    ),
+    output_dir: Optional[Path] = typer.Option(
+        None,
+        "--output-dir",
+        "-o",
+        help="Directory where exported models will be stored. Defaults to a temporary directory.",
+    ),
+    auth_token: Optional[str] = typer.Option(
+        os.environ.get("HF_AUTH_TOKEN", None),
+        "--auth_token",
+        "-t",
+        help="The Hugging Face auth token of the user or organisation.",
+    ),
+    repo_prefix: str = typer.Option(
+        "immich-app",
+        "--repo_prefix",
+        "-p",
+        help="The name to put before the model name to form the Hugging Face repo name. Can be a username or organisation.",
+    ),
+) -> None:
+    if not models:
+        raise ValueError("No models specified")
+
+    with Progress() as progress:
+        task2 = progress.add_task("[yellow]Uploading models...", total=len(models))
+        for model_name in models:
+            cleaned_name = clean_name(model_name)
+            repo_id = f"{repo_prefix}/{cleaned_name}"
+            model_dir = output_dir / cleaned_name
+
+            progress.update(task2, description=f"[yellow]Uploading {cleaned_name}")
+            _upload(repo_id, model_dir, auth_token)
+            progress.update(task2, advance=1, description=f"[yellow]Uploaded {cleaned_name}")
+
+
+if __name__ == "__main__":
+    app()
--- a/mobile/android/fastlane/report.xml
+++ b/mobile/android/fastlane/report.xml
@@ -5,17 +5,17 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000625">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000244">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="70.943413">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="67.0562">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="30.374484">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="33.087498">
        
      </testcase>
    
--- a/mobile/assets/i18n/en-US.json
+++ b/mobile/assets/i18n/en-US.json
@@ -114,7 +114,7 @@
  "cache_settings_thumbnail_size": "Thumbnail cache size ({} assets)",
  "cache_settings_title": "Caching Settings",
  "change_password_form_confirm_password": "Confirm Password",
-  "change_password_form_description": "Hi {firstName} {lastName},\n\nThis is either the first time you are signing into the system or a request has been made to change your password. Please enter the new password below.",
+  "change_password_form_description": "Hi {name},\n\nThis is either the first time you are signing into the system or a request has been made to change your password. Please enter the new password below.",
  "change_password_form_new_password": "New Password",
  "change_password_form_password_mismatch": "Passwords do not match",
  "change_password_form_reenter_new_password": "Re-enter New Password",
@@ -316,6 +316,7 @@
  "shared_link_edit_description": "Description",
  "shared_link_edit_description_hint": "Enter the share description",
  "shared_link_edit_password": "Password",
+  "shared_link_edit_expire_after": "Expire after",
  "shared_link_edit_password_hint": "Enter the share password",
  "shared_link_edit_show_meta": "Show metadata",
  "shared_link_edit_submit_button": "Update link",
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -169,4 +169,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 599d8aeb73728400c15364e734525722250a5382

-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -379,7 +379,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 125;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -515,7 +515,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 125;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -543,7 +543,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 125;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -59,11 +59,11 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.84.0</string>
+    <string>1.85.0</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>124</string>
+    <string>125</string>
    <key>FLTEnableImpeller</key>
    <true />
    <key>ITSAppUsesNonExemptEncryption</key>
--- a/mobile/ios/fastlane/report.xml
+++ b/mobile/ios/fastlane/report.xml
@@ -5,32 +5,32 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000253">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000291">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.181977">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.199372">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="16.12614">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="6.104477">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.162663">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.164465">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="4: build_app" time="145.399278">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="108.828838">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="61.317235">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="60.89387">
        
      </testcase>
    
--- a/mobile/lib/extensions/build_context_extensions.dart
+++ b/mobile/lib/extensions/build_context_extensions.dart
@@ -0,0 +1,54 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+
+extension ContextHelper on BuildContext {
+  // Returns the current size from MediaQuery
+  Size get size => MediaQuery.sizeOf(this);
+
+  // Returns the current width from MediaQuery
+  double get width => size.width;
+
+  // Returns the current height from MediaQuery
+  double get height => size.height;
+
+  // Returns true if the app is running on a mobile device (!tablets)
+  bool get isMobile => width < 550;
+
+  // Returns the current ThemeData
+  ThemeData get themeData => Theme.of(this);
+
+  // Returns true if the app is using a dark theme
+  bool get isDarkTheme => themeData.brightness == Brightness.dark;
+
+  // Returns the current Primary color of the Theme
+  Color get primaryColor => themeData.primaryColor;
+
+  // Returns the Scaffold background color of the Theme
+  Color get scaffoldBackgroundColor => themeData.scaffoldBackgroundColor;
+
+  // Returns the current TextTheme
+  TextTheme get textTheme => themeData.textTheme;
+
+  // Current ColorScheme used
+  ColorScheme get colorScheme => themeData.colorScheme;
+
+  // Pop-out from the current context with optional result
+  void pop<T>([T? result]) => Navigator.of(this).pop(result);
+
+  // Auto-Push new route from the current context
+  Future<T?> autoPush<T extends Object?>(PageRouteInfo<dynamic> route) =>
+      AutoRouter.of(this).push(route);
+
+  // Auto-Push navigate route from the current context
+  Future<dynamic> autoNavigate<T extends Object?>(
+    PageRouteInfo<dynamic> route,
+  ) =>
+      AutoRouter.of(this).navigate(route);
+
+// Auto-Push replace route from the current context
+  Future<T?> autoReplace<T extends Object?>(PageRouteInfo<dynamic> route) =>
+      AutoRouter.of(this).replace(route);
+
+  // Auto-Pop from the current context
+  Future<bool> autoPop<T>([T? result]) => AutoRouter.of(this).pop(result);
+}
--- a/mobile/lib/extensions/collection_extensions.dart
+++ b/mobile/lib/extensions/collection_extensions.dart
@@ -2,27 +2,6 @@ import 'dart:typed_data';

 import 'package:collection/collection.dart';

-extension DurationExtension on String {
-  Duration? toDuration() {
-    try {
-      final parts = split(':')
-          .map((e) => double.parse(e).toInt())
-          .toList(growable: false);
-      return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
-    } catch (e) {
-      return null;
-    }
-  }
-
-  double toDouble() {
-    return double.parse(this);
-  }
-
-  int toInt() {
-    return int.parse(this);
-  }
-}
-
 extension ListExtension<E> on List<E> {
  List<E> uniqueConsecutive({
    int Function(E a, E b)? compare,
--- a/mobile/lib/extensions/datetime_extensions.dart
+++ b/mobile/lib/extensions/datetime_extensions.dart
--- a/mobile/lib/extensions/flutter_map_extensions.dart
+++ b/mobile/lib/extensions/flutter_map_extensions.dart
--- a/mobile/lib/extensions/string_extensions.dart
+++ b/mobile/lib/extensions/string_extensions.dart
@@ -0,0 +1,30 @@
+extension StringExtension on String {
+  String capitalize() {
+    return split(" ")
+        .map(
+          (str) => str.isEmpty ? str : str[0].toUpperCase() + str.substring(1),
+        )
+        .join(" ");
+  }
+}
+
+extension DurationExtension on String {
+  Duration? toDuration() {
+    try {
+      final parts = split(':')
+          .map((e) => double.parse(e).toInt())
+          .toList(growable: false);
+      return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
+    } catch (e) {
+      return null;
+    }
+  }
+
+  double toDouble() {
+    return double.parse(this);
+  }
+
+  int toInt() {
+    return int.parse(this);
+  }
+}
--- a/mobile/lib/modules/activities/models/activity.model.dart
+++ b/mobile/lib/modules/activities/models/activity.model.dart
@@ -48,8 +48,7 @@ class Activity {
            : ActivityType.like,
        user = User(
          email: dto.user.email,
-          firstName: dto.user.firstName,
-          lastName: dto.user.lastName,
+          name: dto.user.name,
          profileImagePath: dto.user.profileImagePath,
          id: dto.user.id,
          // Placeholder values
--- a/mobile/lib/modules/activities/views/activities_page.dart
+++ b/mobile/lib/modules/activities/views/activities_page.dart
@@ -4,13 +4,14 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/activities/models/activity.model.dart';
 import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/ui/confirm_dialog.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';
-import 'package:immich_mobile/utils/datetime_extensions.dart';
+import 'package:immich_mobile/extensions/datetime_extensions.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';

 class ActivitiesPage extends HookConsumerWidget {
@@ -49,12 +50,8 @@ class ActivitiesPage extends HookConsumerWidget {
    );

    buildTitleWithTimestamp(Activity activity, {bool leftAlign = true}) {
-      final textColor = Theme.of(context).brightness == Brightness.dark
-          ? Colors.white
-          : Colors.black;
-      final textStyle = Theme.of(context)
-          .textTheme
-          .bodyMedium
+      final textColor = context.isDarkTheme ? Colors.white : Colors.black;
+      final textStyle = context.textTheme.bodyMedium
          ?.copyWith(color: textColor.withOpacity(0.6));

      return Row(
@@ -64,7 +61,7 @@ class ActivitiesPage extends HookConsumerWidget {
        mainAxisSize: leftAlign ? MainAxisSize.min : MainAxisSize.max,
        children: [
          Text(
-            "${activity.user.firstName} ${activity.user.lastName}",
+            activity.user.name,
            style: textStyle,
            overflow: TextOverflow.ellipsis,
          ),
@@ -306,7 +303,7 @@ class ActivitiesPage extends HookConsumerWidget {
                Align(
                  alignment: Alignment.bottomCenter,
                  child: Container(
-                    color: Theme.of(context).scaffoldBackgroundColor,
+                    color: context.scaffoldBackgroundColor,
                    child: buildTextField(liked?.id),
                  ),
                ),
--- a/mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart
+++ b/mobile/lib/modules/album/ui/add_to_album_bottom_sheet.dart
@@ -1,8 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
@@ -95,20 +95,19 @@ class AddToAlbumBottomSheet extends HookConsumerWidget {
                    children: [
                      Text(
                        'common_add_to_album'.tr(),
-                        style: Theme.of(context).textTheme.displayMedium,
+                        style: context.textTheme.displayMedium,
                      ),
                      TextButton.icon(
                        icon: Icon(
                          Icons.add,
-                          color: Theme.of(context).primaryColor,
+                          color: context.primaryColor,
                        ),
                        label: Text(
                          'common_create_new_album'.tr(),
-                          style:
-                              TextStyle(color: Theme.of(context).primaryColor),
+                          style: TextStyle(color: context.primaryColor),
                        ),
                        onPressed: () {
-                          AutoRouter.of(context).push(
+                          context.autoPush(
                            CreateAlbumRoute(
                              isSharedAlbum: false,
                              initialAssets: assets,
--- a/mobile/lib/modules/album/ui/album_action_outlined_button.dart
+++ b/mobile/lib/modules/album/ui/album_action_outlined_button.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';

 class AlbumActionOutlinedButton extends StatelessWidget {
  final VoidCallback? onPressed;
@@ -14,8 +15,6 @@ class AlbumActionOutlinedButton extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-
    return Padding(
      padding: const EdgeInsets.only(right: 8.0),
      child: OutlinedButton.icon(
@@ -26,7 +25,7 @@ class AlbumActionOutlinedButton extends StatelessWidget {
          ),
          side: BorderSide(
            width: 1,
-            color: isDarkTheme
+            color: context.isDarkTheme
                ? const Color.fromARGB(255, 63, 63, 63)
                : const Color.fromARGB(255, 206, 206, 206),
          ),
@@ -34,13 +33,13 @@ class AlbumActionOutlinedButton extends StatelessWidget {
        icon: Icon(
          iconData,
          size: 15,
-          color: Theme.of(context).primaryColor,
+          color: context.primaryColor,
        ),
        label: Text(
          labelText,
-          style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                fontWeight: FontWeight.bold,
-              ),
+          style: context.textTheme.labelSmall?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
        ),
        onPressed: onPressed,
      ),
--- a/mobile/lib/modules/album/ui/album_thumbnail_card.dart
+++ b/mobile/lib/modules/album/ui/album_thumbnail_card.dart
@@ -1,5 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
@@ -22,7 +23,8 @@ class AlbumThumbnailCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
+    var isDarkTheme = context.isDarkTheme;
+
    return LayoutBuilder(
      builder: (context, constraints) {
        var cardSize = constraints.maxWidth;
@@ -32,7 +34,7 @@ class AlbumThumbnailCard extends StatelessWidget {
            height: cardSize,
            width: cardSize,
            decoration: BoxDecoration(
-              color: isDarkMode ? Colors.grey[800] : Colors.grey[200],
+              color: isDarkTheme ? Colors.grey[800] : Colors.grey[200],
            ),
            child: Center(
              child: Icon(
@@ -73,14 +75,14 @@ class AlbumThumbnailCard extends StatelessWidget {
                  style: TextStyle(
                    fontFamily: 'WorkSans',
                    fontSize: 12,
-                    color: isDarkMode ? Colors.white : Colors.black,
+                    color: isDarkTheme ? Colors.white : Colors.black,
                  ),
                ),
                if (owner != null) const TextSpan(text: ' · '),
                if (owner != null)
                  TextSpan(
                    text: owner,
-                    style: Theme.of(context).textTheme.labelSmall,
+                    style: context.textTheme.labelSmall,
                  ),
              ],
            ),
@@ -114,8 +116,8 @@ class AlbumThumbnailCard extends StatelessWidget {
                          album.name,
                          style: TextStyle(
                            fontWeight: FontWeight.bold,
-                            color: isDarkMode
-                                ? Theme.of(context).primaryColor
+                            color: isDarkTheme
+                                ? context.primaryColor
                                : Colors.black,
                          ),
                        ),
--- a/mobile/lib/modules/album/ui/album_thumbnail_listtile.dart
+++ b/mobile/lib/modules/album/ui/album_thumbnail_listtile.dart
@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/store.dart';
@@ -21,12 +21,11 @@ class AlbumThumbnailListTile extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    var cardSize = 68.0;
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;

    buildEmptyThumbnail() {
      return Container(
        decoration: BoxDecoration(
-          color: isDarkMode ? Colors.grey[800] : Colors.grey[200],
+          color: context.isDarkTheme ? Colors.grey[800] : Colors.grey[200],
        ),
        child: SizedBox(
          height: cardSize,
@@ -61,7 +60,7 @@ class AlbumThumbnailListTile extends StatelessWidget {
      behavior: HitTestBehavior.opaque,
      onTap: onTap ??
          () {
-            AutoRouter.of(context).push(AlbumViewerRoute(albumId: album.id));
+            context.autoPush(AlbumViewerRoute(albumId: album.id));
          },
      child: Padding(
        padding: const EdgeInsets.only(bottom: 12.0),
--- a/mobile/lib/modules/album/ui/album_title_text_field.dart
+++ b/mobile/lib/modules/album/ui/album_title_text_field.dart
@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album_title.provider.dart';

 class AlbumTitleTextField extends ConsumerWidget {
@@ -19,7 +20,7 @@ class AlbumTitleTextField extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
+    final isDarkTheme = context.isDarkTheme;

    return TextField(
      onChanged: (v) {
@@ -55,7 +56,7 @@ class AlbumTitleTextField extends ConsumerWidget {
                },
                icon: Icon(
                  Icons.cancel_rounded,
-                  color: Theme.of(context).primaryColor,
+                  color: context.primaryColor,
                ),
                splashRadius: 10,
              )
--- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart
+++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
@@ -58,12 +58,12 @@ class AlbumViewerAppbar extends HookConsumerWidget
      if (album.shared) {
        success =
            await ref.watch(sharedAlbumProvider.notifier).deleteAlbum(album);
-        AutoRouter.of(context)
-            .navigate(const TabControllerRoute(children: [SharingRoute()]));
+        context
+            .autoNavigate(const TabControllerRoute(children: [SharingRoute()]));
      } else {
        success = await ref.watch(albumProvider.notifier).deleteAlbum(album);
-        AutoRouter.of(context)
-            .navigate(const TabControllerRoute(children: [LibraryRoute()]));
+        context
+            .autoNavigate(const TabControllerRoute(children: [LibraryRoute()]));
      }
      if (!success) {
        ImmichToast.show(
@@ -93,7 +93,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
                child: Text(
                  'Cancel',
                  style: TextStyle(
-                    color: Theme.of(context).primaryColor,
+                    color: context.primaryColor,
                    fontWeight: FontWeight.bold,
                  ),
                ),
@@ -107,9 +107,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
                  'Confirm',
                  style: TextStyle(
                    fontWeight: FontWeight.bold,
-                    color: Theme.of(context).brightness == Brightness.light
-                        ? Colors.red
-                        : Colors.red[300],
+                    color: !context.isDarkTheme ? Colors.red : Colors.red[300],
                  ),
                ),
              ),
@@ -130,8 +128,8 @@ class AlbumViewerAppbar extends HookConsumerWidget
          await ref.watch(sharedAlbumProvider.notifier).leaveAlbum(album);

      if (isSuccess) {
-        AutoRouter.of(context)
-            .navigate(const TabControllerRoute(children: [SharingRoute()]));
+        context
+            .autoNavigate(const TabControllerRoute(children: [SharingRoute()]));
      } else {
        Navigator.pop(context);
        ImmichToast.show(
@@ -190,7 +188,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
                  gravity: ToastGravity.BOTTOM,
                );
              }
-              Navigator.of(buildContext).pop();
+              context.pop();
            },
          );
          return const ShareDialog();
@@ -266,8 +264,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
        ListTile(
          leading: const Icon(Icons.share_rounded),
          onTap: () {
-            AutoRouter.of(context)
-                .push(SharedLinkEditRoute(albumId: album.remoteId));
+            context.autoPush(SharedLinkEditRoute(albumId: album.remoteId));
            Navigator.pop(context);
          },
          title: const Text(
@@ -277,8 +274,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
        ),
        ListTile(
          leading: const Icon(Icons.settings_rounded),
-          onTap: () =>
-              AutoRouter.of(context).navigate(AlbumOptionsRoute(album: album)),
+          onTap: () => context.autoNavigate(AlbumOptionsRoute(album: album)),
          title: const Text(
            "translated_text_options",
            style: TextStyle(fontWeight: FontWeight.bold),
@@ -300,7 +296,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
        ),
      ];
      showModalBottomSheet(
-        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        backgroundColor: context.scaffoldBackgroundColor,
        isScrollControlled: false,
        context: context,
        builder: (context) {
@@ -342,7 +338,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
                  comments.toString(),
                  style: TextStyle(
                    fontWeight: FontWeight.bold,
-                    color: Theme.of(context).primaryColor,
+                    color: context.primaryColor,
                  ),
                ),
              ),
@@ -381,7 +377,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
        );
      } else {
        return IconButton(
-          onPressed: () async => await AutoRouter.of(context).pop(),
+          onPressed: () async => await context.autoPop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
          splashRadius: 25,
        );
--- a/mobile/lib/modules/album/ui/album_viewer_editable_title.dart
+++ b/mobile/lib/modules/album/ui/album_viewer_editable_title.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album_viewer.provider.dart';
 import 'package:immich_mobile/shared/models/album.dart';

@@ -17,7 +18,6 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final titleTextEditController = useTextEditingController(text: album.name);
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;

    void onFocusModeChange() {
      if (!titleFocusNode.hasFocus && titleTextEditController.text.isEmpty) {
@@ -65,7 +65,7 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
                },
                icon: Icon(
                  Icons.cancel_rounded,
-                  color: Theme.of(context).primaryColor,
+                  color: context.primaryColor,
                ),
                splashRadius: 10,
              )
@@ -79,14 +79,14 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
          borderRadius: BorderRadius.circular(10),
        ),
        focusColor: Colors.grey[300],
-        fillColor: isDarkTheme
+        fillColor: context.isDarkTheme
            ? const Color.fromARGB(255, 32, 33, 35)
            : Colors.grey[200],
        filled: titleFocusNode.hasFocus,
        hintText: 'share_add_title'.tr(),
        hintStyle: TextStyle(
          fontSize: 28,
-          color: isDarkTheme ? Colors.grey[300] : Colors.grey[700],
+          color: context.isDarkTheme ? Colors.grey[300] : Colors.grey[700],
          fontWeight: FontWeight.bold,
        ),
      ),
--- a/mobile/lib/modules/album/views/album_options_part.dart
+++ b/mobile/lib/modules/album/views/album_options_part.dart
@@ -1,9 +1,9 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -44,8 +44,9 @@ class AlbumOptionsPage extends HookConsumerWidget {
            await ref.read(sharedAlbumProvider.notifier).leaveAlbum(album);

        if (isSuccess) {
-          AutoRouter.of(context)
-              .navigate(const TabControllerRoute(children: [SharingRoute()]));
+          context.autoNavigate(
+            const TabControllerRoute(children: [SharingRoute()]),
+          );
        } else {
          showErrorMessage();
        }
@@ -97,7 +98,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
      }

      showModalBottomSheet(
-        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        backgroundColor: context.scaffoldBackgroundColor,
        isScrollControlled: false,
        context: context,
        builder: (context) {
@@ -123,7 +124,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
              )
            : const SizedBox(),
        title: Text(
-          album.owner.value?.firstName ?? "",
+          album.owner.value?.name ?? "",
          style: const TextStyle(
            fontWeight: FontWeight.bold,
          ),
@@ -154,7 +155,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
              radius: 22,
            ),
            title: Text(
-              user.firstName,
+              user.name,
              style: const TextStyle(
                fontWeight: FontWeight.bold,
              ),
@@ -177,7 +178,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
    buildSectionTitle(String text) {
      return Padding(
        padding: const EdgeInsets.all(16.0),
-        child: Text(text, style: Theme.of(context).textTheme.bodySmall),
+        child: Text(text, style: context.textTheme.bodySmall),
      );
    }

@@ -186,7 +187,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_ios_new_rounded),
          onPressed: () {
-            AutoRouter.of(context).pop(null);
+            context.autoPop(null);
          },
        ),
        centerTitle: true,
@@ -208,14 +209,12 @@ class AlbumOptionsPage extends HookConsumerWidget {
                }
              },
              activeColor: activityEnabled.value
-                  ? Theme.of(context).primaryColor
-                  : Theme.of(context).disabledColor,
+                  ? context.primaryColor
+                  : context.themeData.disabledColor,
              dense: true,
              title: Text(
                "shared_album_activity_setting_title",
-                style: Theme.of(context)
-                    .textTheme
-                    .labelLarge
+                style: context.textTheme.labelLarge
                    ?.copyWith(fontWeight: FontWeight.bold),
              ).tr(),
              subtitle:
--- a/mobile/lib/modules/album/views/album_viewer_page.dart
+++ b/mobile/lib/modules/album/views/album_viewer_page.dart
@@ -1,10 +1,10 @@
 import 'dart:async';

-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
 import 'package:immich_mobile/modules/album/services/album.service.dart';
@@ -67,7 +67,7 @@ class AlbumViewerPage extends HookConsumerWidget {
    /// If they exist, add to selected asset state to show they are already selected.
    void onAddPhotosPressed(Album albumInfo) async {
      AssetSelectionPageResult? returnPayload =
-          await AutoRouter.of(context).push<AssetSelectionPageResult?>(
+          await context.autoPush<AssetSelectionPageResult?>(
        AssetSelectionRoute(
          existingAssets: albumInfo.assets,
          canDeselect: false,
@@ -97,8 +97,7 @@ class AlbumViewerPage extends HookConsumerWidget {
    }

    void onAddUsersPressed(Album album) async {
-      List<String>? sharedUserIds =
-          await AutoRouter.of(context).push<List<String>?>(
+      List<String>? sharedUserIds = await context.autoPush<List<String>?>(
        SelectAdditionalUserForSharingRoute(album: album),
      );

@@ -171,11 +170,19 @@ class AlbumViewerPage extends HookConsumerWidget {
        return const SizedBox();
      }

-      final String startDateText = (startDate.year == endDate.year
-              ? DateFormat.MMMd()
-              : DateFormat.yMMMd())
-          .format(startDate);
-      final String endDateText = DateFormat.yMMMd().format(endDate);
+      final String dateRangeText;
+      if (startDate.day == endDate.day &&
+          startDate.month == endDate.month &&
+          startDate.year == endDate.year) {
+        dateRangeText = DateFormat.yMMMd().format(startDate);
+      } else {
+        final String startDateText = (startDate.year == endDate.year
+                ? DateFormat.MMMd()
+                : DateFormat.yMMMd())
+            .format(startDate);
+        final String endDateText = DateFormat.yMMMd().format(endDate);
+        dateRangeText = "$startDateText - $endDateText";
+      }

      return Padding(
        padding: EdgeInsets.only(
@@ -183,7 +190,7 @@ class AlbumViewerPage extends HookConsumerWidget {
          bottom: album.shared ? 0.0 : 8.0,
        ),
        child: Text(
-          "$startDateText - $endDateText",
+          dateRangeText,
          style: const TextStyle(
            fontSize: 14,
            fontWeight: FontWeight.bold,
@@ -195,7 +202,7 @@ class AlbumViewerPage extends HookConsumerWidget {
    Widget buildSharedUserIconsRow(Album album) {
      return GestureDetector(
        onTap: () async {
-          await AutoRouter.of(context).push(AlbumOptionsRoute(album: album));
+          await context.autoPush(AlbumOptionsRoute(album: album));
          ref.invalidate(albumDetailProvider(album.id));
        },
        child: SizedBox(
@@ -234,7 +241,7 @@ class AlbumViewerPage extends HookConsumerWidget {

    onActivitiesPressed(Album album) {
      if (album.remoteId != null) {
-        AutoRouter.of(context).push(
+        context.autoPush(
          ActivitiesRoute(
            albumId: album.remoteId!,
            appBarTitle: album.name,
--- a/mobile/lib/modules/album/views/asset_selection_page.dart
+++ b/mobile/lib/modules/album/views/asset_selection_page.dart
@@ -3,6 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
@@ -78,7 +79,7 @@ class AssetSelectionPage extends HookConsumerWidget {
                canDeselect ? "share_done" : "share_add",
                style: TextStyle(
                  fontWeight: FontWeight.bold,
-                  color: Theme.of(context).primaryColor,
+                  color: context.primaryColor,
                ),
              ).tr(),
            ),
--- a/mobile/lib/modules/album/views/create_album_page.dart
+++ b/mobile/lib/modules/album/views/create_album_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_title.provider.dart';
@@ -34,11 +34,11 @@ class CreateAlbumPage extends HookConsumerWidget {
    final selectedAssets = useState<Set<Asset>>(
      initialAssets != null ? Set.from(initialAssets!) : const {},
    );
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;

    showSelectUserPage() async {
-      final bool? ok = await AutoRouter.of(context)
-          .push<bool?>(SelectUserForSharingRoute(assets: selectedAssets.value));
+      final bool? ok = await context.autoPush<bool?>(
+        SelectUserForSharingRoute(assets: selectedAssets.value),
+      );
      if (ok == true) {
        selectedAssets.value = {};
      }
@@ -58,7 +58,7 @@ class CreateAlbumPage extends HookConsumerWidget {

    onSelectPhotosButtonPressed() async {
      AssetSelectionPageResult? selectedAsset =
-          await AutoRouter.of(context).push<AssetSelectionPageResult?>(
+          await context.autoPush<AssetSelectionPageResult?>(
        AssetSelectionRoute(
          existingAssets: selectedAssets.value,
          canDeselect: true,
@@ -94,10 +94,10 @@ class CreateAlbumPage extends HookConsumerWidget {
            padding: const EdgeInsets.only(top: 200, left: 18),
            child: Text(
              'create_shared_album_page_share_add_assets',
-              style: Theme.of(context).textTheme.displayMedium?.copyWith(
-                    fontSize: 12,
-                    fontWeight: FontWeight.normal,
-                  ),
+              style: context.textTheme.displayMedium?.copyWith(
+                fontSize: 12,
+                fontWeight: FontWeight.normal,
+              ),
            ).tr(),
          ),
        );
@@ -117,7 +117,7 @@ class CreateAlbumPage extends HookConsumerWidget {
                padding:
                    const EdgeInsets.symmetric(vertical: 22, horizontal: 16),
                side: BorderSide(
-                  color: isDarkTheme
+                  color: context.isDarkTheme
                      ? const Color.fromARGB(255, 63, 63, 63)
                      : const Color.fromARGB(255, 206, 206, 206),
                ),
@@ -128,16 +128,16 @@ class CreateAlbumPage extends HookConsumerWidget {
              onPressed: onSelectPhotosButtonPressed,
              icon: Icon(
                Icons.add_rounded,
-                color: Theme.of(context).primaryColor,
+                color: context.primaryColor,
              ),
              label: Padding(
                padding: const EdgeInsets.only(left: 8.0),
                child: Text(
                  'create_shared_album_page_share_select_photos',
-                  style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.bold,
-                      ),
+                  style: context.textTheme.labelLarge?.copyWith(
+                    fontSize: 16,
+                    fontWeight: FontWeight.bold,
+                  ),
                ).tr(),
              ),
            ),
@@ -206,7 +206,7 @@ class CreateAlbumPage extends HookConsumerWidget {
        selectedAssets.value = {};
        ref.watch(albumTitleProvider.notifier).clearAlbumTitle();

-        AutoRouter.of(context).replace(AlbumViewerRoute(albumId: newAlbum.id));
+        context.autoReplace(AlbumViewerRoute(albumId: newAlbum.id));
      }
    }

@@ -214,19 +214,19 @@ class CreateAlbumPage extends HookConsumerWidget {
      appBar: AppBar(
        elevation: 0,
        centerTitle: false,
-        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        backgroundColor: context.scaffoldBackgroundColor,
        leading: IconButton(
          onPressed: () {
            selectedAssets.value = {};
-            AutoRouter.of(context).pop();
+            context.autoPop();
          },
          icon: const Icon(Icons.close_rounded),
        ),
        title: Text(
          'share_create_album',
-          style: Theme.of(context).textTheme.displayMedium?.copyWith(
-                color: Theme.of(context).primaryColor,
-              ),
+          style: context.textTheme.displayMedium?.copyWith(
+            color: context.primaryColor,
+          ),
        ).tr(),
        actions: [
          if (isSharedAlbum)
@@ -239,8 +239,8 @@ class CreateAlbumPage extends HookConsumerWidget {
                style: TextStyle(
                  fontWeight: FontWeight.bold,
                  color: albumTitleController.text.isEmpty
-                      ? Theme.of(context).disabledColor
-                      : Theme.of(context).primaryColor,
+                      ? context.themeData.disabledColor
+                      : context.primaryColor,
                ),
              ),
            ),
@@ -254,7 +254,7 @@ class CreateAlbumPage extends HookConsumerWidget {
                'create_shared_album_page_create'.tr(),
                style: TextStyle(
                  fontWeight: FontWeight.bold,
-                  color: Theme.of(context).primaryColor,
+                  color: context.primaryColor,
                ),
              ),
            ),
@@ -265,7 +265,7 @@ class CreateAlbumPage extends HookConsumerWidget {
        child: CustomScrollView(
          slivers: [
            SliverAppBar(
-              backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+              backgroundColor: context.scaffoldBackgroundColor,
              elevation: 5,
              automaticallyImplyLeading: false,
              pinned: true,
--- a/mobile/lib/modules/album/views/library_page.dart
+++ b/mobile/lib/modules/album/views/library_page.dart
@@ -1,9 +1,9 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/ui/album_thumbnail_card.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -21,7 +21,7 @@ class LibraryPage extends HookConsumerWidget {
    final trashEnabled =
        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
    final albums = ref.watch(albumProvider);
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
+    var isDarkTheme = context.isDarkTheme;
    var settings = ref.watch(appSettingsServiceProvider);

    useEffect(
@@ -96,15 +96,14 @@ class LibraryPage extends HookConsumerWidget {
                    padding: const EdgeInsets.only(right: 12.0),
                    child: Icon(
                      Icons.check,
-                      color: selected
-                          ? Theme.of(context).primaryColor
-                          : Colors.transparent,
+                      color:
+                          selected ? context.primaryColor : Colors.transparent,
                    ),
                  ),
                  Text(
                    option,
                    style: TextStyle(
-                      color: selected ? Theme.of(context).primaryColor : null,
+                      color: selected ? context.primaryColor : null,
                      fontSize: 12.0,
                    ),
                  ),
@@ -122,13 +121,13 @@ class LibraryPage extends HookConsumerWidget {
            Icon(
              Icons.swap_vert_rounded,
              size: 18,
-              color: Theme.of(context).primaryColor,
+              color: context.primaryColor,
            ),
            Text(
              options[selectedAlbumSortOrder.value],
              style: TextStyle(
                fontWeight: FontWeight.bold,
-                color: Theme.of(context).primaryColor,
+                color: context.primaryColor,
                fontSize: 12.0,
              ),
            ),
@@ -140,7 +139,7 @@ class LibraryPage extends HookConsumerWidget {
    Widget buildCreateAlbumButton() {
      return GestureDetector(
        onTap: () {
-          AutoRouter.of(context).push(CreateAlbumRoute(isSharedAlbum: false));
+          context.autoPush(CreateAlbumRoute(isSharedAlbum: false));
        },
        child: Padding(
          padding: const EdgeInsets.only(bottom: 32),
@@ -152,18 +151,18 @@ class LibraryPage extends HookConsumerWidget {
                child: Container(
                  decoration: BoxDecoration(
                    border: Border.all(
-                      color: isDarkMode
+                      color: isDarkTheme
                          ? const Color.fromARGB(255, 53, 53, 53)
                          : const Color.fromARGB(255, 203, 203, 203),
                    ),
-                    color: isDarkMode ? Colors.grey[900] : Colors.grey[50],
+                    color: isDarkTheme ? Colors.grey[900] : Colors.grey[50],
                    borderRadius: BorderRadius.circular(20),
                  ),
                  child: Center(
                    child: Icon(
                      Icons.add_rounded,
                      size: 28,
-                      color: Theme.of(context).primaryColor,
+                      color: context.primaryColor,
                    ),
                  ),
                ),
@@ -201,21 +200,21 @@ class LibraryPage extends HookConsumerWidget {
              style: TextStyle(
                fontWeight: FontWeight.bold,
                fontSize: 13.0,
-                color: isDarkMode ? Colors.white : Colors.grey[800],
+                color: isDarkTheme ? Colors.white : Colors.grey[800],
              ),
            ),
          ),
          style: OutlinedButton.styleFrom(
            padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
-            backgroundColor: isDarkMode ? Colors.grey[900] : Colors.grey[50],
+            backgroundColor: isDarkTheme ? Colors.grey[900] : Colors.grey[50],
            side: BorderSide(
-              color: isDarkMode ? Colors.grey[800]! : Colors.grey[300]!,
+              color: isDarkTheme ? Colors.grey[800]! : Colors.grey[300]!,
            ),
            alignment: Alignment.centerLeft,
          ),
          icon: Icon(
            icon,
-            color: Theme.of(context).primaryColor,
+            color: context.primaryColor,
          ),
        ),
      );
@@ -228,7 +227,7 @@ class LibraryPage extends HookConsumerWidget {
    Widget? shareTrashButton() {
      return trashEnabled
          ? InkWell(
-              onTap: () => AutoRouter.of(context).push(const TrashRoute()),
+              onTap: () => context.autoPush(const TrashRoute()),
              borderRadius: BorderRadius.circular(12),
              child: const Icon(
                Icons.delete_rounded,
@@ -257,12 +256,12 @@ class LibraryPage extends HookConsumerWidget {
                children: [
                  buildLibraryNavButton(
                      "library_page_favorites".tr(), Icons.favorite_border, () {
-                    AutoRouter.of(context).navigate(const FavoritesRoute());
+                    context.autoNavigate(const FavoritesRoute());
                  }),
                  const SizedBox(width: 12.0),
                  buildLibraryNavButton(
                      "library_page_archive".tr(), Icons.archive_outlined, () {
-                    AutoRouter.of(context).navigate(const ArchiveRoute());
+                    context.autoNavigate(const ArchiveRoute());
                  }),
                ],
              ),
@@ -306,7 +305,7 @@ class LibraryPage extends HookConsumerWidget {

                  return AlbumThumbnailCard(
                    album: sorted[index - 1],
-                    onTap: () => AutoRouter.of(context).push(
+                    onTap: () => context.autoPush(
                      AlbumViewerRoute(
                        albumId: sorted[index - 1].id,
                      ),
@@ -348,7 +347,7 @@ class LibraryPage extends HookConsumerWidget {
                childCount: local.length,
                (context, index) => AlbumThumbnailCard(
                  album: local[index],
-                  onTap: () => AutoRouter.of(context).push(
+                  onTap: () => context.autoPush(
                    AlbumViewerRoute(
                      albumId: local[index].id,
                    ),
--- a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/suggested_shared_users.provider.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/user.dart';
@@ -22,14 +22,13 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
    final sharedUsersList = useState<Set<User>>({});

    addNewUsersHandler() {
-      AutoRouter.of(context)
-          .pop(sharedUsersList.value.map((e) => e.id).toList());
+      context.autoPop(sharedUsersList.value.map((e) => e.id).toList());
    }

    buildTileIcon(User user) {
      if (sharedUsersList.value.contains(user)) {
        return CircleAvatar(
-          backgroundColor: Theme.of(context).primaryColor,
+          backgroundColor: context.primaryColor,
          child: const Icon(
            Icons.check_rounded,
            size: 25,
@@ -50,7 +49,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
          Padding(
            padding: const EdgeInsets.symmetric(horizontal: 8.0),
            child: Chip(
-              backgroundColor: Theme.of(context).primaryColor.withOpacity(0.15),
+              backgroundColor: context.primaryColor.withOpacity(0.15),
              label: Text(
                user.email,
                style: const TextStyle(
@@ -124,7 +123,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
        leading: IconButton(
          icon: const Icon(Icons.close_rounded),
          onPressed: () {
-            AutoRouter.of(context).pop(null);
+            context.autoPop(null);
          },
        ),
        actions: [
--- a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album_title.provider.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/suggested_shared_users.provider.dart';
@@ -35,9 +35,9 @@ class SelectUserForSharingPage extends HookConsumerWidget {
        await ref.watch(sharedAlbumProvider.notifier).getAllSharedAlbums();
        // ref.watch(assetSelectionProvider.notifier).removeAll();
        ref.watch(albumTitleProvider.notifier).clearAlbumTitle();
-        AutoRouter.of(context).pop(true);
-        AutoRouter.of(context)
-            .navigate(const TabControllerRoute(children: [SharingRoute()]));
+        context.autoPop(true);
+        context
+            .autoNavigate(const TabControllerRoute(children: [SharingRoute()]));
      }

      ScaffoldMessenger(
@@ -50,7 +50,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
    buildTileIcon(User user) {
      if (sharedUsersList.value.contains(user)) {
        return CircleAvatar(
-          backgroundColor: Theme.of(context).primaryColor,
+          backgroundColor: context.primaryColor,
          child: const Icon(
            Icons.check_rounded,
            size: 25,
@@ -71,7 +71,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
          Padding(
            padding: const EdgeInsets.symmetric(horizontal: 8.0),
            child: Chip(
-              backgroundColor: Theme.of(context).primaryColor.withOpacity(0.15),
+              backgroundColor: context.primaryColor.withOpacity(0.15),
              label: Text(
                user.email,
                style: const TextStyle(
@@ -139,20 +139,20 @@ class SelectUserForSharingPage extends HookConsumerWidget {
      appBar: AppBar(
        title: Text(
          'share_invite',
-          style: TextStyle(color: Theme.of(context).primaryColor),
+          style: TextStyle(color: context.primaryColor),
        ).tr(),
        elevation: 0,
        centerTitle: false,
        leading: IconButton(
          icon: const Icon(Icons.close_rounded),
          onPressed: () async {
-            AutoRouter.of(context).pop();
+            context.autoPop();
          },
        ),
        actions: [
          TextButton(
            style: TextButton.styleFrom(
-              foregroundColor: Theme.of(context).primaryColor,
+              foregroundColor: context.primaryColor,
            ),
            onPressed: sharedUsersList.value.isEmpty ? null : createSharedAlbum,
            child: const Text(
@@ -160,7 +160,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
              style: TextStyle(
                fontSize: 14,
                fontWeight: FontWeight.bold,
-                // color: Theme.of(context).primaryColor,
+                // color: context.primaryColor,
              ),
            ).tr(),
          ),
--- a/mobile/lib/modules/album/views/sharing_page.dart
+++ b/mobile/lib/modules/album/views/sharing_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
 import 'package:immich_mobile/modules/album/ui/album_thumbnail_card.dart';
 import 'package:immich_mobile/modules/partner/providers/partner.provider.dart';
@@ -21,7 +21,6 @@ class SharingPage extends HookConsumerWidget {
    final List<Album> sharedAlbums = ref.watch(sharedAlbumProvider);
    final userId = ref.watch(currentUserProvider)?.id;
    final partner = ref.watch(partnerSharedWithProvider);
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;

    useEffect(
      () {
@@ -47,8 +46,9 @@ class SharingPage extends HookConsumerWidget {
                album: sharedAlbums[index],
                showOwner: true,
                onTap: () {
-                  AutoRouter.of(context)
-                      .push(AlbumViewerRoute(albumId: sharedAlbums[index].id));
+                  context.autoPush(
+                    AlbumViewerRoute(albumId: sharedAlbums[index].id),
+                  );
                },
              );
            },
@@ -79,12 +79,11 @@ class SharingPage extends HookConsumerWidget {
                album.name,
                maxLines: 1,
                overflow: TextOverflow.ellipsis,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontWeight: FontWeight.bold,
-                      color: isDarkMode
-                          ? Theme.of(context).primaryColor
-                          : Colors.black,
-                    ),
+                style: context.textTheme.bodyMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  color:
+                      context.isDarkTheme ? context.primaryColor : Colors.black,
+                ),
              ),
              subtitle: isOwner
                  ? Text(
@@ -103,8 +102,9 @@ class SharingPage extends HookConsumerWidget {
                        )
                      : null,
              onTap: () {
-                AutoRouter.of(context)
-                    .push(AlbumViewerRoute(albumId: sharedAlbums[index].id));
+                context.autoPush(
+                  AlbumViewerRoute(albumId: sharedAlbums[index].id),
+                );
              },
            );
          },
@@ -127,8 +127,7 @@ class SharingPage extends HookConsumerWidget {
            Expanded(
              child: ElevatedButton.icon(
                onPressed: () {
-                  AutoRouter.of(context)
-                      .push(CreateAlbumRoute(isSharedAlbum: true));
+                  context.autoPush(CreateAlbumRoute(isSharedAlbum: true));
                },
                icon: const Icon(
                  Icons.photo_album_outlined,
@@ -147,8 +146,7 @@ class SharingPage extends HookConsumerWidget {
            const SizedBox(width: 12.0),
            Expanded(
              child: ElevatedButton.icon(
-                onPressed: () =>
-                    AutoRouter.of(context).push(const SharedLinkRoute()),
+                onPressed: () => context.autoPush(const SharedLinkRoute()),
                icon: const Icon(
                  Icons.link,
                  size: 20,
@@ -191,21 +189,21 @@ class SharingPage extends HookConsumerWidget {
                    child: Icon(
                      Icons.insert_photo_rounded,
                      size: 50,
-                      color: Theme.of(context).primaryColor,
+                      color: context.primaryColor,
                    ),
                  ),
                  Padding(
                    padding: const EdgeInsets.all(8.0),
                    child: Text(
                      'sharing_page_empty_list',
-                      style: Theme.of(context).textTheme.displaySmall,
+                      style: context.textTheme.displaySmall,
                    ).tr(),
                  ),
                  Padding(
                    padding: const EdgeInsets.all(8.0),
                    child: Text(
                      'sharing_page_description',
-                      style: Theme.of(context).textTheme.bodyMedium,
+                      style: context.textTheme.bodyMedium,
                    ).tr(),
                  ),
                ],
@@ -218,7 +216,7 @@ class SharingPage extends HookConsumerWidget {

    Widget sharePartnerButton() {
      return InkWell(
-        onTap: () => AutoRouter.of(context).push(const PartnerRoute()),
+        onTap: () => context.autoPush(const PartnerRoute()),
        borderRadius: BorderRadius.circular(12),
        child: const Icon(
          Icons.swap_horizontal_circle_rounded,
--- a/mobile/lib/modules/archive/views/archive_page.dart
+++ b/mobile/lib/modules/archive/views/archive_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/archive/providers/archive_asset_provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -30,7 +30,7 @@ class ArchivePage extends HookConsumerWidget {
    AppBar buildAppBar(String count) {
      return AppBar(
        leading: IconButton(
-          onPressed: () => AutoRouter.of(context).pop(),
+          onPressed: () => context.autoPop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        centerTitle: true,
--- a/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart
+++ b/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/services/album.service.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/services/image_viewer.service.dart';
@@ -67,7 +68,7 @@ class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
                gravity: ToastGravity.BOTTOM,
              );
            }
-            Navigator.of(buildContext).pop();
+            context.pop();
          },
        );
        return const ShareDialog();
--- a/mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart
+++ b/mobile/lib/modules/asset_viewer/ui/advanced_bottom_sheet.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/shared/models/asset.dart';

 class AdvancedBottomSheet extends HookConsumerWidget {
@@ -11,8 +12,6 @@ class AdvancedBottomSheet extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
-
    return SingleChildScrollView(
      child: Card(
        shape: const RoundedRectangleBorder(
@@ -40,7 +39,9 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                  const SizedBox(height: 32.0),
                  Container(
                    decoration: BoxDecoration(
-                      color: isDarkMode ? Colors.grey[900] : Colors.grey[200],
+                      color: context.isDarkTheme
+                          ? Colors.grey[900]
+                          : Colors.grey[200],
                      borderRadius: BorderRadius.circular(15.0),
                    ),
                    child: Padding(
@@ -70,7 +71,7 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                              icon: Icon(
                                Icons.copy,
                                size: 16.0,
-                                color: Theme.of(context).primaryColor,
+                                color: context.primaryColor,
                              ),
                            ),
                          ),
--- a/mobile/lib/modules/asset_viewer/ui/description_input.dart
+++ b/mobile/lib/modules/asset_viewer/ui/description_input.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/asset_description.provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/user.provider.dart';
@@ -19,8 +20,7 @@ class DescriptionInput extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-    final textColor = isDarkTheme ? Colors.white : Colors.black;
+    final textColor = context.isDarkTheme ? Colors.white : Colors.black;
    final controller = useTextEditingController();
    final focusNode = useFocusNode();
    final isFocus = useState(false);
--- a/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
+++ b/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:timezone/timezone.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/description_input.dart';
 import 'package:immich_mobile/modules/map/ui/map_thumbnail.dart';
@@ -28,7 +29,7 @@ class ExifBottomSheet extends HookConsumerWidget {
      exifInfo.longitude != 0;

  String formatTimeZone(Duration d) =>
-      "GMT${d.isNegative ? '-': '+'}${d.inHours.abs().toString().padLeft(2, '0')}:${d.inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
+      "GMT${d.isNegative ? '-' : '+'}${d.inHours.abs().toString().padLeft(2, '0')}:${d.inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";

  String get formattedDateTime {
    DateTime dt = asset.fileCreatedAt.toLocal();
@@ -41,10 +42,16 @@ class ExifBottomSheet extends HookConsumerWidget {
          final location = getLocation(asset.exifInfo!.timeZone!);
          dt = TZDateTime.from(dt, location);
        } on LocationNotFoundException {
-          RegExp re = RegExp(r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$', caseSensitive: false);
+          RegExp re = RegExp(
+            r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$',
+            caseSensitive: false,
+          );
          final m = re.firstMatch(asset.exifInfo!.timeZone!);
          if (m != null) {
-            final duration = Duration(hours: int.parse(m.group(1) ?? '0'), minutes: int.parse(m.group(2) ?? '0'));
+            final duration = Duration(
+              hours: int.parse(m.group(1) ?? '0'),
+              minutes: int.parse(m.group(2) ?? '0'),
+            );
            dt = dt.add(duration);
            timeZone = formatTimeZone(duration);
          }
@@ -105,8 +112,7 @@ class ExifBottomSheet extends HookConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    final assetWithExif = ref.watch(assetDetailProvider(asset));
    final exifInfo = (assetWithExif.value ?? asset).exifInfo;
-    var isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-    var textColor = isDarkTheme ? Colors.white : Colors.black;
+    var textColor = context.isDarkTheme ? Colors.white : Colors.black;

    buildMap() {
      return Padding(
@@ -322,9 +328,14 @@ class ExifBottomSheet extends HookConsumerWidget {
                  fontWeight: FontWeight.bold,
                ),
              ),
-              subtitle: exifInfo.f != null || exifInfo.exposureSeconds != null || exifInfo.mm != null || exifInfo.iso != null ? Text(
-                "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO ${exifInfo.iso ?? ''} ",
-              ) : null,
+              subtitle: exifInfo.f != null ||
+                      exifInfo.exposureSeconds != null ||
+                      exifInfo.mm != null ||
+                      exifInfo.iso != null
+                  ? Text(
+                      "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO ${exifInfo.iso ?? ''} ",
+                    )
+                  : null,
            ),
        ],
      );
@@ -393,7 +404,7 @@ class ExifBottomSheet extends HookConsumerWidget {
                      data: (data) => DescriptionInput(asset: data),
                      error: (error, stackTrace) => Icon(
                        Icons.image_not_supported_outlined,
-                        color: Theme.of(context).primaryColor,
+                        color: context.primaryColor,
                      ),
                      loading: () => const SizedBox(
                        width: 75,
--- a/mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart
+++ b/mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
@@ -147,7 +147,7 @@ class TopControlAppBar extends HookConsumerWidget {
    Widget buildBackButton() {
      return IconButton(
        onPressed: () {
-          AutoRouter.of(context).pop();
+          context.autoPop();
        },
        icon: Icon(
          Icons.arrow_back_ios_new_rounded,
--- a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart
+++ b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart
@@ -8,6 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/asset_stack.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart';
@@ -209,7 +210,7 @@ class GalleryViewerPage extends HookConsumerWidget {
        if (isDeleted && isParent) {
          if (totalAssets == 1) {
            // Handle only one asset
-            AutoRouter.of(context).pop();
+            context.autoPop();
          } else {
            // Go to next page otherwise
            controller.nextPage(
@@ -293,7 +294,7 @@ class GalleryViewerPage extends HookConsumerWidget {

      final ratio = d.dy / max(d.dx.abs(), 1);
      if (d.dy > sensitivity && ratio > ratioThreshold) {
-        AutoRouter.of(context).pop();
+        context.autoPop();
      } else if (d.dy < -sensitivity && ratio < -ratioThreshold) {
        showInfo();
      }
@@ -308,7 +309,7 @@ class GalleryViewerPage extends HookConsumerWidget {
          .watch(assetProvider.notifier)
          .toggleArchive([asset], !asset.isArchived);
      if (isParent) {
-        AutoRouter.of(context).pop();
+        context.autoPop();
        return;
      }
      removeAssetFromStack();
@@ -331,7 +332,7 @@ class GalleryViewerPage extends HookConsumerWidget {

    handleActivities() {
      if (sharedAlbumId != null) {
-        AutoRouter.of(context).push(
+        context.autoPush(
          ActivitiesRoute(
            albumId: sharedAlbumId!,
            assetId: asset().remoteId,
@@ -514,7 +515,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                              stackElements.elementAt(stackIndex.value),
                            );
                        Navigator.pop(ctx);
-                        AutoRouter.of(context).pop();
+                        context.autoPop();
                      },
                      title: const Text(
                        "viewer_stack_use_as_main_asset",
@@ -541,7 +542,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                          childrenToRemove: [currentAsset],
                        );
                        Navigator.pop(ctx);
-                        AutoRouter.of(context).pop();
+                        context.autoPop();
                      } else {
                        await ref.read(assetStackServiceProvider).updateStack(
                          currentAsset,
@@ -569,7 +570,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                            childrenToRemove: stack,
                          );
                      Navigator.pop(ctx);
-                      AutoRouter.of(context).pop();
+                      context.autoPop();
                    },
                    title: const Text(
                      "viewer_unstack",
@@ -829,8 +830,8 @@ class GalleryViewerPage extends HookConsumerWidget {
                      placeholder: Image(
                        image: provider,
                        fit: BoxFit.fitWidth,
-                        height: MediaQuery.of(context).size.height,
-                        width: MediaQuery.of(context).size.width,
+                        height: context.height,
+                        width: context.width,
                        alignment: Alignment.center,
                      ),
                      onVideoEnded: () {
--- a/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart
+++ b/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:chewie/chewie.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/image_viewer_page_state.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/video_player_controls.dart';
@@ -44,7 +45,7 @@ class VideoViewerPage extends HookConsumerWidget {
        ),
        error: (error, stackTrace) => Icon(
          Icons.image_not_supported_outlined,
-          color: Theme.of(context).primaryColor,
+          color: context.primaryColor,
        ),
        loading: () => const Center(
          child: SizedBox(
@@ -74,8 +75,8 @@ class VideoViewerPage extends HookConsumerWidget {
        ),
        if (downloadAssetStatus == DownloadAssetStatus.loading)
          SizedBox(
-            height: MediaQuery.of(context).size.height,
-            width: MediaQuery.of(context).size.width,
+            height: context.height,
+            width: context.width,
            child: const Center(
              child: ImmichLoadingIndicator(),
            ),
@@ -205,8 +206,8 @@ class _VideoPlayerState extends State<VideoPlayer> {
      );
    } else {
      return SizedBox(
-        height: MediaQuery.of(context).size.height,
-        width: MediaQuery.of(context).size.width,
+        height: context.height,
+        width: context.width,
        child: Center(
          child: Stack(
            children: [
--- a/mobile/lib/modules/backup/ui/album_info_card.dart
+++ b/mobile/lib/modules/backup/ui/album_info_card.dart
@@ -1,9 +1,9 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -22,10 +22,10 @@ class AlbumInfoCard extends HookConsumerWidget {
        ref.watch(backupProvider).selectedBackupAlbums.contains(albumInfo);
    final bool isExcluded =
        ref.watch(backupProvider).excludedBackupAlbums.contains(albumInfo);
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
+    final isDarkTheme = context.isDarkTheme;

    ColorFilter selectedFilter = ColorFilter.mode(
-      Theme.of(context).primaryColor.withAlpha(100),
+      context.primaryColor.withAlpha(100),
      BlendMode.darken,
    );
    ColorFilter excludedFilter =
@@ -46,7 +46,7 @@ class AlbumInfoCard extends HookConsumerWidget {
              fontWeight: FontWeight.bold,
            ),
          ).tr(),
-          backgroundColor: Theme.of(context).primaryColor,
+          backgroundColor: context.primaryColor,
        );
      } else if (isExcluded) {
        return Chip(
@@ -194,7 +194,7 @@ class AlbumInfoCard extends HookConsumerWidget {
                          albumInfo.name,
                          style: TextStyle(
                            fontSize: 14,
-                            color: Theme.of(context).primaryColor,
+                            color: context.primaryColor,
                            fontWeight: FontWeight.bold,
                          ),
                        ),
@@ -224,13 +224,13 @@ class AlbumInfoCard extends HookConsumerWidget {
                  ),
                  IconButton(
                    onPressed: () {
-                      AutoRouter.of(context).push(
+                      context.autoPush(
                        AlbumPreviewRoute(album: albumInfo.albumEntity),
                      );
                    },
                    icon: Icon(
                      Icons.image_outlined,
-                      color: Theme.of(context).primaryColor,
+                      color: context.primaryColor,
                      size: 24,
                    ),
                    splashRadius: 25,
--- a/mobile/lib/modules/backup/ui/album_info_list_tile.dart
+++ b/mobile/lib/modules/backup/ui/album_info_list_tile.dart
@@ -1,10 +1,10 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -25,14 +25,13 @@ class AlbumInfoListTile extends HookConsumerWidget {
        ref.watch(backupProvider).excludedBackupAlbums.contains(albumInfo);

    ColorFilter selectedFilter = ColorFilter.mode(
-      Theme.of(context).primaryColor.withAlpha(100),
+      context.primaryColor.withAlpha(100),
      BlendMode.darken,
    );
    ColorFilter excludedFilter =
        ColorFilter.mode(Colors.red.withAlpha(75), BlendMode.darken);
    ColorFilter unselectedFilter =
        const ColorFilter.mode(Colors.black, BlendMode.color);
-    var isDarkTheme = Theme.of(context).brightness == Brightness.dark;

    var assetCount = useState(0);

@@ -56,11 +55,11 @@ class AlbumInfoListTile extends HookConsumerWidget {

    buildTileColor() {
      if (isSelected) {
-        return isDarkTheme
-            ? Theme.of(context).primaryColor.withAlpha(100)
-            : Theme.of(context).primaryColor.withAlpha(25);
+        return context.isDarkTheme
+            ? context.primaryColor.withAlpha(100)
+            : context.primaryColor.withAlpha(25);
      } else if (isExcluded) {
-        return isDarkTheme
+        return context.isDarkTheme
            ? Colors.red[300]?.withAlpha(150)
            : Colors.red[100]?.withAlpha(150);
      } else {
@@ -159,13 +158,13 @@ class AlbumInfoListTile extends HookConsumerWidget {
        subtitle: Text(assetCount.value.toString()),
        trailing: IconButton(
          onPressed: () {
-            AutoRouter.of(context).push(
+            context.autoPush(
              AlbumPreviewRoute(album: albumInfo.albumEntity),
            );
          },
          icon: Icon(
            Icons.image_outlined,
-            color: Theme.of(context).primaryColor,
+            color: context.primaryColor,
            size: 24,
          ),
          splashRadius: 25,
--- a/mobile/lib/modules/backup/ui/backup_info_card.dart
+++ b/mobile/lib/modules/backup/ui/backup_info_card.dart
@@ -1,5 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';

 class BackupInfoCard extends StatelessWidget {
  final String title;
@@ -14,13 +15,11 @@ class BackupInfoCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
-
    return Card(
      shape: RoundedRectangleBorder(
        borderRadius: BorderRadius.circular(20), // if you need this
        side: BorderSide(
-          color: isDarkMode
+          color: context.isDarkTheme
              ? const Color.fromARGB(255, 56, 56, 56)
              : Colors.black12,
          width: 1,
--- a/mobile/lib/modules/backup/ui/current_backup_asset_info_box.dart
+++ b/mobile/lib/modules/backup/ui/current_backup_asset_info_box.dart
@@ -1,9 +1,9 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/models/backup_state.model.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart';
@@ -53,7 +53,7 @@ class CurrentUploadingAssetInfoBox extends HookConsumerWidget {
        ),
        backgroundColor: Colors.white,
        onPressed: () {
-          AutoRouter.of(context).push(const FailedBackupStatusRoute());
+          context.autoPush(const FailedBackupStatusRoute());
        },
      );
    }
@@ -61,7 +61,7 @@ class CurrentUploadingAssetInfoBox extends HookConsumerWidget {
    Widget buildAssetInfoTable() {
      return Table(
        border: TableBorder.all(
-          color: Theme.of(context).primaryColorLight,
+          color: context.themeData.primaryColorLight,
          width: 1,
        ),
        children: [
@@ -176,7 +176,7 @@ class CurrentUploadingAssetInfoBox extends HookConsumerWidget {
            onTap: () => isShowThumbnail.value = true,
            child: Icon(
              Icons.image_outlined,
-              color: Theme.of(context).primaryColor,
+              color: context.primaryColor,
              size: 30,
            ),
          ),
@@ -206,7 +206,7 @@ class CurrentUploadingAssetInfoBox extends HookConsumerWidget {
                      minHeight: 10.0,
                      value: uploadProgress / 100.0,
                      backgroundColor: Colors.grey,
-                      color: Theme.of(context).primaryColor,
+                      color: context.primaryColor,
                    ),
                  ),
                  Text(
--- a/mobile/lib/modules/backup/ui/ios_debug_info_tile.dart
+++ b/mobile/lib/modules/backup/ui/ios_debug_info_tile.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/providers/ios_background_settings.provider.dart';
 import 'package:intl/intl.dart';

@@ -43,7 +44,7 @@ class IosDebugInfoTile extends HookConsumerWidget {
        style: TextStyle(
          fontWeight: FontWeight.bold,
          fontSize: 14,
-          color: Theme.of(context).primaryColor,
+          color: context.primaryColor,
        ),
      ),
      subtitle: Text(
@@ -54,7 +55,7 @@ class IosDebugInfoTile extends HookConsumerWidget {
      ),
      leading: Icon(
        Icons.bug_report,
-        color: Theme.of(context).primaryColor,
+        color: context.primaryColor,
      ),
    );
  }
--- a/mobile/lib/modules/backup/views/album_preview_page.dart
+++ b/mobile/lib/modules/backup/views/album_preview_page.dart
@@ -1,9 +1,9 @@
 import 'dart:typed_data';

-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:photo_manager/photo_manager.dart';

@@ -53,7 +53,7 @@ class AlbumPreviewPage extends HookConsumerWidget {
          ],
        ),
        leading: IconButton(
-          onPressed: () => AutoRouter.of(context).pop(),
+          onPressed: () => context.autoPop(),
          icon: const Icon(Icons.arrow_back_ios_new_rounded),
        ),
      ),
--- a/mobile/lib/modules/backup/views/backup_album_selection_page.dart
+++ b/mobile/lib/modules/backup/views/backup_album_selection_page.dart
@@ -1,10 +1,10 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/immich_colors.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/backup/ui/album_info_card.dart';
 import 'package:immich_mobile/modules/backup/ui/album_info_list_tile.dart';
@@ -18,7 +18,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
    // final availableAlbums = ref.watch(backupProvider).availableAlbums;
    final selectedBackupAlbums = ref.watch(backupProvider).selectedBackupAlbums;
    final excludedBackupAlbums = ref.watch(backupProvider).excludedBackupAlbums;
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
+    final isDarkTheme = context.isDarkTheme;
    final allAlbums = ref.watch(backupProvider).availableAlbums;

    // Albums which are displayed to the user
@@ -118,7 +118,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                  fontWeight: FontWeight.bold,
                ),
              ),
-              backgroundColor: Theme.of(context).primaryColor,
+              backgroundColor: context.primaryColor,
              deleteIconColor: isDarkTheme ? Colors.black : Colors.white,
              deleteIcon: const Icon(
                Icons.cancel_rounded,
@@ -211,7 +211,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
    return Scaffold(
      appBar: AppBar(
        leading: IconButton(
-          onPressed: () => AutoRouter.of(context).pop(),
+          onPressed: () => context.autoPop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        title: const Text(
@@ -315,7 +315,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                      "backup_album_selection_page_albums_tap",
                      style: TextStyle(
                        fontSize: 12,
-                        color: Theme.of(context).primaryColor,
+                        color: context.primaryColor,
                        fontWeight: FontWeight.bold,
                      ),
                    ).tr(),
@@ -325,7 +325,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                    icon: Icon(
                      Icons.info,
                      size: 20,
-                      color: Theme.of(context).primaryColor,
+                      color: context.primaryColor,
                    ),
                    onPressed: () {
                      // show the dialog
@@ -342,7 +342,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                              style: TextStyle(
                                fontSize: 16,
                                fontWeight: FontWeight.bold,
-                                color: Theme.of(context).primaryColor,
+                                color: context.primaryColor,
                              ),
                            ).tr(),
                            content: SingleChildScrollView(
--- a/mobile/lib/modules/backup/views/backup_controller_page.dart
+++ b/mobile/lib/modules/backup/views/backup_controller_page.dart
@@ -1,11 +1,11 @@
 import 'dart:io';

-import 'package:auto_route/auto_route.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
 import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart';
 import 'package:immich_mobile/modules/backup/providers/ios_background_settings.provider.dart';
@@ -49,7 +49,6 @@ class BackupControllerPage extends HookConsumerWidget {
            !hasExclusiveAccess
        ? false
        : true;
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
    final checkInProgress = useState(false);

    useEffect(
@@ -151,7 +150,7 @@ class BackupControllerPage extends HookConsumerWidget {
      return ListTile(
        leading: Icon(
          Icons.warning_rounded,
-          color: Theme.of(context).primaryColor,
+          color: context.primaryColor,
        ),
        title: const Text(
          "Check for corrupt asset backups",
@@ -187,7 +186,7 @@ class BackupControllerPage extends HookConsumerWidget {
        leading: isAutoBackup
            ? Icon(
                Icons.cloud_done_rounded,
-                color: Theme.of(context).primaryColor,
+                color: context.primaryColor,
              )
            : const Icon(Icons.cloud_off_rounded),
        title: Text(
@@ -266,7 +265,7 @@ class BackupControllerPage extends HookConsumerWidget {
                  style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
                ).tr(),
                onPressed: () {
-                  Navigator.of(context).pop();
+                  context.pop();
                },
              ),
            ],
@@ -279,7 +278,7 @@ class BackupControllerPage extends HookConsumerWidget {
      final bool isBackgroundEnabled = backupState.backgroundBackup;
      final bool isWifiRequired = backupState.backupRequireWifi;
      final bool isChargingRequired = backupState.backupRequireCharging;
-      final Color activeColor = Theme.of(context).primaryColor;
+      final Color activeColor = context.primaryColor;

      String formatBackupDelaySliderValue(double v) {
        if (v == 0.0) {
@@ -410,7 +409,7 @@ class BackupControllerPage extends HookConsumerWidget {
                      max: 3.0,
                      divisions: 3,
                      label: formatBackupDelaySliderValue(triggerDelay.value),
-                      activeColor: Theme.of(context).primaryColor,
+                      activeColor: context.primaryColor,
                    ),
                  ),
                ElevatedButton(
@@ -511,7 +510,7 @@ class BackupControllerPage extends HookConsumerWidget {
          child: Text(
            text.trim().substring(0, text.length - 2),
            style: TextStyle(
-              color: Theme.of(context).primaryColor,
+              color: context.primaryColor,
              fontSize: 12,
              fontWeight: FontWeight.bold,
            ),
@@ -523,7 +522,7 @@ class BackupControllerPage extends HookConsumerWidget {
          child: Text(
            "backup_controller_page_none_selected".tr(),
            style: TextStyle(
-              color: Theme.of(context).primaryColor,
+              color: context.primaryColor,
              fontSize: 12,
              fontWeight: FontWeight.bold,
            ),
@@ -562,7 +561,7 @@ class BackupControllerPage extends HookConsumerWidget {
        shape: RoundedRectangleBorder(
          borderRadius: BorderRadius.circular(20),
          side: BorderSide(
-            color: isDarkMode
+            color: context.isDarkTheme
                ? const Color.fromARGB(255, 56, 56, 56)
                : Colors.black12,
            width: 1,
@@ -592,7 +591,7 @@ class BackupControllerPage extends HookConsumerWidget {
          ),
          trailing: ElevatedButton(
            onPressed: () {
-              AutoRouter.of(context).push(const BackupAlbumSelectionRoute());
+              context.autoPush(const BackupAlbumSelectionRoute());
            },
            child: const Text(
              "backup_controller_page_select",
@@ -678,7 +677,7 @@ class BackupControllerPage extends HookConsumerWidget {
        leading: IconButton(
          onPressed: () {
            ref.watch(websocketProvider.notifier).listenUploadEvent();
-            AutoRouter.of(context).pop(true);
+            context.autoPop(true);
          },
          splashRadius: 24,
          icon: const Icon(
--- a/mobile/lib/modules/backup/views/failed_backup_status_page.dart
+++ b/mobile/lib/modules/backup/views/failed_backup_status_page.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart';
 import 'package:intl/intl.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -20,7 +20,7 @@ class FailedBackupStatusPage extends HookConsumerWidget {
        ),
        leading: IconButton(
          onPressed: () {
-            AutoRouter.of(context).pop(true);
+            context.autoPop(true);
          },
          splashRadius: 24,
          icon: const Icon(
@@ -114,7 +114,7 @@ class FailedBackupStatusPage extends HookConsumerWidget {
                              style: TextStyle(
                                fontWeight: FontWeight.bold,
                                fontSize: 12,
-                                color: Theme.of(context).primaryColor,
+                                color: context.primaryColor,
                              ),
                            ),
                          ),
--- a/mobile/lib/modules/favorite/views/favorites_page.dart
+++ b/mobile/lib/modules/favorite/views/favorites_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/favorite/providers/favorite_provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -28,7 +28,7 @@ class FavoritesPage extends HookConsumerWidget {
    AppBar buildAppBar() {
      return AppBar(
        leading: IconButton(
-          onPressed: () => AutoRouter.of(context).pop(),
+          onPressed: () => context.autoPop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        centerTitle: true,
--- a/mobile/lib/modules/home/ui/asset_grid/group_divider_title.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/group_divider_title.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';

 class GroupDividerTitle extends ConsumerWidget {
  const GroupDividerTitle({
@@ -51,7 +52,7 @@ class GroupDividerTitle extends ConsumerWidget {
            child: multiselectEnabled && selected
                ? Icon(
                    Icons.check_circle_rounded,
-                    color: Theme.of(context).primaryColor,
+                    color: context.primaryColor,
                  )
                : const Icon(
                    Icons.check_circle_outline_rounded,
--- a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart
@@ -4,10 +4,11 @@ import 'dart:math';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/scroll_notifier.provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_image.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/utils/builtin_extensions.dart';
+import 'package:immich_mobile/extensions/collection_extensions.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import 'asset_grid_data_structure.dart';
 import 'group_divider_title.dart';
@@ -224,7 +225,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
        style: TextStyle(
          fontSize: 26,
          fontWeight: FontWeight.bold,
-          color: Theme.of(context).textTheme.displayLarge?.color,
+          color: context.textTheme.displayLarge?.color,
        ),
      ),
    );
@@ -372,7 +373,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
            scrollStateListener: dragScrolling,
            itemPositionsListener: _itemPositionsListener,
            controller: _itemScrollController,
-            backgroundColor: Theme.of(context).hintColor,
+            backgroundColor: context.themeData.hintColor,
            labelTextBuilder: _labelBuilder,
            labelConstraints: const BoxConstraints(maxHeight: 28),
            scrollbarAnimationDuration: const Duration(milliseconds: 300),
--- a/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
@@ -43,9 +43,9 @@ class ThumbnailImage extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-    final assetContainerColor =
-        isDarkTheme ? Colors.blueGrey : Theme.of(context).primaryColorLight;
+    final assetContainerColor = context.isDarkTheme
+        ? Colors.blueGrey
+        : context.themeData.primaryColorLight;
    // Assets from response DTOs do not have an isar id, querying which would give us the default autoIncrement id
    final isFromDto = asset.id == Isar.autoIncrement;

@@ -58,7 +58,7 @@ class ThumbnailImage extends StatelessWidget {
          ),
          child: Icon(
            Icons.check_circle_rounded,
-            color: Theme.of(context).primaryColor,
+            color: context.primaryColor,
          ),
        );
      } else {
@@ -178,7 +178,7 @@ class ThumbnailImage extends StatelessWidget {
            onSelect?.call();
          }
        } else {
-          AutoRouter.of(context).push(
+          context.autoPush(
            GalleryViewerRoute(
              initialIndex: index,
              loadAsset: loadAsset,
--- a/mobile/lib/modules/home/ui/control_bottom_app_bar.dart
+++ b/mobile/lib/modules/home/ui/control_bottom_app_bar.dart
@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/ui/add_to_album_sliverlist.dart';
 import 'package:immich_mobile/modules/home/models/selection_state.dart';
 import 'package:immich_mobile/modules/home/ui/delete_dialog.dart';
@@ -42,7 +43,6 @@ class ControlBottomAppBar extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
    var hasRemote =
        selectionAssetState.hasRemote || selectionAssetState.hasMerged;
    var hasLocal = selectionAssetState.hasLocal;
@@ -128,7 +128,7 @@ class ControlBottomAppBar extends ConsumerWidget {
        ScrollController scrollController,
      ) {
        return Card(
-          color: isDarkMode ? Colors.grey[900] : Colors.grey[100],
+          color: context.isDarkTheme ? Colors.grey[900] : Colors.grey[100],
          surfaceTintColor: Colors.transparent,
          elevation: 18.0,
          shape: const RoundedRectangleBorder(
@@ -211,12 +211,12 @@ class AddToAlbumTitleRow extends StatelessWidget {
            onPressed: onCreateNewAlbum,
            icon: Icon(
              Icons.add,
-              color: Theme.of(context).primaryColor,
+              color: context.primaryColor,
            ),
            label: Text(
              "common_create_new_album",
              style: TextStyle(
-                color: Theme.of(context).primaryColor,
+                color: context.primaryColor,
                fontWeight: FontWeight.bold,
                fontSize: 14,
              ),
--- a/mobile/lib/modules/home/views/home_page.dart
+++ b/mobile/lib/modules/home/views/home_page.dart
@@ -1,12 +1,12 @@
 import 'dart:async';

-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
@@ -106,8 +106,7 @@ class HomePage extends HookConsumerWidget {
          handleShareAssets(ref, context, selection.value.toList());
        } else {
          final ids = remoteOnlySelection().map((e) => e.remoteId!);
-          AutoRouter.of(context)
-              .push(SharedLinkEditRoute(assetsList: ids.toList()));
+          context.autoPush(SharedLinkEditRoute(assetsList: ids.toList()));
        }
        processing.value = false;
        selectionEnabledHook.value = false;
@@ -243,7 +242,7 @@ class HomePage extends HookConsumerWidget {
            ref.watch(sharedAlbumProvider.notifier).getAllSharedAlbums();
            selectionEnabledHook.value = false;

-            AutoRouter.of(context).push(AlbumViewerRoute(albumId: result.id));
+            context.autoPush(AlbumViewerRoute(albumId: result.id));
          }
        } finally {
          processing.value = false;
@@ -300,7 +299,7 @@ class HomePage extends HookConsumerWidget {
                  style: TextStyle(
                    fontWeight: FontWeight.w600,
                    fontSize: 16,
-                    color: Theme.of(context).primaryColor,
+                    color: context.primaryColor,
                  ),
                ).tr(),
              ),
--- a/mobile/lib/modules/login/models/authentication_state.model.dart
+++ b/mobile/lib/modules/login/models/authentication_state.model.dart
@@ -3,8 +3,7 @@ class AuthenticationState {
  final String userId;
  final String userEmail;
  final bool isAuthenticated;
-  final String firstName;
-  final String lastName;
+  final String name;
  final bool isAdmin;
  final bool shouldChangePassword;
  final String profileImagePath;
@@ -13,8 +12,7 @@ class AuthenticationState {
    required this.userId,
    required this.userEmail,
    required this.isAuthenticated,
-    required this.firstName,
-    required this.lastName,
+    required this.name,
    required this.isAdmin,
    required this.shouldChangePassword,
    required this.profileImagePath,
@@ -25,8 +23,7 @@ class AuthenticationState {
    String? userId,
    String? userEmail,
    bool? isAuthenticated,
-    String? firstName,
-    String? lastName,
+    String? name,
    bool? isAdmin,
    bool? shouldChangePassword,
    String? profileImagePath,
@@ -36,8 +33,7 @@ class AuthenticationState {
      userId: userId ?? this.userId,
      userEmail: userEmail ?? this.userEmail,
      isAuthenticated: isAuthenticated ?? this.isAuthenticated,
-      firstName: firstName ?? this.firstName,
-      lastName: lastName ?? this.lastName,
+      name: name ?? this.name,
      isAdmin: isAdmin ?? this.isAdmin,
      shouldChangePassword: shouldChangePassword ?? this.shouldChangePassword,
      profileImagePath: profileImagePath ?? this.profileImagePath,
@@ -46,7 +42,7 @@ class AuthenticationState {

  @override
  String toString() {
-    return 'AuthenticationState(deviceId: $deviceId, userId: $userId, userEmail: $userEmail, isAuthenticated: $isAuthenticated, firstName: $firstName, lastName: $lastName, isAdmin: $isAdmin, shouldChangePassword: $shouldChangePassword, profileImagePath: $profileImagePath)';
+    return 'AuthenticationState(deviceId: $deviceId, userId: $userId, userEmail: $userEmail, isAuthenticated: $isAuthenticated, name: $name, isAdmin: $isAdmin, shouldChangePassword: $shouldChangePassword, profileImagePath: $profileImagePath)';
  }

  @override
@@ -58,8 +54,7 @@ class AuthenticationState {
        other.userId == userId &&
        other.userEmail == userEmail &&
        other.isAuthenticated == isAuthenticated &&
-        other.firstName == firstName &&
-        other.lastName == lastName &&
+        other.name == name &&
        other.isAdmin == isAdmin &&
        other.shouldChangePassword == shouldChangePassword &&
        other.profileImagePath == profileImagePath;
@@ -71,8 +66,7 @@ class AuthenticationState {
        userId.hashCode ^
        userEmail.hashCode ^
        isAuthenticated.hashCode ^
-        firstName.hashCode ^
-        lastName.hashCode ^
+        name.hashCode ^
        isAdmin.hashCode ^
        shouldChangePassword.hashCode ^
        profileImagePath.hashCode;
--- a/mobile/lib/modules/login/providers/authentication.provider.dart
+++ b/mobile/lib/modules/login/providers/authentication.provider.dart
@@ -26,8 +26,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
            deviceId: "",
            userId: "",
            userEmail: "",
-            firstName: '',
-            lastName: '',
+            name: '',
            profileImagePath: '',
            isAdmin: false,
            shouldChangePassword: false,
@@ -117,8 +116,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
        deviceId: "",
        userId: "",
        userEmail: "",
-        firstName: '',
-        lastName: '',
+        name: '',
        profileImagePath: '',
        isAdmin: false,
        shouldChangePassword: false,
@@ -187,12 +185,15 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
      if (userResponseDto != null) {
        Store.put(StoreKey.deviceId, deviceId);
        Store.put(StoreKey.deviceIdHash, fastHash(deviceId));
-        Store.put(StoreKey.currentUser, User.fromDto(userResponseDto));
+        Store.put(
+          StoreKey.currentUser,
+          User.fromUserDto(userResponseDto),
+        );
        Store.put(StoreKey.serverUrl, serverUrl);
        Store.put(StoreKey.accessToken, accessToken);

        shouldChangePassword = userResponseDto.shouldChangePassword;
-        user = User.fromDto(userResponseDto);
+        user = User.fromUserDto(userResponseDto);

        retResult = true;
      } else {
@@ -205,8 +206,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
      isAuthenticated: true,
      userId: user.id,
      userEmail: user.email,
-      firstName: user.firstName,
-      lastName: user.lastName,
+      name: user.name,
      profileImagePath: user.profileImagePath,
      isAdmin: user.isAdmin,
      shouldChangePassword: shouldChangePassword,
--- a/mobile/lib/modules/login/ui/change_password_form.dart
+++ b/mobile/lib/modules/login/ui/change_password_form.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/backup/providers/manual_upload.provider.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
@@ -37,7 +38,7 @@ class ChangePasswordForm extends HookConsumerWidget {
                style: TextStyle(
                  fontSize: 24,
                  fontWeight: FontWeight.bold,
-                  color: Theme.of(context).primaryColor,
+                  color: context.primaryColor,
                ),
              ),
              Padding(
@@ -45,8 +46,7 @@ class ChangePasswordForm extends HookConsumerWidget {
                child: Text(
                  'change_password_form_description'.tr(
                    namedArgs: {
-                      'firstName': authState.firstName,
-                      'lastName': authState.lastName,
+                      'name': authState.name,
                    },
                  ),
                  style: TextStyle(
@@ -191,7 +191,7 @@ class ChangePasswordButton extends ConsumerWidget {
    return ElevatedButton(
      style: ElevatedButton.styleFrom(
        visualDensity: VisualDensity.standard,
-        backgroundColor: Theme.of(context).primaryColor,
+        backgroundColor: context.primaryColor,
        foregroundColor: Colors.grey[50],
        elevation: 2,
        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 25),
--- a/mobile/lib/modules/login/ui/login_form.dart
+++ b/mobile/lib/modules/login/ui/login_form.dart
@@ -1,9 +1,9 @@
 import 'dart:io';
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/login/providers/oauth.provider.dart';
 import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -150,7 +150,7 @@ class LoginForm extends HookConsumerWidget {
          // Resume backup (if enable) then navigate
          if (ref.read(authenticationProvider).shouldChangePassword &&
              !ref.read(authenticationProvider).isAdmin) {
-            AutoRouter.of(context).push(const ChangePasswordRoute());
+            context.autoPush(const ChangePasswordRoute());
          } else {
            final hasPermission = await ref
                .read(galleryPermissionNotifier.notifier)
@@ -159,7 +159,7 @@ class LoginForm extends HookConsumerWidget {
              // Don't resume the backup until we have gallery permission
              ref.read(backupProvider.notifier).resumeBackup();
            }
-            AutoRouter.of(context).replace(const TabControllerRoute());
+            context.autoReplace(const TabControllerRoute());
          }
        } else {
          ImmichToast.show(
@@ -212,9 +212,7 @@ class LoginForm extends HookConsumerWidget {
            if (permission.isGranted || permission.isLimited) {
              ref.watch(backupProvider.notifier).resumeBackup();
            }
-            AutoRouter.of(context).replace(
-              const TabControllerRoute(),
-            );
+            context.autoReplace(const TabControllerRoute());
          } else {
            ImmichToast.show(
              context: context,
@@ -260,8 +258,7 @@ class LoginForm extends HookConsumerWidget {
                      ),
                    ),
                  ),
-                  onPressed: () =>
-                      AutoRouter.of(context).push(const SettingsRoute()),
+                  onPressed: () => context.autoPush(const SettingsRoute()),
                  icon: const Icon(Icons.settings_rounded),
                  label: const SizedBox.shrink(),
                ),
@@ -303,7 +300,7 @@ class LoginForm extends HookConsumerWidget {
          children: [
            Text(
              serverEndpointController.text,
-              style: Theme.of(context).textTheme.displaySmall,
+              style: context.textTheme.displaySmall,
              textAlign: TextAlign.center,
            ),
            if (isPasswordLoginEnable.value) ...[
@@ -339,8 +336,7 @@ class LoginForm extends HookConsumerWidget {
                              horizontal: 16.0,
                            ),
                            child: Divider(
-                              color: Brightness.dark ==
-                                      Theme.of(context).brightness
+                              color: context.isDarkTheme
                                  ? Colors.white
                                  : Colors.black,
                            ),
@@ -588,7 +584,7 @@ class OAuthLoginButton extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    return ElevatedButton.icon(
      style: ElevatedButton.styleFrom(
-        backgroundColor: Theme.of(context).primaryColor.withAlpha(230),
+        backgroundColor: context.primaryColor.withAlpha(230),
        padding: const EdgeInsets.symmetric(vertical: 12),
      ),
      onPressed: onPressed,
--- a/mobile/lib/modules/login/views/login_page.dart
+++ b/mobile/lib/modules/login/views/login_page.dart
@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/login/ui/login_form.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -47,13 +47,13 @@ class LoginPage extends HookConsumerWidget {
                child: Text(
                  'Logs',
                  style: TextStyle(
-                    color: Theme.of(context).primaryColor,
+                    color: context.primaryColor,
                    fontWeight: FontWeight.bold,
                    fontFamily: "Inconsolata",
                  ),
                ),
                onTap: () {
-                  AutoRouter.of(context).push(const AppLogRoute());
+                  context.autoPush(const AppLogRoute());
                },
              ),
            ],
--- a/mobile/lib/modules/map/models/map_state.model.dart
+++ b/mobile/lib/modules/map/models/map_state.model.dart
@@ -1,14 +1,20 @@
+import 'package:vector_map_tiles/vector_map_tiles.dart';
+
 class MapState {
  final bool isDarkTheme;
  final bool showFavoriteOnly;
  final bool includeArchived;
  final int relativeTime;
+  final Style? mapStyle;
+  final bool isLoading;

  MapState({
    this.isDarkTheme = false,
    this.showFavoriteOnly = false,
    this.includeArchived = false,
    this.relativeTime = 0,
+    this.mapStyle,
+    this.isLoading = false,
  });

  MapState copyWith({
@@ -16,18 +22,22 @@ class MapState {
    bool? showFavoriteOnly,
    bool? includeArchived,
    int? relativeTime,
+    Style? mapStyle,
+    bool? isLoading,
  }) {
    return MapState(
      isDarkTheme: isDarkTheme ?? this.isDarkTheme,
      showFavoriteOnly: showFavoriteOnly ?? this.showFavoriteOnly,
      includeArchived: includeArchived ?? this.includeArchived,
      relativeTime: relativeTime ?? this.relativeTime,
+      mapStyle: mapStyle ?? this.mapStyle,
+      isLoading: isLoading ?? this.isLoading,
    );
  }

  @override
  String toString() {
-    return 'MapSettingsState(isDarkTheme: $isDarkTheme, showFavoriteOnly: $showFavoriteOnly, relativeTime: $relativeTime, includeArchived: $includeArchived)';
+    return 'MapSettingsState(isDarkTheme: $isDarkTheme, showFavoriteOnly: $showFavoriteOnly, relativeTime: $relativeTime, includeArchived: $includeArchived, mapStyle: $mapStyle, isLoading: $isLoading)';
  }

  @override
@@ -38,7 +48,9 @@ class MapState {
        other.isDarkTheme == isDarkTheme &&
        other.showFavoriteOnly == showFavoriteOnly &&
        other.relativeTime == relativeTime &&
-        other.includeArchived == includeArchived;
+        other.includeArchived == includeArchived &&
+        other.mapStyle == mapStyle &&
+        other.isLoading == isLoading;
  }

  @override
@@ -46,6 +58,8 @@ class MapState {
    return isDarkTheme.hashCode ^
        showFavoriteOnly.hashCode ^
        relativeTime.hashCode ^
-        includeArchived.hashCode;
+        includeArchived.hashCode ^
+        mapStyle.hashCode ^
+        isLoading.hashCode;
  }
 }
--- a/mobile/lib/modules/map/providers/map_state.provider.dart
+++ b/mobile/lib/modules/map/providers/map_state.provider.dart
@@ -1,10 +1,23 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/map/models/map_state.model.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/shared/providers/api.provider.dart';
+import 'package:immich_mobile/shared/services/api.service.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
+import 'package:immich_mobile/utils/color_filter_generator.dart';
+import 'package:logging/logging.dart';
+import 'package:openapi/api.dart';
+import 'package:vector_map_tiles/vector_map_tiles.dart';

 class MapStateNotifier extends StateNotifier<MapState> {
-  MapStateNotifier(this._appSettingsProvider)
+  MapStateNotifier(this._appSettingsProvider, this._apiService)
      : super(
          MapState(
            isDarkTheme: _appSettingsProvider
@@ -15,17 +28,69 @@ class MapStateNotifier extends StateNotifier<MapState> {
                .getSetting<bool>(AppSettingsEnum.mapIncludeArchived),
            relativeTime: _appSettingsProvider
                .getSetting<int>(AppSettingsEnum.mapRelativeDate),
+            isLoading: true,
          ),
-        );
+        ) {
+    _fetchStyleFromServer(
+      _appSettingsProvider.getSetting<bool>(AppSettingsEnum.mapThemeMode),
+    );
+  }

  final AppSettingsService _appSettingsProvider;
+  final ApiService _apiService;
+  final Logger _log = Logger("MapStateNotifier");
+
+  bool get isRaster =>
+      state.mapStyle != null && state.mapStyle!.rasterTileProvider != null;
+
+  double get maxZoom =>
+      (isRaster ? state.mapStyle!.rasterTileProvider!.maximumZoom : 14)
+          .toDouble();

  void switchTheme(bool isDarkTheme) {
+    _updateThemeMode(isDarkTheme);
+    _fetchStyleFromServer(isDarkTheme);
+  }
+
+  void _updateThemeMode(bool isDarkTheme) {
    _appSettingsProvider.setSetting(
      AppSettingsEnum.mapThemeMode,
      isDarkTheme,
    );
-    state = state.copyWith(isDarkTheme: isDarkTheme);
+    state = state.copyWith(isDarkTheme: isDarkTheme, isLoading: true);
+  }
+
+  void _fetchStyleFromServer(bool isDarkTheme) async {
+    final styleResponse = await _apiService.systemConfigApi
+        .getMapStyleWithHttpInfo(isDarkTheme ? MapTheme.dark : MapTheme.light);
+    if (styleResponse.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(styleResponse.statusCode, styleResponse.body);
+    }
+    final styleJsonString = styleResponse.body.isNotEmpty &&
+            styleResponse.statusCode != HttpStatus.noContent
+        ? styleResponse.body
+        : null;
+
+    if (styleJsonString == null) {
+      _log.severe('Style JSON from server is empty');
+      return;
+    }
+    final styleJson = await compute(jsonDecode, styleJsonString);
+    if (styleJson is! Map<String, dynamic>) {
+      _log.severe('Style JSON from server is invalid');
+      return;
+    }
+    final styleReader = StyleReader(uri: '');
+    Style? style;
+    try {
+      style = await styleReader.readFromMap(styleJson);
+    } finally {
+      // Consume all error
+    }
+    state = state.copyWith(
+      mapStyle: style,
+      isLoading: false,
+    );
  }

  void switchFavoriteOnly(bool isFavoriteOnly) {
@@ -51,9 +116,44 @@ class MapStateNotifier extends StateNotifier<MapState> {
    );
    state = state.copyWith(relativeTime: relativeTime);
  }
+
+  Widget getTileLayer([bool forceDark = false]) {
+    if (isRaster) {
+      final rasterProvider = state.mapStyle!.rasterTileProvider;
+      final rasterLayer = TileLayer(
+        urlTemplate: rasterProvider!.url,
+        maxNativeZoom: rasterProvider.maximumZoom,
+        maxZoom: rasterProvider.maximumZoom.toDouble(),
+      );
+      return state.isDarkTheme || forceDark
+          ? InvertionFilter(
+              child: SaturationFilter(
+                saturation: -1,
+                child: BrightnessFilter(
+                  brightness: -1,
+                  child: rasterLayer,
+                ),
+              ),
+            )
+          : rasterLayer;
+    }
+    if (state.mapStyle != null && !isRaster) {
+      return VectorTileLayer(
+        // Tiles and themes will be set for vector providers
+        tileProviders: state.mapStyle!.providers!,
+        theme: state.mapStyle!.theme!,
+        sprites: state.mapStyle!.sprites,
+        concurrency: 6,
+      );
+    }
+    return const Center(child: ImmichLoadingIndicator());
+  }
 }

 final mapStateNotifier =
    StateNotifierProvider<MapStateNotifier, MapState>((ref) {
-  return MapStateNotifier(ref.watch(appSettingsServiceProvider));
+  return MapStateNotifier(
+    ref.watch(appSettingsServiceProvider),
+    ref.watch(apiServiceProvider),
+  );
 });
--- a/mobile/lib/modules/map/ui/map_page_app_bar.dart
+++ b/mobile/lib/modules/map/ui/map_page_app_bar.dart
@@ -1,8 +1,8 @@
 import 'dart:io';

-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/disable_multi_select_button.dart';
 import 'package:immich_mobile/modules/map/ui/map_settings_dialog.dart';

@@ -30,7 +30,7 @@ class MapAppBar extends HookWidget implements PreferredSizeWidget {
      Padding(
        padding: const EdgeInsets.only(left: 15, top: 15),
        child: ElevatedButton(
-          onPressed: () => AutoRouter.of(context).pop(),
+          onPressed: () => context.autoPop(),
          style: ElevatedButton.styleFrom(
            shape: const CircleBorder(),
            padding: const EdgeInsets.all(12),
--- a/mobile/lib/modules/map/ui/map_page_bottom_sheet.dart
+++ b/mobile/lib/modules/map/ui/map_page_bottom_sheet.dart
@@ -5,6 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
@@ -15,7 +16,6 @@ import 'package:immich_mobile/shared/ui/drag_sheet.dart';
 import 'package:immich_mobile/utils/color_filter_generator.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-import 'package:url_launcher/url_launcher.dart';

 class MapPageBottomSheet extends StatefulHookConsumerWidget {
  final Stream mapPageEventStream;
@@ -57,10 +57,10 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {

  @override
  Widget build(BuildContext context) {
-    final isDarkMode = Theme.of(context).brightness == Brightness.dark;
+    final isDarkTheme = context.isDarkTheme;
    final bottomPadding =
        Platform.isAndroid ? MediaQuery.of(context).padding.bottom - 10 : 0.0;
-    final maxHeight = MediaQuery.of(context).size.height - bottomPadding;
+    final maxHeight = context.height - bottomPadding;
    final isSheetScrolled = useState(false);
    final isSheetExpanded = useState(false);
    final assetsInBound = useState(<Asset>[]);
@@ -137,7 +137,7 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
                SizedBox(
                  height: 150,
                  width: 150,
-                  child: isDarkMode
+                  child: isDarkTheme
                      ? const InvertionFilter(
                          child: SaturationFilter(
                            saturation: -1,
@@ -156,7 +156,7 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
                  "map_zoom_to_see_photos".tr(),
                  style: TextStyle(
                    fontSize: 20,
-                    color: Theme.of(context).textTheme.displayLarge?.color,
+                    color: context.textTheme.displayLarge?.color,
                  ),
                ),
              ],
@@ -182,7 +182,7 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
        height: 60,
        width: double.infinity,
        decoration: BoxDecoration(
-          color: isDarkMode ? Colors.grey[900] : Colors.grey[100],
+          color: isDarkTheme ? Colors.grey[900] : Colors.grey[100],
        ),
        child: Stack(
          children: [
@@ -197,17 +197,14 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
                  textToDisplay,
                  style: TextStyle(
                    fontSize: 16,
-                    color: Theme.of(context).textTheme.displayLarge?.color,
+                    color: context.textTheme.displayLarge?.color,
                    fontWeight: FontWeight.bold,
                  ),
                ),
                Divider(
                  height: 10,
-                  color: Theme.of(context)
-                      .textTheme
-                      .displayLarge
-                      ?.color
-                      ?.withOpacity(0.5),
+                  color:
+                      context.textTheme.displayLarge?.color?.withOpacity(0.5),
                ),
              ],
            ),
@@ -218,7 +215,7 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
                child: IconButton(
                  icon: Icon(
                    Icons.map_outlined,
-                    color: Theme.of(context).textTheme.displayLarge?.color,
+                    color: context.textTheme.displayLarge?.color,
                  ),
                  iconSize: 20,
                  tooltip: 'Zoom to bounds',
@@ -266,7 +263,7 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
                ScrollController scrollController,
              ) {
                return Card(
-                  color: isDarkMode ? Colors.grey[900] : Colors.grey[100],
+                  color: isDarkTheme ? Colors.grey[900] : Colors.grey[100],
                  surfaceTintColor: Colors.transparent,
                  elevation: 18.0,
                  margin: const EdgeInsets.all(0),
@@ -320,24 +317,18 @@ class AssetsInBoundBottomSheetState extends ConsumerState<MapPageBottomSheet> {
            Positioned(
              bottom: maxHeight * currentExtend.value,
              left: 0,
-              child: GestureDetector(
-                onTap: () => launchUrl(
-                  Uri.parse('https://openstreetmap.org/copyright'),
-                ),
-                child: ColoredBox(
-                  color: (widget.isDarkTheme
-                      ? Colors.grey[900]
-                      : Colors.grey[100])!,
-                  child: Padding(
-                    padding: const EdgeInsets.all(3),
-                    child: Text(
-                      '© OpenStreetMap contributors',
-                      style: TextStyle(
-                        fontSize: 6,
-                        color: !widget.isDarkTheme
-                            ? Colors.grey[900]
-                            : Colors.grey[100],
-                      ),
+              child: ColoredBox(
+                color:
+                    (widget.isDarkTheme ? Colors.grey[900] : Colors.grey[100])!,
+                child: Padding(
+                  padding: const EdgeInsets.all(3),
+                  child: Text(
+                    'OpenStreetMap contributors',
+                    style: TextStyle(
+                      fontSize: 6,
+                      color: !widget.isDarkTheme
+                          ? Colors.grey[900]
+                          : Colors.grey[100],
                    ),
                  ),
                ),
--- a/mobile/lib/modules/map/ui/map_settings_dialog.dart
+++ b/mobile/lib/modules/map/ui/map_settings_dialog.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/map/providers/map_state.provider.dart';

 class MapSettingsDialog extends HookConsumerWidget {
@@ -15,7 +16,7 @@ class MapSettingsDialog extends HookConsumerWidget {
    final showFavoriteOnly = useState(mapSettings.showFavoriteOnly);
    final showIncludeArchived = useState(mapSettings.includeArchived);
    final showRelativeDate = useState(mapSettings.relativeTime);
-    final ThemeData theme = Theme.of(context);
+    final ThemeData theme = context.themeData;

    Widget buildMapThemeSetting() {
      return SwitchListTile.adaptive(
@@ -125,7 +126,7 @@ class MapSettingsDialog extends HookConsumerWidget {
    List<Widget> getDialogActions() {
      return <Widget>[
        TextButton(
-          onPressed: () => Navigator.of(context).pop(),
+          onPressed: () => context.pop(),
          style: TextButton.styleFrom(
            backgroundColor:
                mapSettings.isDarkTheme ? Colors.grey[100] : Colors.grey[700],
@@ -146,7 +147,7 @@ class MapSettingsDialog extends HookConsumerWidget {
            mapSettingsNotifier.setRelativeTime(showRelativeDate.value);
            mapSettingsNotifier
                .switchIncludeArchived(showIncludeArchived.value);
-            Navigator.of(context).pop();
+            context.pop();
          },
          style: TextButton.styleFrom(
            backgroundColor: theme.primaryColor,
@@ -178,7 +179,7 @@ class MapSettingsDialog extends HookConsumerWidget {
        width: double.maxFinite,
        child: ConstrainedBox(
          constraints: BoxConstraints(
-            maxHeight: MediaQuery.of(context).size.height * 0.6,
+            maxHeight: context.height * 0.6,
          ),
          child: ListView(
            shrinkWrap: true,
--- a/mobile/lib/modules/map/ui/map_thumbnail.dart
+++ b/mobile/lib/modules/map/ui/map_thumbnail.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/shared/providers/server_info.provider.dart';
-import 'package:immich_mobile/utils/color_filter_generator.dart';
+import 'package:immich_mobile/modules/map/providers/map_state.provider.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:url_launcher/url_launcher.dart';

@@ -29,11 +28,7 @@ class MapThumbnail extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final tileLayer = TileLayer(
-      urlTemplate: ref.watch(
-        serverInfoProvider.select((v) => v.serverConfig.mapTileUrl),
-      ),
-    );
+    ref.watch(mapStateNotifier.select((s) => s.mapStyle));

    return SizedBox(
      height: height,
@@ -55,20 +50,14 @@ class MapThumbnail extends HookConsumerWidget {
                    'OpenStreetMap contributors',
                    onTap: () => launchUrl(
                      Uri.parse('https://openstreetmap.org/copyright'),
+                      mode: LaunchMode.externalApplication,
                    ),
                  ),
                ],
              ),
          ],
          children: [
-            isDarkTheme
-                ? InvertionFilter(
-                    child: SaturationFilter(
-                      saturation: -1,
-                      child: tileLayer,
-                    ),
-                  )
-                : tileLayer,
+            ref.read(mapStateNotifier.notifier).getTileLayer(isDarkTheme),
            if (markers.isNotEmpty) MarkerLayer(markers: markers),
          ],
        ),
--- a/mobile/lib/modules/map/views/map_page.dart
+++ b/mobile/lib/modules/map/views/map_page.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
+import 'dart:math' as math;

-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -11,6 +11,7 @@ import 'package:flutter_map_heatmap/flutter_map_heatmap.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/map/models/map_page_event.model.dart';
 import 'package:immich_mobile/modules/map/providers/map_marker.provider.dart';
 import 'package:immich_mobile/modules/map/providers/map_state.provider.dart';
@@ -20,12 +21,10 @@ import 'package:immich_mobile/modules/map/ui/map_page_bottom_sheet.dart';
 import 'package:immich_mobile/modules/map/ui/map_page_app_bar.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
-import 'package:immich_mobile/utils/color_filter_generator.dart';
 import 'package:immich_mobile/utils/debounce.dart';
-import 'package:immich_mobile/utils/flutter_map_extensions.dart';
+import 'package:immich_mobile/extensions/flutter_map_extensions.dart';
 import 'package:immich_mobile/utils/immich_app_theme.dart';
 import 'package:immich_mobile/utils/selection_handlers.dart';
 import 'package:latlong2/latlong.dart';
@@ -79,26 +78,30 @@ class MapPageState extends ConsumerState<MapPage> {
    Set<AssetMarkerData>? assetMarkers, {
    bool forceReload = false,
  }) {
-    final bounds = mapController.bounds;
-    if (bounds != null) {
-      final oldAssetsInBounds = assetsInBounds.toSet();
-      assetsInBounds =
-          assetMarkers?.where((e) => bounds.contains(e.point)).toSet() ?? {};
-      final shouldReload = forceReload ||
-          assetsInBounds.difference(oldAssetsInBounds).isNotEmpty ||
-          assetsInBounds.length != oldAssetsInBounds.length;
-      if (shouldReload) {
-        mapPageEventSC.add(
-          MapPageAssetsInBoundUpdated(
-            assetsInBounds.map((e) => e.asset).toList(),
-          ),
-        );
+    try {
+      final bounds = mapController.bounds;
+      if (bounds != null) {
+        final oldAssetsInBounds = assetsInBounds.toSet();
+        assetsInBounds =
+            assetMarkers?.where((e) => bounds.contains(e.point)).toSet() ?? {};
+        final shouldReload = forceReload ||
+            assetsInBounds.difference(oldAssetsInBounds).isNotEmpty ||
+            assetsInBounds.length != oldAssetsInBounds.length;
+        if (shouldReload) {
+          mapPageEventSC.add(
+            MapPageAssetsInBoundUpdated(
+              assetsInBounds.map((e) => e.asset).toList(),
+            ),
+          );
+        }
      }
+    } finally {
+      // Consume all error
    }
  }

  void openAssetInViewer(Asset asset) {
-    AutoRouter.of(context).push(
+    context.autoPush(
      GalleryViewerRoute(
        initialIndex: 0,
        loadAsset: (index) => asset,
@@ -120,6 +123,10 @@ class MapPageState extends ConsumerState<MapPage> {
    final selectedAssets = useState(<Asset>{});
    final showLoadingIndicator = useState(false);
    final refetchMarkers = useState(true);
+    final isLoading =
+        ref.watch(mapStateNotifier.select((state) => state.isLoading));
+    final maxZoom = ref.read(mapStateNotifier.notifier).maxZoom;
+    final zoomLevel = math.min(maxZoom, 14.0);

    if (refetchMarkers.value) {
      mapMarkerData.value = ref.watch(mapMarkersProvider).when(
@@ -168,7 +175,6 @@ class MapPageState extends ConsumerState<MapPage> {
        final mapMarker = mapMarkerData.value
            .firstWhereOrNull((e) => e.asset.id == assetInBottomSheet.id);
        if (mapMarker != null) {
-          const zoomLevel = 16.0;
          LatLng? newCenter = mapController.centerBoundsWithPadding(
            mapMarker.point,
            const Offset(0, -120),
@@ -230,7 +236,7 @@ class MapPageState extends ConsumerState<MapPage> {
        forceAssetUpdate = true;
        mapController.move(
          LatLng(currentUserLocation.latitude, currentUserLocation.longitude),
-          12,
+          zoomLevel,
        );
      } catch (error) {
        log.severe(
@@ -359,24 +365,6 @@ class MapPageState extends ConsumerState<MapPage> {
      selectedAssets.value = selection;
    }

-    final tileLayer = TileLayer(
-      urlTemplate: ref.watch(
-        serverInfoProvider.select((v) => v.serverConfig.mapTileUrl),
-      ),
-      maxNativeZoom: 19,
-      maxZoom: 19,
-    );
-
-    final darkTileLayer = InvertionFilter(
-      child: SaturationFilter(
-        saturation: -1,
-        child: BrightnessFilter(
-          brightness: -1,
-          child: tileLayer,
-        ),
-      ),
-    );
-
    final markerLayer = MarkerLayer(
      markers: [
        if (closestAssetMarker.value != null)
@@ -451,41 +439,43 @@ class MapPageState extends ConsumerState<MapPage> {
          extendBodyBehindAppBar: true,
          body: Stack(
            children: [
-              FlutterMap(
-                mapController: mapController,
-                options: MapOptions(
-                  maxBounds:
-                      LatLngBounds(LatLng(-90, -180.0), LatLng(90.0, 180.0)),
-                  interactiveFlags: InteractiveFlag.doubleTapZoom |
-                      InteractiveFlag.drag |
-                      InteractiveFlag.flingAnimation |
-                      InteractiveFlag.pinchMove |
-                      InteractiveFlag.pinchZoom,
-                  center: LatLng(20, 20),
-                  zoom: 2,
-                  minZoom: 1,
-                  maxZoom: 18, // max level supported by OSM,
-                  onMapReady: () {
-                    mapController.mapEventStream.listen(onMapEvent);
-                  },
+              if (!isLoading)
+                FlutterMap(
+                  mapController: mapController,
+                  options: MapOptions(
+                    maxBounds:
+                        LatLngBounds(LatLng(-90, -180.0), LatLng(90.0, 180.0)),
+                    interactiveFlags: InteractiveFlag.doubleTapZoom |
+                        InteractiveFlag.drag |
+                        InteractiveFlag.flingAnimation |
+                        InteractiveFlag.pinchMove |
+                        InteractiveFlag.pinchZoom,
+                    center: LatLng(20, 20),
+                    zoom: 2,
+                    minZoom: 1,
+                    maxZoom: maxZoom,
+                    onMapReady: () {
+                      mapController.mapEventStream.listen(onMapEvent);
+                    },
+                  ),
+                  children: [
+                    ref.read(mapStateNotifier.notifier).getTileLayer(),
+                    heatMapLayer,
+                    markerLayer,
+                  ],
                ),
-                children: [
-                  isDarkTheme ? darkTileLayer : tileLayer,
-                  heatMapLayer,
-                  markerLayer,
-                ],
-              ),
-              MapPageBottomSheet(
-                mapPageEventStream: mapPageEventSC.stream,
-                bottomSheetEventSC: bottomSheetEventSC,
-                selectionEnabled: selectionEnabledHook.value,
-                selectionlistener: selectionListener,
-                isDarkTheme: isDarkTheme,
-              ),
-              if (showLoadingIndicator.value)
+              if (!isLoading)
+                MapPageBottomSheet(
+                  mapPageEventStream: mapPageEventSC.stream,
+                  bottomSheetEventSC: bottomSheetEventSC,
+                  selectionEnabled: selectionEnabledHook.value,
+                  selectionlistener: selectionListener,
+                  isDarkTheme: isDarkTheme,
+                ),
+              if (showLoadingIndicator.value || isLoading)
                Positioned(
-                  top: MediaQuery.of(context).size.height * 0.35,
-                  left: MediaQuery.of(context).size.width * 0.425,
+                  top: context.height * 0.35,
+                  left: context.width * 0.425,
                  child: const ImmichLoadingIndicator(),
                ),
            ],
--- a/mobile/lib/modules/memories/ui/memory_lane.dart
+++ b/mobile/lib/modules/memories/ui/memory_lane.dart
@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/memories/providers/memory.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
@@ -31,7 +31,7 @@ class MemoryLane extends HookConsumerWidget {
                        child: GestureDetector(
                          onTap: () {
                            HapticFeedback.heavyImpact();
-                            AutoRouter.of(context).push(
+                            context.autoPush(
                              MemoryRoute(
                                memories: memories,
                                memoryIndex: index,
--- a/mobile/lib/modules/memories/views/memory_page.dart
+++ b/mobile/lib/modules/memories/views/memory_page.dart
@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/memories/models/memory.dart';
 import 'package:immich_mobile/modules/memories/ui/memory_card.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -182,14 +182,14 @@ class MemoryPage extends HookConsumerWidget {
                  currentMemory.value.assets.length;
              if (isLastAsset &&
                  (offset > notification.metrics.maxScrollExtent + 150)) {
-                AutoRouter.of(context).pop();
+                context.autoPop();
                return true;
              }
            }
            // Horizontal scroll handling
            if (notification.depth == 1 &&
                (offset > notification.metrics.maxScrollExtent + 100)) {
-              AutoRouter.of(context).pop();
+              context.autoPop();
              return true;
            }
          }
@@ -244,7 +244,7 @@ class MemoryPage extends HookConsumerWidget {
                          child: MemoryCard(
                            asset: asset,
                            onTap: () => toNextAsset(index),
-                            onClose: () => AutoRouter.of(context).pop(),
+                            onClose: () => context.autoPop(),
                            rightCornerText: assetProgress.value,
                            title: memories[mIndex].title,
                            showTitle: index == 0,
--- a/mobile/lib/modules/onboarding/views/permission_onboarding_page.dart
+++ b/mobile/lib/modules/onboarding/views/permission_onboarding_page.dart
@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart';
@@ -11,7 +11,6 @@ import 'package:immich_mobile/shared/ui/immich_title_text.dart';
 import 'package:permission_handler/permission_handler.dart';

 class PermissionOnboardingPage extends HookConsumerWidget {
-
  const PermissionOnboardingPage({super.key});

  @override
@@ -21,13 +20,10 @@ class PermissionOnboardingPage extends HookConsumerWidget {
    // Navigate to the main Tab Controller when permission is granted
    void goToHome() {
      // Resume backup (if enable) then navigate
-      ref.watch(backupProvider.notifier).resumeBackup()
-        .catchError((error) {
+      ref.watch(backupProvider.notifier).resumeBackup().catchError((error) {
        debugPrint('PermissionOnboardingPage error: $error');
      });
-      AutoRouter.of(context).replace(
-        const TabControllerRoute(),
-      );
+      context.autoReplace(const TabControllerRoute());
    }

    // When the permission is denied, we show a request permission page
@@ -38,21 +34,21 @@ class PermissionOnboardingPage extends HookConsumerWidget {
        children: [
          Text(
            'permission_onboarding_request',
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.textTheme.titleMedium,
            textAlign: TextAlign.center,
          ).tr(),
          const SizedBox(height: 18),
          ElevatedButton(
            onPressed: () => ref
-              .read(galleryPermissionNotifier.notifier)
-              .requestGalleryPermission()
-              .then((permission) async {
-                if (permission.isGranted) {
-                  // If permission is limited, we will show the limited
-                  // permission page
-                  goToHome();
-                }
-              }),
+                .read(galleryPermissionNotifier.notifier)
+                .requestGalleryPermission()
+                .then((permission) async {
+              if (permission.isGranted) {
+                // If permission is limited, we will show the limited
+                // permission page
+                goToHome();
+              }
+            }),
            child: const Text(
              'permission_onboarding_grant_permission',
            ).tr(),
@@ -70,7 +66,7 @@ class PermissionOnboardingPage extends HookConsumerWidget {
        children: [
          Text(
            'permission_onboarding_permission_granted',
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.textTheme.titleMedium,
            textAlign: TextAlign.center,
          ).tr(),
          const SizedBox(height: 18),
@@ -90,14 +86,15 @@ class PermissionOnboardingPage extends HookConsumerWidget {
        crossAxisAlignment: CrossAxisAlignment.center,
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
-          const Icon(Icons.warning_outlined,
+          const Icon(
+            Icons.warning_outlined,
            color: Colors.yellow,
            size: 48,
          ),
          const SizedBox(height: 8),
          Text(
            'permission_onboarding_permission_limited',
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.textTheme.titleMedium,
            textAlign: TextAlign.center,
          ).tr(),
          const SizedBox(height: 18),
@@ -123,14 +120,15 @@ class PermissionOnboardingPage extends HookConsumerWidget {
        crossAxisAlignment: CrossAxisAlignment.center,
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
-          const Icon(Icons.warning_outlined,
+          const Icon(
+            Icons.warning_outlined,
            color: Colors.red,
            size: 48,
          ),
          const SizedBox(height: 8),
          Text(
            'permission_onboarding_permission_denied',
-            style: Theme.of(context).textTheme.titleMedium,
+            style: context.textTheme.titleMedium,
            textAlign: TextAlign.center,
          ).tr(),
          const SizedBox(height: 18),
@@ -186,13 +184,10 @@ class PermissionOnboardingPage extends HookConsumerWidget {
                  child: const Text('permission_onboarding_log_out').tr(),
                  onPressed: () {
                    ref.read(authenticationProvider.notifier).logout();
-                    AutoRouter.of(context).replace(
-                      const LoginRoute(),
-                    );
+                    context.autoReplace(const LoginRoute());
                  },
                ),
              ],
-
            ),
          ),
        ),
--- a/mobile/lib/modules/partner/services/partner.service.dart
+++ b/mobile/lib/modules/partner/services/partner.service.dart
@@ -36,7 +36,7 @@ class PartnerService {
      final userDtos =
          await _apiService.partnerApi.getPartners(direction._value);
      if (userDtos != null) {
-        return userDtos.map((u) => User.fromDto(u)).toList();
+        return userDtos.map((u) => User.fromPartnerDto(u)).toList();
      }
    } catch (e) {
      _log.warning("failed to get partners for direction $direction:\n$e");
--- a/mobile/lib/modules/partner/ui/partner_list.dart
+++ b/mobile/lib/modules/partner/ui/partner_list.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/user.dart';
 import 'package:immich_mobile/shared/ui/user_avatar.dart';
@@ -21,17 +21,26 @@ class PartnerList extends HookConsumerWidget {
  Widget listEntry(BuildContext context, int index) {
    final User p = partner[index];
    return ListTile(
-      contentPadding: const EdgeInsets.symmetric(horizontal: 12.0),
-      leading: userAvatar(context, p, radius: 30),
+      contentPadding: const EdgeInsets.only(
+        left: 12.0,
+        right: 18.0,
+      ),
+      leading: userAvatar(context, p, radius: 24),
      title: Text(
-        "${p.firstName} ${p.lastName}'s photos",
-        style: TextStyle(
+        "${p.name}'s photos",
+        style: const TextStyle(
          fontWeight: FontWeight.bold,
          fontSize: 14,
-          color: Theme.of(context).primaryColor,
        ),
      ),
-      onTap: () => AutoRouter.of(context).push(PartnerDetailRoute(partner: p)),
+      trailing: Text(
+        "View all",
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+          color: context.primaryColor,
+        ),
+      ),
+      onTap: () => context.autoPush((PartnerDetailRoute(partner: p))),
    );
  }
 }
--- a/mobile/lib/modules/partner/views/partner_detail_page.dart
+++ b/mobile/lib/modules/partner/views/partner_detail_page.dart
@@ -25,7 +25,7 @@ class PartnerDetailPage extends HookConsumerWidget {

    return Scaffold(
      appBar: AppBar(
-        title: Text("${partner.firstName} ${partner.lastName}"),
+        title: Text(partner.name),
        elevation: 0,
        centerTitle: false,
      ),
@@ -34,7 +34,7 @@ class PartnerDetailPage extends HookConsumerWidget {
            ? Padding(
                padding: const EdgeInsets.all(16),
                child: Text(
-                    "It seems ${partner.firstName} does not have any photos...\n"
+                    "It seems ${partner.name} does not have any photos...\n"
                    "Or your server version does not match the app version."),
              )
            : ImmichAssetGrid(
--- a/mobile/lib/modules/partner/views/partner_page.dart
+++ b/mobile/lib/modules/partner/views/partner_page.dart
@@ -41,7 +41,7 @@ class PartnerPage extends HookConsumerWidget {
                        padding: const EdgeInsets.only(right: 8),
                        child: userAvatar(context, u),
                      ),
-                      Text("${u.firstName} ${u.lastName}"),
+                      Text(u.name),
                    ],
                  ),
                ),
@@ -71,7 +71,7 @@ class PartnerPage extends HookConsumerWidget {
          return ConfirmDialog(
            title: "partner_page_stop_sharing_title",
            content:
-                "partner_page_stop_sharing_content".tr(args: [u.firstName]),
+                "partner_page_stop_sharing_content".tr(args: [u.name]),
            onOk: () => ref.read(partnerServiceProvider).removePartner(u),
          );
        },
--- a/mobile/lib/modules/search/ui/curated_people_row.dart
+++ b/mobile/lib/modules/search/ui/curated_people_row.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
 import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
 import 'package:immich_mobile/shared/models/store.dart';
@@ -85,7 +86,7 @@ class CuratedPeopleRow extends StatelessWidget {
                        "Add name",
                        style: TextStyle(
                          fontWeight: FontWeight.bold,
-                          color: Theme.of(context).primaryColor,
+                          color: context.primaryColor,
                        ),
                      ),
                    ),
--- a/mobile/lib/modules/search/ui/curated_places_row.dart
+++ b/mobile/lib/modules/search/ui/curated_places_row.dart
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/map/ui/map_thumbnail.dart';
 import 'package:immich_mobile/modules/search/ui/curated_row.dart';
 import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
@@ -25,7 +25,7 @@ class CuratedPlacesRow extends CuratedRow {
    final int actualContentIndex = isMapEnabled ? 1 : 0;
    Widget buildMapThumbnail() {
      return GestureDetector(
-        onTap: () => AutoRouter.of(context).push(
+        onTap: () => context.autoPush(
          const MapRoute(),
        ),
        child: SizedBox(
@@ -43,21 +43,24 @@ class CuratedPlacesRow extends CuratedRow {
                  ),
                  height: imageSize,
                  showAttribution: false,
-                  isDarkTheme: Theme.of(context).brightness == Brightness.dark,
+                  isDarkTheme: context.isDarkTheme,
                ),
              ),
-              Container(
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(10),
-                  color: Colors.black,
-                  gradient: LinearGradient(
-                    begin: FractionalOffset.topCenter,
-                    end: FractionalOffset.bottomCenter,
-                    colors: [
-                      Colors.blueGrey.withOpacity(0.0),
-                      Colors.black.withOpacity(0.4),
-                    ],
-                    stops: const [0.0, 1.0],
+              Padding(
+                padding: const EdgeInsets.only(right: 10.0),
+                child: Container(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: Colors.black,
+                    gradient: LinearGradient(
+                      begin: FractionalOffset.topCenter,
+                      end: FractionalOffset.bottomCenter,
+                      colors: [
+                        Colors.blueGrey.withOpacity(0.0),
+                        Colors.black.withOpacity(0.4),
+                      ],
+                      stops: const [0.0, 0.4],
+                    ),
                  ),
                ),
              ),
--- a/mobile/lib/modules/search/ui/explore_grid.dart
+++ b/mobile/lib/modules/search/ui/explore_grid.dart
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
 import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -50,13 +50,13 @@ class ExploreGrid extends StatelessWidget {
          borderRadius: 0,
          onTap: () {
            isPeople
-                ? AutoRouter.of(context).push(
+                ? context.autoPush(
                    PersonResultRoute(
                      personId: content.id,
                      personName: content.label,
                    ),
                  )
-                : AutoRouter.of(context).push(
+                : context.autoPush(
                    SearchResultRoute(searchTerm: 'm:${content.label}'),
                  );
          },
--- a/mobile/lib/modules/search/ui/immich_search_bar.dart
+++ b/mobile/lib/modules/search/ui/immich_search_bar.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';

 class ImmichSearchBar extends HookConsumerWidget
@@ -57,11 +58,11 @@ class ImmichSearchBar extends HookConsumerWidget
        },
        decoration: InputDecoration(
          hintText: 'search_bar_hint'.tr(),
-          hintStyle: Theme.of(context).textTheme.titleSmall?.copyWith(
-                color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5),
-                fontWeight: FontWeight.w500,
-                fontSize: 14,
-              ),
+          hintStyle: context.textTheme.titleSmall?.copyWith(
+            color: context.themeData.colorScheme.onSurface.withOpacity(0.5),
+            fontWeight: FontWeight.w500,
+            fontSize: 14,
+          ),
          enabledBorder: const UnderlineInputBorder(
            borderSide: BorderSide(color: Colors.transparent),
          ),
--- a/mobile/lib/modules/search/ui/person_name_edit_form.dart
+++ b/mobile/lib/modules/search/ui/person_name_edit_form.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/providers/people.provider.dart';

 class PersonNameEditFormResult {
@@ -71,7 +72,7 @@ class PersonNameEditForm extends HookConsumerWidget {
          child: Text(
            "Save",
            style: TextStyle(
-              color: Theme.of(context).primaryColor,
+              color: context.primaryColor,
              fontWeight: FontWeight.bold,
            ),
          ),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mertalev	683bb88f8b	updated dockerfile	2023-11-12 18:03:08 -05:00
mertalev	ae80def7f2	export cli	2023-11-12 18:01:12 -05:00
Fynn Petersen-Frey	069a32dcdb	fix(mobile): run user sync operation with lock (#4984 )	2023-11-12 10:35:08 -06:00
bo0tzz	388144823a	chore(renovate): PR exiftool updates separately (#4985 )	2023-11-12 17:07:55 +01:00
renovate[bot]	c23d84be39	chore(deps): update dependency @types/node to v20.9.0 (#4983 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 15:15:44 +00:00
renovate[bot]	66120025b7	fix(deps): update dependency tailwindcss to v3.3.5 (#4980 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 10:04:24 -05:00
renovate[bot]	da33653b0a	chore(deps): update dependency @types/js-yaml to v4.0.9 (#4970 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 09:51:24 -05:00
renovate[bot]	3ea0210c1d	chore(deps): update dependency @types/mime-types to v2.1.4 (#4971 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 09:50:55 -05:00
Ploonet	98f1e85c87	fix(docs): Typo in libraries exclusion pattern (#4972 ) Co-authored-by: Antony Mota <amota.confluenceconseil@boiron.fr>	2023-11-12 09:49:47 -05:00
renovate[bot]	d2509c619e	chore(deps): update dependency jest-extended to v4.0.2 (#4976 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 09:48:43 -05:00
renovate[bot]	2bfe5d1573	chore(deps): update dependency @types/mock-fs to v4.13.4 (#4975 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 09:48:17 -05:00
Daniel Dietzler	d7d464570f	fix maplibre latlng import (#4977 )	2023-11-12 14:46:17 +01:00
Alex Tran	2e82476cff	chore: styling for partner stylesheet	2023-11-11 23:02:26 -06:00
renovate[bot]	2f462717aa	chore(deps): update dependency @types/cli-progress to v3.11.5 (#4968 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-11 22:36:03 -05:00
renovate[bot]	86e04832a1	chore(deps): update dependency @types/jest to v29.5.8 (#4969 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-11 22:35:33 -05:00
Alex	96f1a271ef	chore: update Makefile to use docker compose (#4967 )	2023-11-12 01:31:01 +00:00
Sergey Kondrikov	55e3605ca4	feat(web): uniform random asset selection in slideshow mode (#4953 ) * Implement weighted asset selection * Rename totalAssets -> bucketCount * Remove redundant check	2023-11-12 01:23:15 +00:00
renovate[bot]	0bf55d8e32	chore(deps): update dependency @types/chai to v4.3.10 (#4966 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 01:10:37 +00:00
renovate[bot]	2dcad93d9c	chore(deps): update dependency @types/byte-size to v8.1.2 (#4965 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-12 01:09:16 +00:00
Mert	328a58ac0d	feat(ml): add face models (#4952 ) added models to config dropdown fixed downloading updated tests use hf for face models formatting	2023-11-11 19:04:49 -06:00
Brian Austin	7fca0d8da5	fix: replace first and last name with single field (#4915 )	2023-11-11 19:03:32 -06:00
renovate[bot]	413ab2c538	chore(deps): update postgres:14-alpine docker digest to 874f566 (#4963 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-11 19:58:46 -05:00
renovate[bot]	394e0dfe37	chore(deps): update redis:6.2-alpine docker digest to 3995fe6 (#4964 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-11 19:58:01 -05:00
renovate[bot]	a9b6acec28	chore(deps): update ghcr.io/nginxinc/nginx-unprivileged:1.25.0-alpine3.17 docker digest to 5ebb90a (#4960 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-11-11 16:54:55 -06:00
Daniel Dietzler	ad4cbf20de	refactor: map (#4957 ) * fix mixed up lng lat for asset map * minor cleanup * update packages	2023-11-11 16:32:39 -06:00
bo0tzz	26fd797ac9	chore: re-enable renovate (#4955 ) * Chore: reenable renovate * chore(renovate): Don't group major updates * chore(renovate): Use matchFileNames	2023-11-11 16:31:58 -06:00
Alex	35767591d2	feat(web): show partners assets on the main timeline (#4933 )	2023-11-11 21:06:19 +00:00
aphymi	3b11854702	fix(mobile): fix JSON-format typos in Asset model (#4942 )	2023-11-10 02:56:30 +00:00
Mansour	895129c997	feat!: add docker project name (#4906 ) * add: docker project name * chore: linting --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2023-11-09 21:43:21 -05:00
martin	92ec1ce77f	fix(server,web): correctly show album level like (#4916 ) * fix: like in global activity * refactor: rename isGlobal to ReactionLevel.Album * chore: open api * chore: e2e test for album vs comment duplicate like checking --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2023-11-09 21:32:31 -05:00
Sushain Cherivirala	986bbfa831	feat(server): don't re-run face recognition on assets without any faces (#4854 ) * Add AssetJobStatus * fentity * Add jobStatus field to AssetEntity * Fix the migration doc paths * Filter on facesRecognizedAt * Set facesRecognizedAt field * Test for facesRecognizedAt * Done testing * Adjust FK properties * Add tests for WithoutProperty.FACES * chore: non-nullable --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2023-11-09 20:55:00 -05:00
Jason Rasmussen	75c065c83a	chore(server): e2e test (#4941 )	2023-11-09 20:23:03 -05:00
Alex	9c0805c37a	fix(server): non-admin cannot use map (#4934 ) * fix(server): non-admin cannot user map * fix: admin route --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2023-11-09 13:52:10 -06:00
shenlong	bffc2cdf60	refactor(mobile): build context extensions (#4923 ) * refactor: move all extensions to separate package * refactor(mobile): add BuildContext extension * refactor(mobile): use theme getters from context * refactor(mobile): use media query size from context * refactor(mobile): use auto router methods from context * refactor(mobile): use navigator methods from context --------- Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2023-11-09 10:19:53 -06:00
Daniel Dietzler	a147dee4b6	feat: Maplibre (#4294 ) * maplibre on web, custom styles from server Actually use new vector tile server, custom style.json support multiple style files, light/dark mode cleanup, use new map everywhere send file directly instead of loading first better light/dark mode switching remove leaflet fix mapstyles dto, first draft of map settings delete and add styles fix delete default styles fix tests only allow one light and one dark style url revert config core changes fix server config store fix tests move axios fetches to repo fix package-lock fix tests * open api * add assets to docker container * web: use mapSettings color for style * style: add unique ids to map styles * mobile: use style json for vector / raster * do not use svelte-material-icons * add click events to markers, simplify asset detail map * improve map performance by using asset thumbnails for markers instead of original file * Remove custom attribution (by request) * mobile: update map attribution * style: map dark mode * style: map light mode * zoom level for state * styling * overflow gradient * Limit maxZoom to 14 * mobile: listen for mapStyle changes in MapThumbnail * mobile: update concurrency --------- Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: bo0tzz <git@bo0tzz.me> Co-authored-by: Alex <alex.tran1502@gmail.com>	2023-11-09 10:10:56 -06:00
Jason Rasmussen	5423f1c25b	refactor(server): auth dtos (#4881 ) * refactor: auth dtos * chore: open api	2023-11-09 10:14:15 -05:00
shenlong	5c602bf4d4	fix(mobile): add label for expire after in shared link edit page (#4920 ) Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2023-11-09 08:36:57 -06:00
bo0tzz	5db73c5c5c	chore(ci): use custom base for server image build (#4456 ) * Use base image for server build * Clean up build scripts * target tags for base image * use prod tag instead of runtime * use runtime stage for dev --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com> Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>	2023-11-09 13:12:05 +00:00
Michael Manganiello	52fe392a9e	fix(mobile): display simple album date when range is single day (#4919 ) This change makes albums with same start and end date, to just display a single date. Currently, date range is displayed as `Nov 9 - Nov 9 2023`. With this change, just `Nov 9 2023` is displayed. No changes are made for albums where start and end dates do not match.	2023-11-09 03:16:56 +00:00
Alex	5e1c0fb465	chore: post release tasks	2023-11-08 12:51:34 -06:00