chore: prettier

chore: fix export
fix(frontend): wss assumptions
2026-08-01 13:45:53 +00:00 · 2026-06-17 18:00:52 -04:00 · 2026-06-17 15:48:18 -04:00 · 2026-06-16 18:14:38 -04:00 · 2026-06-16 17:51:47 -04:00
1605 changed files with 39439 additions and 184684 deletions
@@ -81,6 +81,6 @@ Please follow these rules precisely:
 Use existing patterns from our codebase:

 - Variables/plurals: see `apps/frontend/src/pages/frog.vue`
- Rich-text link tags: see `apps/frontend/src/error.vue`
+- Rich-text link tags: see `apps/frontend/src/pages/auth/welcome.vue` and `apps/frontend/src/error.vue`

 When you finish, there should be no hard-coded English strings left in the template—everything comes from `formatMessage` or `<IntlFormatted>`.
@@ -27,7 +27,7 @@ jobs:
      BUMP_TYPE: minor
    steps:
      - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          fetch-depth: 0

@@ -47,7 +47,7 @@ jobs:

      - name: Setup Node
        if: steps.changes.outputs.changed == 'true'
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: .nvmrc
          registry-url: https://registry.npmjs.org
@@ -63,7 +63,7 @@ jobs:

      - name: Restore pnpm cache
        if: steps.changes.outputs.changed == 'true'
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ${{ steps.pnpm-store.outputs.store-path }}
          key: pnpm-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
        with:
          workflow_id: all
          access_token: ${{ secrets.GITHUB_TOKEN }}
@@ -17,7 +17,7 @@ jobs:

    steps:
      - name: Post or update changelog comment
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        uses: actions/github-script@d746ffe35508b1917358783b479e04febd2b8f71 # v9.0.0
        with:
          github-token: ${{ secrets.CROWDIN_GH_TOKEN }}
          script: |
@@ -12,15 +12,15 @@ jobs:
  typos:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: crate-ci/typos@bee27e3a4fd1ea2111cf90ab89cd076c870fce14 # v1.48.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: crate-ci/typos@6ac2ebd1b93eade61faf7e12688ad87a073fea59 # v1.46.0

  # see <https://github.com/influxdata/datafusion-udf-wasm/pull/275>
  tombi:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: taiki-e/install-action@fd2f5e3d644b484055ebf4268f474c565f148f25 # v2.81.9
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: taiki-e/install-action@b5fddbb5361bce8a06fb168c9d403a6cc552b084 # v2.75.29
        with:
          tool: tombi
      - run: tombi lint
@@ -6,15 +6,14 @@ on:

 env:
  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
  SQLX_OFFLINE: true

 jobs:
  shear:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable
-      - uses: cargo-bins/cargo-binstall@ead08b90bd7b2e6d81963fb9cf0b7239f66d5db4 # v1.21.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+      - uses: cargo-bins/cargo-binstall@dc19f1e48450eefe5a29b8da6c6b00a87d730b37 # v1.18.1
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear
@@ -35,7 +35,7 @@ jobs:
    if: ${{ always() }}
    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Check if workflow runs on an internal branch
        id: check-internal
@@ -72,21 +72,49 @@ jobs:
          fi

  docker:
-    runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'namespace-profile-medium-amd64' || 'ubuntu-latest' }}
+    runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'blacksmith-4vcpu-ubuntu-2404' || 'ubuntu-latest' }}
+    env:
+      SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }}
+      SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }}
+      SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }}
+      SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }}
+      SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }}
+      SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }}
+      SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }}
+      RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }}
    needs: [skip-if-clean]
    if: ${{ needs.skip-if-clean.outputs.skip != 'true' }}
    steps:
      - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0
+        uses: actions-rust-lang/setup-rust-toolchain@2b1f5e9b395427c92ee4e3331786ca3c37afe2d7 # v1.16.0
        with:
          rustflags: ''
          cache: false

-      - name: Setup mold
-        uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0
+      - name: Cache Cargo registry and index
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Mount sccache disk cache
+        if: needs.skip-if-clean.outputs.internal == 'true'
+        uses: useblacksmith/stickydisk@13af8883542ca949a717e70fef89d15edbb29d88 # v1.2.0
+        with:
+          key: ${{ github.repository }}-daedalus-sccache
+          path: /mnt/sccache
+
+      - name: Setup sccache
+        if: needs.skip-if-clean.outputs.internal == 'true'
+        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10

      - name: Build daedalus_client
        run: cargo build --release --package daedalus_client
@@ -97,11 +125,11 @@ jobs:
          cp target/release/daedalus_client apps/daedalus_client/docker-stage/daedalus_client

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Generate Docker image metadata
        id: docker-meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
        with:
@@ -116,14 +144,14 @@ jobs:
            org.opencontainers.image.licenses=MIT

      - name: Login to GitHub Packages
-        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build and push
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: ./apps/daedalus_client/docker-stage
          file: ./apps/daedalus_client/Dockerfile
@@ -12,10 +12,10 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -16,68 +16,46 @@ on:
  workflow_dispatch:
  workflow_call:
    inputs:
-      preview:
-        required: false
-        type: boolean
-        description: 'Whether this is a preview deployment'
-      head_sha:
-        required: false
+      environment:
+        required: true
        type: string
-        description: 'The commit SHA to deploy (defaults to github.sha)'
-      head_ref:
-        required: false
-        type: string
-        description: 'The branch name to deploy (defaults to github.ref_name)'
-      branch_alias:
-        required: false
-        type: string
-        description: 'The persistent preview alias for the branch'
+        description: 'The environment to deploy to (staging-preview or production-preview)'

 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.preview && 'preview' || 'push' }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.environment || 'push' }}
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/prod' }}

 jobs:
  deploy:
-    runs-on: namespace-profile-modrinth-frontend
+    runs-on: blacksmith-2vcpu-ubuntu-2404
    permissions:
      contents: read
      deployments: write
      pull-requests: write
    steps:
      - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          fetch-depth: 0

      - name: Configure environment
        id: meta
-        env:
-          PREVIEW_INPUT: ${{ inputs.preview }}
-          REF: ${{ github.ref }}
-          DEPLOY_SHA: ${{ inputs.head_sha || github.sha }}
-          BRANCH_ALIAS: ${{ inputs.branch_alias }}
        run: |
          echo "cmd=deploy" >> $GITHUB_OUTPUT

-          SHA_SHORT="${DEPLOY_SHA::8}"
+          ENV_INPUT="${{ inputs.environment }}"
+          REF="${{ github.ref }}"
+          SHA_SHORT="${GITHUB_SHA::8}"

-          if [ "$PREVIEW_INPUT" = "true" ]; then
-            URL="https://git-$SHA_SHORT-frontend.modrinth.workers.dev"
-            STAGING_URL="https://git-$SHA_SHORT-staging-frontend.modrinth.workers.dev"
+          if [ "$ENV_INPUT" = "staging-preview" ]; then
+            echo "env=staging" >> $GITHUB_OUTPUT
+            echo "url=https://git-$SHA_SHORT-frontend-staging.modrinth.workers.dev" >> $GITHUB_OUTPUT
+            echo "cmd=versions upload --preview-alias git-$SHA_SHORT --var PREVIEW:true" >> $GITHUB_OUTPUT
+
+          elif [ "$ENV_INPUT" = "production-preview" ]; then
            echo "env=production" >> $GITHUB_OUTPUT
-            echo "url=$URL" >> $GITHUB_OUTPUT
-            echo "staging_url=$STAGING_URL" >> $GITHUB_OUTPUT
-            echo "cmd=versions upload --preview-alias git-$SHA_SHORT --var PREVIEW:true --var CF_PAGES_URL:$URL" >> $GITHUB_OUTPUT
-
-            STAGING_VARS=$(jq -r '.env.staging.vars | to_entries[] | "--var \(.key):\(.value)"' ./apps/frontend/wrangler.jsonc | tr '\n' ' ')
-            echo "staging_cmd=versions upload --preview-alias git-$SHA_SHORT-staging ${STAGING_VARS}--var PREVIEW:true --var CF_PAGES_URL:$STAGING_URL" >> $GITHUB_OUTPUT
-
-            if [ -n "$BRANCH_ALIAS" ]; then
-              echo "branch_alias_url=https://$BRANCH_ALIAS-frontend.modrinth.workers.dev" >> $GITHUB_OUTPUT
-              echo "staging_branch_alias_url=https://$BRANCH_ALIAS-staging-frontend.modrinth.workers.dev" >> $GITHUB_OUTPUT
-              echo "staging_branch_alias_cmd=versions upload --preview-alias $BRANCH_ALIAS-staging ${STAGING_VARS}--var PREVIEW:true --var CF_PAGES_URL:https://$BRANCH_ALIAS-staging-frontend.modrinth.workers.dev" >> $GITHUB_OUTPUT
-            fi
+            echo "url=https://git-$SHA_SHORT-frontend.modrinth.workers.dev" >> $GITHUB_OUTPUT
+            echo "cmd=versions upload --preview-alias git-$SHA_SHORT --var PREVIEW:true" >> $GITHUB_OUTPUT

          elif [ "$REF" = "refs/heads/main" ]; then
            echo "env=staging" >> $GITHUB_OUTPUT
@@ -90,23 +68,24 @@ jobs:
          fi

      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: .nvmrc

      - name: Enable Corepack
        run: corepack enable

-      - name: Set up caches
-        uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
-        with:
-          cache: |
-            rust
-            pnpm
-            apt
+      - name: Get pnpm store path
+        id: pnpm-store
+        run: echo "store-path=$(pnpm store path --silent)" >> $GITHUB_OUTPUT

-      - name: Set up Turborepo caching
-        uses: namespace-actions/setup-turbocache@f96bd6befa13ae74b2858a5be49573640d4636f5 # v0.0.2
+      - name: Restore pnpm cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: ${{ steps.pnpm-store.outputs.store-path }}
+          key: pnpm-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-cache-

      - name: Inject build variables
        working-directory: ./apps/frontend
@@ -127,15 +106,15 @@ jobs:
        working-directory: ./apps/frontend
        run: pnpm build
        env:
-          CF_PAGES_BRANCH: ${{ inputs.head_ref || github.ref_name }}
-          CF_PAGES_COMMIT_SHA: ${{ inputs.head_sha || github.sha }}
+          CF_PAGES_BRANCH: ${{ github.ref_name }}
+          CF_PAGES_COMMIT_SHA: ${{ github.sha }}
          CF_PAGES_URL: ${{ steps.meta.outputs.url }}
          BUILD_ENV: ${{ steps.meta.outputs.env }}
-          PREVIEW: ${{ inputs.preview && 'true' || 'false' }}
+          PREVIEW: ${{ inputs.environment != '' && 'true' || 'false' }}
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

      - name: Create Sentry release and upload sourcemaps
-        uses: getsentry/action-release@ff07929a6537bac57790c3451cf4d364aca38528 # v3.7.0
+        uses: getsentry/action-release@5657c9e888b4e2cc85f4d29143ea4131fde4a73a # v3.6.0
        env:
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_ORG: modrinth
@@ -145,53 +124,17 @@ jobs:
          sourcemaps: ./apps/frontend/.output/server
          url_prefix: '~/'

-      - name: Install Wrangler CLI
-        uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
+      - name: Deploy Cloudflare Worker
+        id: wrangler
+        uses: cloudflare/wrangler-action@9acf94ace14e7dc412b076f2c5c20b8ce93c79cd # v3.15.0
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          environment: ${{ steps.meta.outputs.env != 'production' && steps.meta.outputs.env || '' }}
          workingDirectory: ./apps/frontend
          packageManager: pnpm
-          wranglerVersion: '4.112.0'
-          command: --version
-
-      - parallel:
-          - name: Deploy Cloudflare Worker
-            id: wrangler
-            uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
-            with:
-              apiToken: ${{ secrets.CF_API_TOKEN }}
-              accountId: ${{ secrets.CF_ACCOUNT_ID }}
-              environment: ${{ steps.meta.outputs.env != 'production' && steps.meta.outputs.env || '' }}
-              workingDirectory: ./apps/frontend
-              command: ${{ steps.meta.outputs.cmd }}
-
-          - name: Deploy staging Cloudflare Worker preview
-            if: ${{ inputs.preview }}
-            uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
-            with:
-              apiToken: ${{ secrets.CF_API_TOKEN }}
-              accountId: ${{ secrets.CF_ACCOUNT_ID }}
-              workingDirectory: ./apps/frontend
-              command: ${{ steps.meta.outputs.staging_cmd }}
-
-          - name: Deploy persistent Cloudflare Worker preview
-            if: ${{ inputs.preview && inputs.branch_alias != '' }}
-            uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
-            with:
-              apiToken: ${{ secrets.CF_API_TOKEN }}
-              accountId: ${{ secrets.CF_ACCOUNT_ID }}
-              workingDirectory: ./apps/frontend
-              command: versions upload --preview-alias ${{ inputs.branch_alias }} --var PREVIEW:true --var CF_PAGES_URL:${{ steps.meta.outputs.branch_alias_url }}
-
-          - name: Deploy persistent staging Cloudflare Worker preview
-            if: ${{ inputs.preview && inputs.branch_alias != '' }}
-            uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
-            with:
-              apiToken: ${{ secrets.CF_API_TOKEN }}
-              accountId: ${{ secrets.CF_ACCOUNT_ID }}
-              workingDirectory: ./apps/frontend
-              command: ${{ steps.meta.outputs.staging_branch_alias_cmd }}
+          wranglerVersion: '4.54.0'
+          command: ${{ steps.meta.outputs.cmd }}

      - name: Purge cache
        if: github.ref == 'refs/heads/prod'
@@ -202,23 +145,14 @@ jobs:
            --data '{"hosts": ["modrinth.com", "www.modrinth.com", "staging.modrinth.com"]}' \
            https://api.cloudflare.com/client/v4/zones/e39df17b9c4ef44cbce2646346ee6d33/purge_cache

-      - name: Write deployment URLs to files
-        if: ${{ inputs.preview }}
+      - name: Write deployment URL to file
+        if: ${{ inputs.environment != '' }}
        run: |
-          echo "${{ steps.meta.outputs.url }}" > deployment-url-production.txt
-          echo "${{ steps.meta.outputs.staging_url }}" > deployment-url-staging.txt
+          echo "${{ steps.meta.outputs.url }}" > deployment-url-${{ inputs.environment }}.txt

-      - parallel:
-          - name: Upload production deployment URL
-            if: ${{ inputs.preview }}
-            uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-            with:
-              name: deployment-url-production
-              path: deployment-url-production.txt
-
-          - name: Upload staging deployment URL
-            if: ${{ inputs.preview }}
-            uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-            with:
-              name: deployment-url-staging
-              path: deployment-url-staging.txt
+      - name: Upload deployment URL
+        if: ${{ inputs.environment != '' }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: deployment-url-${{ inputs.environment }}
+          path: deployment-url-${{ inputs.environment }}.txt
@@ -12,34 +12,22 @@ on:
      - '.github/workflows/frontend-preview.yml'

 jobs:
-  metadata:
-    if: github.repository_owner == 'modrinth' && github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-latest
-    outputs:
-      branch-alias: ${{ steps.meta.outputs.branch_alias }}
-    steps:
-      - name: Configure branch alias
-        id: meta
-        run: echo "branch_alias=pr-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
-
  deploy:
    if: github.repository_owner == 'modrinth' && github.event.pull_request.head.repo.full_name == github.repository
-    needs: metadata
    uses: ./.github/workflows/frontend-deploy.yml
    secrets: inherit
    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-deploy
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.environment }}
      cancel-in-progress: true
+    strategy:
+      matrix:
+        environment: [staging-preview, production-preview]
    with:
-      preview: true
-      head_sha: ${{ github.event.pull_request.head.sha }}
-      head_ref: ${{ github.event.pull_request.head.ref }}
-      branch_alias: ${{ needs.metadata.outputs.branch-alias }}
+      environment: ${{ matrix.environment }}

  deploy-storybook:
    if: github.repository_owner == 'modrinth' && github.event.pull_request.head.repo.full_name == github.repository
-    needs: metadata
-    runs-on: namespace-profile-modrinth-frontend
+    runs-on: blacksmith-2vcpu-ubuntu-2404
    concurrency:
      group: ${{ github.workflow }}-${{ github.ref }}-storybook
      cancel-in-progress: true
@@ -48,21 +36,27 @@ jobs:
      deployments: write
    steps:
      - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: .nvmrc

      - name: Enable Corepack
        run: corepack enable

-      - name: Set up caches
-        uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
+      - name: Get pnpm store path
+        id: pnpm-store
+        run: echo "store-path=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
+
+      - name: Restore pnpm cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
-          cache: |
-            pnpm
+          path: ${{ steps.pnpm-store.outputs.store-path }}
+          key: pnpm-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-cache-

      - name: Install dependencies
        working-directory: ./packages/ui
@@ -70,53 +64,26 @@ jobs:

      - name: Build Storybook
        working-directory: ./packages/ui
-        env:
-          NODE_OPTIONS: --max-old-space-size=6144
        run: pnpm run build-storybook

      - name: Configure short SHA
        id: meta
-        env:
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-        run: echo "sha_short=${HEAD_SHA::8}" >> $GITHUB_OUTPUT
+        run: echo "sha_short=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT

-      - name: Install Wrangler CLI
-        uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
+      - name: Deploy Storybook preview
+        uses: cloudflare/wrangler-action@9acf94ace14e7dc412b076f2c5c20b8ce93c79cd # v3.15.0
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
          workingDirectory: ./packages/ui
          packageManager: pnpm
-          wranglerVersion: '4.112.0'
-          command: --version
-
-      - parallel:
-          - name: Deploy Storybook preview
-            uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
-            with:
-              apiToken: ${{ secrets.CF_API_TOKEN }}
-              accountId: ${{ secrets.CF_ACCOUNT_ID }}
-              workingDirectory: ./packages/ui
-              command: versions upload --preview-alias git-${{ steps.meta.outputs.sha_short }}
-
-          - name: Deploy persistent Storybook preview
-            uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4.0.0
-            env:
-              NODE_OPTIONS: --max-old-space-size=6144
-            with:
-              apiToken: ${{ secrets.CF_API_TOKEN }}
-              accountId: ${{ secrets.CF_ACCOUNT_ID }}
-              workingDirectory: ./packages/ui
-              command: versions upload --preview-alias ${{ needs.metadata.outputs.branch-alias }}
+          wranglerVersion: '4.54.0'
+          command: versions upload --preview-alias git-${{ steps.meta.outputs.sha_short }}

  comment:
-    if: |
-      !cancelled()
-      && github.repository_owner == 'modrinth'
-      && github.event.pull_request.head.repo.full_name == github.repository
-      && needs.deploy.result == 'success'
+    if: github.repository_owner == 'modrinth' && github.event.pull_request.head.repo.full_name == github.repository
    runs-on: ubuntu-latest
-    needs: [metadata, deploy, deploy-storybook]
+    needs: [deploy, deploy-storybook]
    steps:
      - name: Download deployment URLs
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -126,31 +93,16 @@ jobs:

      - name: Read deployment URLs
        id: urls
-        env:
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-          BRANCH_ALIAS: ${{ needs.metadata.outputs.branch-alias }}
-          STORYBOOK_RESULT: ${{ needs.deploy-storybook.result }}
-          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
        run: |
-          STAGING_SHA_URL=$(cat deployment-url-staging.txt)
-          PRODUCTION_SHA_URL=$(cat deployment-url-production.txt)
-          STAGING_BRANCH_URL="https://$BRANCH_ALIAS-staging-frontend.modrinth.workers.dev"
-          PRODUCTION_BRANCH_URL="https://$BRANCH_ALIAS-frontend.modrinth.workers.dev"
+          STAGING_PREVIEW_URL=$(cat deployment-url-staging-preview.txt)
+          PRODUCTION_PREVIEW_URL=$(cat deployment-url-production-preview.txt)

-          if [ "$STORYBOOK_RESULT" = "success" ]; then
-            STORYBOOK_SHA_URL="https://git-${HEAD_SHA::8}-storybook.modrinth.workers.dev"
-            STORYBOOK_BRANCH_URL="https://$BRANCH_ALIAS-storybook.modrinth.workers.dev"
-          else
-            STORYBOOK_SHA_URL="⚠️ Deployment $STORYBOOK_RESULT ([logs]($RUN_URL))"
-            STORYBOOK_BRANCH_URL="⚠️ Deployment $STORYBOOK_RESULT ([logs]($RUN_URL))"
-          fi
+          echo "Production preview URL: $PRODUCTION_PREVIEW_URL"
+          echo "Staging preview URL: $STAGING_PREVIEW_URL"

-          echo "staging-sha-url=$STAGING_SHA_URL" >> $GITHUB_OUTPUT
-          echo "production-sha-url=$PRODUCTION_SHA_URL" >> $GITHUB_OUTPUT
-          echo "storybook-sha-url=$STORYBOOK_SHA_URL" >> $GITHUB_OUTPUT
-          echo "staging-branch-url=$STAGING_BRANCH_URL" >> $GITHUB_OUTPUT
-          echo "production-branch-url=$PRODUCTION_BRANCH_URL" >> $GITHUB_OUTPUT
-          echo "storybook-branch-url=$STORYBOOK_BRANCH_URL" >> $GITHUB_OUTPUT
+          echo "staging-preview-url=$STAGING_PREVIEW_URL" >> $GITHUB_OUTPUT
+          echo "production-preview-url=$PRODUCTION_PREVIEW_URL" >> $GITHUB_OUTPUT
+          echo "storybook-preview-url=https://git-${GITHUB_SHA::8}-storybook.modrinth.workers.dev" >> $GITHUB_OUTPUT

      - name: Find comment
        if: github.event_name == 'pull_request'
@@ -171,21 +123,11 @@ jobs:
          body: |
            ## Frontend previews

-            Last deployed commit is [${{ github.event.pull_request.head.sha }}](${{ github.event.pull_request.head.repo.html_url }}/commit/${{ github.event.pull_request.head.sha }})
-
-            ### Persistent
+            Last deployed commit is [${{ github.sha }}](${{ github.event.pull_request.head.repo.html_url }}/commit/${{ github.sha }})

            | Environment | URL |
            |-------------|-----|
-            | staging     | ${{ steps.urls.outputs.staging-branch-url }} |
-            | production  | ${{ steps.urls.outputs.production-branch-url }} |
-            | storybook   | ${{ steps.urls.outputs.storybook-branch-url }} |
-
-            ### Latest commit
-
-            | Environment | URL |
-            |-------------|-----|
-            | staging     | ${{ steps.urls.outputs.staging-sha-url }} |
-            | production  | ${{ steps.urls.outputs.production-sha-url }} |
-            | storybook   | ${{ steps.urls.outputs.storybook-sha-url }} |
+            | staging     | ${{ steps.urls.outputs.staging-preview-url }} |
+            | production  | ${{ steps.urls.outputs.production-preview-url }} |
+            | storybook   | ${{ steps.urls.outputs.storybook-preview-url }} |
          edit-mode: replace
@@ -51,13 +51,13 @@ jobs:
          CROWDIN_GH_TOKEN_DEFINED: ${{ secrets.CROWDIN_GH_TOKEN != '' }}

      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.ref }}
          token: ${{ secrets.CROWDIN_GH_TOKEN }}

      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: .nvmrc

@@ -90,7 +90,7 @@ jobs:
          echo "safe_branch_name=$SAFE_BRANCH_NAME" >> "$GITHUB_OUTPUT"

      - name: Download translations from Crowdin
-        uses: crowdin/github-action@c7af9bc98b01694653031fef2a0dc6c7888ce9bc # v2.17.0
+        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
        with:
          upload_sources: false
          upload_translations: false
@@ -56,13 +56,13 @@ jobs:
          CROWDIN_PERSONAL_TOKEN_DEFINED: ${{ secrets.CROWDIN_PERSONAL_TOKEN != '' }}

      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.ref }}
          fetch-depth: 2

      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: .nvmrc

@@ -83,7 +83,7 @@ jobs:
          echo "safe_branch_name=$SAFE_BRANCH_NAME" >> "$GITHUB_OUTPUT"

      - name: Upload translations to Crowdin
-        uses: crowdin/github-action@c7af9bc98b01694653031fef2a0dc6c7888ce9bc # v2.17.0
+        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
        with:
          upload_sources: true
          upload_translations: false
@@ -33,7 +33,7 @@ jobs:
    if: ${{ always() }}
    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Check if workflow runs on an internal branch
        id: check-internal
@@ -70,21 +70,28 @@ jobs:
          fi

  docker:
-    runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'namespace-profile-modrinth-labrinth' || 'ubuntu-latest' }}
+    runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'blacksmith-4vcpu-ubuntu-2404' || 'ubuntu-latest' }}
    needs: [skip-if-clean]
    if: ${{ needs.skip-if-clean.outputs.skip != 'true' }}
    env:
      SQLX_OFFLINE: 'true'
      GIT_HASH: ${{ github.sha }}
-      SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '20G' || '' }}
+      SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }}
+      SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }}
+      SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }}
+      SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }}
+      SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }}
+      SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }}
+      SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }}
      RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }}
-      RUST_MIN_STACK: '16777216'
    steps:
      - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0
+        uses: actions-rust-lang/setup-rust-toolchain@2b1f5e9b395427c92ee4e3331786ca3c37afe2d7 # v1.16.0
        with:
          rustflags: ''
          cache: false
@@ -92,23 +99,25 @@ jobs:
      - name: Setup mold
        uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0

-      - name: Setup sccache
-        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
-
-      - name: Set up caches
-        if: needs.skip-if-clean.outputs.internal == 'true'
-        uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
+      - name: Cache Cargo registry and index
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
-          cache: |
-            rust
-            apt
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }}

-      - name: Configure sccache
+      - name: Mount sccache disk cache
        if: needs.skip-if-clean.outputs.internal == 'true'
-        run: nsc cache sccache setup --cache_name default >> "$GITHUB_ENV"
+        uses: useblacksmith/stickydisk@13af8883542ca949a717e70fef89d15edbb29d88 # v1.2.0
+        with:
+          key: ${{ github.repository }}-labrinth-sccache
+          path: /mnt/sccache

-      - name: Install build dependencies
-        run: sudo apt-get update && sudo apt-get install -y --no-install-recommends cmake libcurl4-openssl-dev
+      - name: Setup sccache
+        if: needs.skip-if-clean.outputs.internal == 'true'
+        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10

      - name: Build labrinth
        run: cargo build --profile release-labrinth --package labrinth
@@ -121,11 +130,11 @@ jobs:
          cp -r apps/labrinth/assets apps/labrinth/docker-stage/assets

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Generate Docker image metadata
        id: docker-meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
        env:
          # GitHub Packages requires annotations metadata in at least the index descriptor to show them
          # up properly in its UI it seems, but it's not clear about it, because the docs refer to the
@@ -144,14 +153,14 @@ jobs:
            org.opencontainers.image.licenses=AGPL-3.0-only

      - name: Login to GitHub Packages
-        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build and push
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: ./apps/labrinth/docker-stage
          file: ./apps/labrinth/Dockerfile
@@ -0,0 +1,41 @@
+name: Prepare pnpm cache
+
+on:
+  push:
+    paths:
+      - .github/workflows/prepare-pnpm-cache.yml
+      - package.json
+      - pnpm-lock.yaml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/prod' }}
+
+jobs:
+  prepare:
+    if: github.repository_owner == 'modrinth'
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: .nvmrc
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Get pnpm store path
+        id: pnpm-store
+        run: echo "store-path=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
+
+      - name: Cache pnpm
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: ${{ steps.pnpm-store.outputs.store-path }}
+          key: pnpm-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+
+      - name: Install dependencies
+        run: pnpm recursive install --frozen-lockfile
@@ -44,64 +44,57 @@ jobs:
    name: Build
    env:
      VITE_STRIPE_PUBLISHABLE_KEY: pk_live_51JbFxJJygY5LJFfKLVVldb10HlLt24p421OWRsTOWc5sXYFOnFUXWieSc6HD3PHo25ktx8db1WcHr36XGFvZFVUz00V9ixrCs5
+      # SCCACHE_DIR: '/mnt/sccache'
+      # SCCACHE_CACHE_SIZE: '10G'
+      # SCCACHE_MULTILEVEL_CHAIN: 'disk,s3'
+      SCCACHE_S3_KEY_PREFIX: '${{ github.repository }}/'
+      SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }}
+      SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }}
+      SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }}
      RUSTC_WRAPPER: 'sccache'
    strategy:
      fail-fast: false
      matrix:
-        platform:
-          [
-            namespace-profile-medium-amd64-macos,
-            namespace-profile-medium-amd64-windows,
-            namespace-profile-medium-amd64,
+        platform: [
+            blacksmith-6vcpu-macos-26,
+            blacksmith-8vcpu-windows-2025, # At time of writing, Windows 4 vCPU VMs don't seem to actually exist
+            blacksmith-4vcpu-ubuntu-2404,
          ]
        include:
-          - platform: namespace-profile-medium-amd64-macos
+          - platform: blacksmith-6vcpu-macos-26
            artifact-target-name: universal-apple-darwin
-          - platform: namespace-profile-medium-amd64-windows
+          - platform: blacksmith-8vcpu-windows-2025
            artifact-target-name: x86_64-pc-windows-msvc
-          - platform: namespace-profile-medium-amd64
+          - platform: blacksmith-4vcpu-ubuntu-2404
            artifact-target-name: x86_64-unknown-linux-gnu

    runs-on: ${{ matrix.platform }}

    steps:
      - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          fetch-depth: 0

      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0
+        uses: actions-rust-lang/setup-rust-toolchain@2b1f5e9b395427c92ee4e3331786ca3c37afe2d7 # v1.16.0
        with:
          rustflags: ''
          target: ${{ contains(matrix.platform, 'macos') && 'x86_64-apple-darwin' || '' }}

-      - name: Setup mold
-        if: contains(matrix.platform, 'ubuntu')
-        uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0
-
      - name: Setup sccache
        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10

-      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
-        with:
-          node-version-file: .nvmrc
-
      - name: Enable Corepack
        run: corepack enable

-      - name: Set up caches
-        if: contains(matrix.platform, 'ubuntu') || contains(matrix.platform, 'macos')
-        uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
-          cache: |
-            rust
-            pnpm
-
-      - name: Configure sccache
-        if: contains(matrix.platform, 'ubuntu') || contains(matrix.platform, 'macos')
-        run: nsc cache sccache setup --cache_name default >> "$GITHUB_ENV"
+          node-version-file: .nvmrc
+          cache: 'pnpm'

      - name: Generate tauri-dev.conf.json
        shell: bash
@@ -120,15 +113,10 @@ jobs:

      - name: Install Linux build dependencies
        if: contains(matrix.platform, 'ubuntu')
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
-
-      - name: Setup Java
-        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
+        uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.6.0
        with:
-          distribution: temurin
-          java-version: 17
+          packages: libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
+          version: v1 # cache key

      - name: Setup Dasel
        uses: jaxxstorm/action-install-gh-release@25e24d2d23ae098373794ef1d6faecb48ee52da8 # v3.0.0
@@ -155,6 +143,9 @@ jobs:

          cp "packages/app-lib/.env.${BUILD_ENVIRONMENT}" packages/app-lib/.env

+      - name: Setup Turbo cache
+        uses: rharkor/caching-for-turbo@56219402aacc0d06b650d898c222996dbc1191ec # v2.3.14
+
      - name: Install dependencies
        run: pnpm install

@@ -15,7 +15,7 @@ jobs:
      github.event.workflow_run.conclusion == 'success' &&
      github.event.workflow_run.event == 'push' &&
      startsWith(github.event.workflow_run.head_branch, 'v')
-    runs-on: namespace-profile-medium-amd64
+    runs-on: blacksmith-4vcpu-ubuntu-2404
    env:
      VERSION_TAG: ${{ github.event.workflow_run.head_branch }}
      LINUX_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-unknown-linux-gnu)
@@ -25,7 +25,7 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Verify ref is a tag
        env:
@@ -22,7 +22,7 @@ jobs:
    if: ${{ always() }}
    steps:
      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Check if workflow runs on an internal branch
        id: check-internal
@@ -62,7 +62,7 @@ jobs:

  build:
    name: Lint and Test
-    runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'namespace-profile-modrinth-turbo' || 'ubuntu-latest' }}
+    runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'blacksmith-4vcpu-ubuntu-2404' || 'ubuntu-latest' }}
    needs: [skip-if-clean]
    if: ${{ needs.skip-if-clean.outputs.skip != 'true' }}

@@ -76,71 +76,98 @@ jobs:
      # since we don't want warnings to become errors
      # while developing)
      RUSTFLAGS: -Dwarnings
-      # Redis config for tests
-      REDIS_TOPOLOGY: cluster
-      REDIS_CONNECTION_TYPE: multiplexed
-      REDIS_URL: redis://127.0.0.1:7000,redis://127.0.0.1:7001,redis://127.0.0.1:7002,redis://127.0.0.1:7003,redis://127.0.0.1:7004,redis://127.0.0.1:7005
-      # Avoid stack overflows in tests
-      RUST_MIN_STACK: 33554432
+      # sccache config (only populated for internal branches; secrets aren't
+      # available to forked PRs, and blacksmith stickydisk requires a
+      # blacksmith runner)
+      SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }}
+      SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }}
+      SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }}
+      SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }}
+      SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }}
+      SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }}
+      SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }}
+      RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }}

    steps:
      - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          fetch-depth: 2

+      - name: Install build dependencies
+        uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.6.0
+        with:
+          packages: libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
+          version: v1 # cache key
+
      - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version-file: .nvmrc

      - name: Enable Corepack
        run: corepack enable

-      - name: Set up caches
-        if: needs.skip-if-clean.outputs.internal == 'true'
-        uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
+      - name: Get pnpm store path
+        id: pnpm-store
+        run: echo "store-path=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
+
+      - name: Restore pnpm cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
-          cache: |
-            rust
-            pnpm
-            apt
-
-      - name: Set up Turborepo caching
-        if: needs.skip-if-clean.outputs.internal == 'true'
-        uses: namespace-actions/setup-turbocache@f96bd6befa13ae74b2858a5be49573640d4636f5 # v0.0.2
-
-      - name: Install apt dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake libcurl4-openssl-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
+          path: ${{ steps.pnpm-store.outputs.store-path }}
+          key: pnpm-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-cache-

      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@166cdcfd11aee3cb47222f9ddb555ce30ddb9659 # v1.17.0
+        uses: actions-rust-lang/setup-rust-toolchain@2b1f5e9b395427c92ee4e3331786ca3c37afe2d7 # v1.16.0
        with:
          rustflags: ''
          components: clippy, rustfmt
          cache: false

-      - name: Setup mold
-        uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0
+      - name: Cache Cargo registry and index
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae #v5.0.5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Mount sccache disk cache
+        if: needs.skip-if-clean.outputs.internal == 'true'
+        uses: useblacksmith/stickydisk@13af8883542ca949a717e70fef89d15edbb29d88 # v1.2.0
+        with:
+          key: ${{ github.repository }}-turbo-sccache
+          path: /mnt/sccache
+
+      - name: Setup sccache
+        if: needs.skip-if-clean.outputs.internal == 'true'
+        uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10

      - name: Setup binstall
-        uses: cargo-bins/cargo-binstall@ead08b90bd7b2e6d81963fb9cf0b7239f66d5db4 # v1.21.0
+        uses: cargo-bins/cargo-binstall@dc19f1e48450eefe5a29b8da6c6b00a87d730b37 # v1.18.1

      - name: Setup nextest
-        run: cargo binstall --no-confirm --secure --locked cargo-nextest@0.9.133
+        run: cargo binstall --no-confirm --secure cargo-nextest@0.9.133

      # cargo-binstall does not have pre-built binaries for sqlx-cli, so we fall
      # back to a cached cargo install
      - name: Setup cargo-sqlx
-        uses: taiki-e/cache-cargo-install-action@417450f3c33ee20393705369577571770643d4c7 # v3.0.7
+        uses: taiki-e/cache-cargo-install-action@f9eed3e4680f27610dc6d8c67be1b88593f7dade # v3.0.6
        with:
          tool: sqlx-cli@0.8.6
          locked: false
          no-default-features: true
          features: rustls,postgres

+      - name: Setup Turbo cache
+        uses: rharkor/caching-for-turbo@56219402aacc0d06b650d898c222996dbc1191ec # v2.3.14
+
      - name: Install dependencies
        run: pnpm install

@@ -162,7 +189,7 @@ jobs:

      - name: Start services
        if: steps.check-labrinth.outputs.needs_services == 'true'
-        run: docker compose --profile clustered-redis up --wait
+        run: docker compose up --wait

      - name: Setup labrinth environment and database
        if: steps.check-labrinth.outputs.needs_services == 'true'
@@ -50,7 +50,7 @@ Run these from the **root** folder before opening a pull request - do not run th
 - **App frontend:** `pnpm prepr:frontend:app`
 - **Frontend libs:** `pnpm prepr:frontend:lib`
 - **All frontend (app+web):** `pnpm prepr`
- **Labrinth (backend):** See `apps/labrinth/AGENTS.md`
+- **Labrinth (backend):** See `apps/labrinth/CLAUDE.md`

 The website and app `prepr` commands

@@ -62,7 +62,7 @@ The website and app `prepr` commands

 ## Project-Specific Instructions

-Each project may have its own file with detailed instructions:
+Each project may have its own `CLAUDE.md` with detailed instructions:

 - [`apps/labrinth/AGENTS.md`](apps/labrinth/AGENTS.md) — Backend API
 - [`apps/frontend/CLAUDE.md`](apps/frontend/CLAUDE.md) - Frontend Website
@@ -9,13 +9,10 @@ members = [
  "packages/ariadne",
  "packages/daedalus",
  "packages/labrinth-derive",
-  "packages/modrinth-content-management",
  "packages/modrinth-log",
  "packages/modrinth-maxmind",
  "packages/modrinth-util",
-  "packages/neverbounce",
  "packages/path-util",
-  "packages/xredis",
 ]

 [workspace.package]
@@ -35,6 +32,7 @@ actix-ws = "0.3.0"
 arc-swap = "1.7.1"
 argon2 = { version = "0.5.3", features = ["std"] }
 ariadne = { path = "packages/ariadne" }
+async-compression = { version = "0.4.32", default-features = false }
 async-minecraft-ping = { path = "packages/async-minecraft-ping" }
 async-recursion = "1.1.1"
 async-stripe = { version = "0.41.0", default-features = false, features = [
@@ -53,7 +51,6 @@ aws-sdk-s3 = { version = "=1.122.0", default-features = false, features = [
 ] }
 base64 = "0.22.1"
 bitflags = "2.9.4"
-bon = "3.9.3"
 bytemuck = "1.24.0"
 bytes = "1.10.1"
 censor = "0.3.0"
@@ -73,7 +70,7 @@ daedalus = { path = "packages/daedalus" }
 darling = { version = "0.23" }
 dashmap = "6.1.0"
 data-url = "0.3.2"
-deadpool-redis = { git = "https://github.com/modrinth/deadpool", rev = "c7209b086829572f368f1194aba54bdea8dc540b", version = "0.23.0" }
+deadpool-redis = { git = "https://github.com/modrinth/deadpool", rev = "db5fb00b036ecc8fe5f18853c559b745ffe47bde", version = "0.22.1" }
 derive_more = "2.1.1"
 directories = "6.0.0"
 dirs = "6.0.0"
@@ -90,12 +87,10 @@ fs4 = { version = "0.13.1", default-features = false }
 futures = "0.3.31"
 futures-lite = "2.6.1"
 futures-util = "0.3.31"
-governor = "0.10.4"
 heck = "0.5.0"
 hex = "0.4.3"
 hickory-resolver = "0.25.2"
 hmac = "0.12.1"
-httpdate = "1.0.3"
 hyper = "1.7.0"
 hyper-rustls = { version = "0.27.7", default-features = false, features = [
  "aws-lc-rs",
@@ -122,21 +117,13 @@ lettre = { version = "0.11.19", default-features = false, features = [
  "tokio1",
  "tokio1-rustls",
 ] }
-lz4_flex = { version = "0.11.5", default-features = false, features = [
-  "checked-decode",
-  "safe-decode",
-  "safe-encode",
-  "std",
-] }
 maxminddb = "0.26.0"
 meilisearch-sdk = { version = "0.30.0", default-features = false }
-modrinth-content-management = { path = "packages/modrinth-content-management" }
 modrinth-log = { path = "packages/modrinth-log" }
 modrinth-util = { path = "packages/modrinth-util" }
 muralpay = { path = "packages/muralpay" }
 murmur2 = "0.1.0"
 native-dialog = "0.9.2"
-neverbounce = { path = "packages/neverbounce" }
 notify = { version = "8.2.0", default-features = false }
 notify-debouncer-mini = { version = "0.7.0", default-features = false }
 objc2-app-kit = { version = "0.3.2", default-features = false }
@@ -146,7 +133,6 @@ paste = "1.0.15"
 path-util = { path = "packages/path-util" }
 phf = { version = "0.13.1", features = ["macros"] }
 png = "0.18.0"
-postcard = { version = "1.1.3", default-features = false, features = ["alloc"] }
 proc-macro2 = { version = "1.0" }
 prometheus = "0.14.0"
 quartz_nbt = "0.2.9"
@@ -154,8 +140,7 @@ quick-xml = "0.38.3"
 quote = { version = "1.0" }
 rand = "=0.8.5"  # Locked on 0.8 until argon2 and p256 update to 0.9
 rand_chacha = "=0.3.1"  # Locked on 0.3 until we can update rand to 0.9
-rdkafka = { version = "0.36.2", features = ["cmake-build"] }
-redis = "1.4.1"
+redis = "0.32.7"
 regex = "1.12.2"
 reqwest = { version = "0.12.24", default-features = false }
 rgb = "0.8.52"
@@ -171,7 +156,6 @@ rust-s3 = { version = "0.37.0", default-features = false, features = [
 ] }
 rustls = "0.23.32"
 rusty-money = "0.4.1"
-scalar_api_reference = { version = "0.2.2", default-features = false }
 secrecy = "0.10.3"
 sentry = { version = "0.45.0", default-features = false, features = [
  "backtrace",
@@ -231,10 +215,10 @@ typed-path = "0.12.0"
 url = "2.5.7"
 urlencoding = "2.1.3"
 utoipa = { version = "5.4.0", features = ["actix_extras", "chrono", "decimal"] }
+utoipa-actix-web = { version = "0.1.2" }
+utoipa-scalar = { version = "0.3.0", default-features = false }
 uuid = "1.18.1"
 validator = "0.20.0"
-webauthn-rs = "0.5.5"
-webauthn-rs-proto = "0.5.5"
 webp = { version = "0.3.1", default-features = false }
 webview2-com = "0.38.0"  # Should be updated in lockstep with wry
 whoami = "1.6.1"
@@ -242,7 +226,6 @@ windows = "=0.61.3"  # Locked on 0.61 until we can update windows-core to 0.62
 windows-core = "=0.61.2"  # Locked on 0.61 until webview2-com updates to 0.62
 winreg = "0.55.0"
 woothee = "0.13.0"
-xredis = { path = "packages/xredis" }
 yaserde = "0.12.0"
 zbus = "5.11.0"
 zip = { version = "6.0.0", default-features = false, features = [
@@ -286,7 +269,6 @@ redundant_type_annotations = "warn"
 result_large_err = "allow"
 todo = "warn"
 too_many_arguments = "allow"
-type_complexity = "allow"
 uninlined_format_args = "warn"
 unnested_or_patterns = "warn"
 wildcard_dependencies = "warn"
@@ -3,13 +3,13 @@
 ![Issues](https://img.shields.io/github/issues-raw/Modrinth/code?color=c78aff&label=issues&style=for-the-badge)
 ![Pull Requests](https://img.shields.io/github/issues-pr-raw/Modrinth/code?color=c78aff&label=PRs&style=for-the-badge)
 ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=c78aff&label=contributors&style=for-the-badge)
-![Lines of Code](https://img.shields.io/endpoint?url=https://loctopus.creeperkatze.dev/github/modrinth/code/badge?style=flat&logoColor=white&color=c78aff&style=for-the-badge)
+![Lines](https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/modrinth/code/badge?style=flat&logoColor=white&color=c78aff&style=for-the-badge)
 ![Commit Activity](https://img.shields.io/github/commit-activity/m/Modrinth/code?color=c78aff&label=commits&style=for-the-badge)
 ![Last Commit](https://img.shields.io/github/last-commit/Modrinth/code?color=c78aff&label=last%20commit&style=for-the-badge)

 ## Modrinth Monorepo

-Welcome to the Modrinth Monorepo, the primary codebase for the Modrinth web interface and app. It contains ![Lines of Code](https://img.shields.io/endpoint?url=https://loctopus.creeperkatze.dev/github/modrinth/code/badge%3Fformat%3Dhuman&logoColor=white&color=black&label=) lines of code and has ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=black&label=) contributors!
+Welcome to the Modrinth Monorepo, the primary codebase for the Modrinth web interface and app. It contains ![Lines](https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/modrinth/olympus/badge?logoColor=white&color=black&label=) lines of code and has ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=black&label=) contributors!

 If you're not a developer and you've stumbled upon this repository, you can access the web interface on the [Modrinth website](https://modrinth.com) and download the latest release of the app [here](https://modrinth.com/app).

@@ -8,11 +8,8 @@ extend-exclude = [
  "packages/blog/",
  # contains licenses like `CC-BY-ND-4.0`
  "packages/moderation/src/data/stages/license.ts",
-  "packages/moderation/src/utils.ts",
  # contains payment card IDs like `IY1VMST1MOXS` which are flagged
  "apps/labrinth/src/queue/payouts/mod.rs",
-  # contains domain names with deliberate typos
-  "apps/labrinth/assets/disposable_email_blocklist.txt"
 ]

 [default.extend-words]
@@ -76,41 +76,27 @@ import FriendsList from '@/components/ui/friends/FriendsList.vue'
 import AddServerToInstanceModal from '@/components/ui/install_flow/AddServerToInstanceModal.vue'
 import UnknownPackWarningModal from '@/components/ui/install_flow/UnknownPackWarningModal.vue'
 import MinecraftAuthErrorModal from '@/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue'
-import MinecraftRequiredModal from '@/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue'
 import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue'
+import AuthGrantFlowWaitModal from '@/components/ui/modal/AuthGrantFlowWaitModal.vue'
 import InstallToPlayModal from '@/components/ui/modal/InstallToPlayModal.vue'
 import ModpackAlreadyInstalledModal from '@/components/ui/modal/ModpackAlreadyInstalledModal.vue'
-import ModrinthAccountRequiredModal from '@/components/ui/modal/ModrinthAccountRequiredModal.vue'
 import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
 import NavButton from '@/components/ui/NavButton.vue'
 import PrideFundraiserBanner from '@/components/ui/PrideFundraiserBanner.vue'
 import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
 import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
-import SharedInstanceInviteHandler from '@/components/ui/shared-instances/shared-instance-invite-handler/index.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
 import WindowControls from '@/components/ui/WindowControls.vue'
 import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
 import { config } from '@/config'
-import {
-	ads_consent_listener,
-	hide_ads_window,
-	init_ads_window,
-	perform_ads_consent_action,
-	should_show_ads_consent_popup,
-	show_ads_window,
-} from '@/helpers/ads.js'
+import { hide_ads_window, init_ads_window, show_ads_window } from '@/helpers/ads.js'
 import { debugAnalytics, initAnalytics, trackEvent } from '@/helpers/analytics'
 import { check_reachable } from '@/helpers/auth.js'
 import { get_user, get_version } from '@/helpers/cache.js'
 import { command_listener, notification_listener, warning_listener } from '@/helpers/events.js'
-import { install_create_modpack_instance, install_get_modpack_preview } from '@/helpers/install'
-import {
-	can_current_user_use_shared_instances,
-	get as getInstance,
-	list,
-	run,
-} from '@/helpers/instance'
-import { get as getCreds, login, logout } from '@/helpers/mr_auth.ts'
+import { cancelLogin, get as getCreds, login, logout } from '@/helpers/mr_auth.ts'
+import { create_profile_and_install_from_file } from '@/helpers/pack'
+import { list } from '@/helpers/profile.js'
 import { mergeUrlQuery, parseModrinthLink } from '@/helpers/project-links.ts'
 import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import { get_opening_command, initialize_state } from '@/helpers/state'
@@ -124,7 +110,6 @@ import {
 	isNetworkMetered,
 	setRestartAfterPendingUpdate,
 } from '@/helpers/utils.js'
-import { start_join_server, start_join_singleplayer_world } from '@/helpers/worlds.ts'
 import i18n from '@/i18n.config'
 import {
 	appUpdateState,
@@ -161,7 +146,6 @@ const APP_SIDEBAR_WIDTH = 300
 const INTERCOM_BUBBLE_DEFAULT_PADDING = 20
 const PRIDE_FUNDRAISER_END_DATE = new Date('2026-07-01T00:00:00Z').getTime()
 const credentials = ref()
-let credentialsRefreshId = 0
 const sidebarToggled = ref(true)
 const unsubscribeSidebarToggle = themeStore.$subscribe(() => {
 	sidebarToggled.value = !themeStore.toggleSidebar
@@ -199,15 +183,12 @@ const { handleError, addNotification } = notificationManager
 const popupNotificationManager = new AppPopupNotificationManager()
 providePopupNotificationManager(popupNotificationManager)
 const { addPopupNotification } = popupNotificationManager
-let adsConsentPopupId = null
-let unlistenAdsConsent

 const appVersion = getVersion()
 const tauriApiClient = new TauriModrinthClient({
 	userAgent: async () => `modrinth/theseus/${await appVersion} (support@modrinth.com)`,
 	labrinthBaseUrl: config.labrinthBaseUrl,
 	archonBaseUrl: config.archonBaseUrl,
-	sharedInstancesBaseUrl: config.sharedInstancesBaseUrl,
 	features: [
 		new NodeAuthFeature({
 			getAuth: () => nodeAuthState.getAuth?.() ?? null,
@@ -231,30 +212,9 @@ const { data: authenticatedModrinthUser } = useQuery({
 	enabled: () => !!credentials.value?.session,
 	retry: false,
 })
-useQuery({
-	queryKey: computed(() => ['shared-instance-eligibility', credentials.value?.user?.id]),
-	queryFn: can_current_user_use_shared_instances,
-	enabled: () => !!credentials.value?.session && !!credentials.value?.user?.id,
-	retry: false,
-	staleTime: Infinity,
-	refetchOnMount: false,
-	refetchOnWindowFocus: false,
-	refetchOnReconnect: false,
-})
-const hasPlus = computed(
-	() =>
-		!!credentials.value?.user &&
-		(hasMidasBadge(credentials.value.user) ||
-			hasActivePride26Midas(authenticatedModrinthUser.value?.campaigns?.pride_26)),
-)
-const showAd = computed(
-	() => sidebarVisible.value && !hasPlus.value && credentials.value !== undefined,
-)
-const adConsentAvailable = computed(() => credentials.value !== undefined && !hasPlus.value)
 providePageContext({
 	hierarchicalSidebarAvailable: ref(true),
-	showAds: showAd,
-	adConsentAvailable,
+	showAds: ref(false),
 	floatingActionBarOffsets: {
 		left: ref(APP_LEFT_NAV_WIDTH),
 		right: computed(() => (sidebarVisible.value ? `${APP_SIDEBAR_WIDTH}px` : '0px')),
@@ -290,9 +250,6 @@ const {
 const news = ref([])
 const availableSurvey = ref(false)
 const displayedServerInviteNotifications = new Set()
-const serverInvitePopupNotificationIds = new Set()
-let liveNotificationGeneration = 0
-let liveNotificationsEnabled = true

 const offline = ref(!navigator.onLine)
 window.addEventListener('offline', () => {
@@ -337,12 +294,6 @@ const authUnreachable = computed(() => {

 onMounted(async () => {
 	await useCheckDisableMouseover()
-	try {
-		unlistenAdsConsent = await ads_consent_listener(handleAdsConsentRequired)
-		handleAdsConsentRequired(await should_show_ads_consent_popup())
-	} catch (error) {
-		handleError(error)
-	}

 	document.querySelector('body').addEventListener('click', handleClick)
 	document.querySelector('body').addEventListener('auxclick', handleAuxClick)
@@ -356,7 +307,6 @@ onUnmounted(async () => {
 	unsubscribeSidebarToggle()
 	clearDelayedUpdatePopup()

-	await unlistenAdsConsent?.()
 	await unlistenUpdateDownload?.()
 })

@@ -381,77 +331,8 @@ const messages = defineMessages({
 		defaultMessage:
 			'Minecraft authentication servers may be down right now. Check your internet connection and try again later.',
 	},
-	adsConsentTitle: {
-		id: 'app.ads-consent.title',
-		defaultMessage: 'Your privacy and how ads support Modrinth',
-	},
-	adsConsentBody: {
-		id: 'app.ads-consent.body',
-		defaultMessage:
-			'Ads make Modrinth possible and fund creator payouts. Our partners may store or access cookies in the app to personalize ads and measure performance.',
-	},
-	adsConsentManage: {
-		id: 'app.ads-consent.manage',
-		defaultMessage: 'Manage preferences',
-	},
-	adsConsentReject: {
-		id: 'app.ads-consent.reject',
-		defaultMessage: 'Reject all',
-	},
-	adsConsentAccept: {
-		id: 'app.ads-consent.accept',
-		defaultMessage: 'Accept all',
-	},
 })

-function handleAdsConsentRequired(required) {
-	if (!required) {
-		if (adsConsentPopupId !== null) {
-			popupNotificationManager.removeNotification(adsConsentPopupId)
-			adsConsentPopupId = null
-		}
-		return
-	}
-
-	if (
-		adsConsentPopupId !== null &&
-		popupNotificationManager.getNotifications().some((item) => item.id === adsConsentPopupId)
-	) {
-		return
-	}
-
-	const notification = addPopupNotification({
-		title: formatMessage(messages.adsConsentTitle),
-		text: formatMessage(messages.adsConsentBody),
-		type: 'info',
-		hideIcon: true,
-		autoCloseMs: null,
-		dismissible: false,
-		buttons: [
-			{
-				label: formatMessage(messages.adsConsentManage),
-				action: () => perform_ads_consent_action('manage').catch(handleError),
-				color: 'standard',
-				keepOpen: true,
-			},
-			{
-				label: formatMessage(messages.adsConsentReject),
-				action: () => perform_ads_consent_action('reject').catch(handleError),
-				color: 'brand',
-				keepOpen: true,
-			},
-			{
-				label: formatMessage(messages.adsConsentAccept),
-				action: () => perform_ads_consent_action('accept').catch(handleError),
-				color: 'brand',
-				keepOpen: true,
-			},
-		],
-	})
-
-	adsConsentPopupId = notification.id
-}
-
 async function setupApp() {
 	const {
 		native_decorations,
@@ -521,7 +402,7 @@ async function setupApp() {
 		addNotification({
 			title: 'Warning',
 			text: e.message,
-			type: 'warning',
+			type: 'warn',
 		}),
 	)

@@ -706,7 +587,6 @@ watch(stateInitialized, (ready) => {
 const error = useError()
 const errorModal = ref()
 const minecraftAuthErrorModal = ref()
-const minecraftRequiredModal = ref()

 const contentInstall = createContentInstall({ router, handleError })
 provideContentInstall(contentInstall)
@@ -756,10 +636,9 @@ const contentInstallModpackAlreadyInstalledModal = ref()
 const addServerToInstanceModal = ref()
 const incompatibilityWarningModal = ref()
 const installToPlayModal = ref()
-const sharedInstanceInviteHandler = ref()
 const updateToPlayModal = ref()

-const modrinthLoginModal = ref()
+const modrinthLoginFlowWaitModal = ref()

 watch(incompatibilityWarningModal, (modal) => {
 	if (modal) {
@@ -767,12 +646,8 @@ watch(incompatibilityWarningModal, (modal) => {
 	}
 })

-setupAuthProvider(credentials, async (_redirectPath, flow, options) => {
-	if (options?.showModal === false) {
-		await signIn(flow)
-	} else {
-		await requestSignIn(flow)
-	}
+setupAuthProvider(credentials, async (_redirectPath) => {
+	await signIn()
 })

 async function validateSession(sessionToken) {
@@ -789,35 +664,23 @@ async function validateSession(sessionToken) {
 }

 async function fetchCredentials() {
-	const hadSession = !!credentials.value?.session
-	const refreshId = ++credentialsRefreshId
-	credentials.value = undefined
-
 	const creds = await getCreds().catch(handleError)
-	if (refreshId !== credentialsRefreshId) return
-	if (!creds && hadSession) clearLiveNotifications()
-
 	if (creds && creds.user_id) {
 		if (creds.session && !(await validateSession(creds.session))) {
-			if (refreshId !== credentialsRefreshId) return
-
-			clearLiveNotifications()
 			await logout().catch(handleError)
-			if (refreshId !== credentialsRefreshId) return
-
 			credentials.value = null
 			return
 		}
 		creds.user = await get_user(creds.user_id, 'bypass').catch(handleError)
-		if (refreshId !== credentialsRefreshId) return
 	}
 	credentials.value = creds ?? null
-	liveNotificationsEnabled = !!creds?.session
 }

-async function signIn(flow = 'sign-in') {
+async function signIn() {
+	modrinthLoginFlowWaitModal.value.show()
+
 	try {
-		await login(flow)
+		await login()
 		await fetchCredentials()
 	} catch (error) {
 		if (
@@ -829,31 +692,27 @@ async function signIn(flow = 'sign-in') {
 		} else {
 			handleError(error)
 		}
+	} finally {
+		modrinthLoginFlowWaitModal.value.hide()
 	}
 }

-async function requestSignIn(flow = 'sign-in') {
-	await modrinthLoginModal.value?.showSigningIn(flow)
-}
-
-async function requestModrinthAuth(flow = 'sign-in') {
-	await signIn(flow)
-	return !!credentials.value?.session
-}
-
 async function logOut() {
-	await performLogOut()
-}
-
-async function performLogOut() {
-	credentialsRefreshId++
-	credentials.value = undefined
-	clearLiveNotifications()
-
 	await logout().catch(handleError)
 	await fetchCredentials()
 }

+const hasPlus = computed(
+	() =>
+		!!credentials.value?.user &&
+		(hasMidasBadge(credentials.value.user) ||
+			hasActivePride26Midas(authenticatedModrinthUser.value?.campaigns?.pride_26)),
+)
+
+const showAd = computed(
+	() => sidebarVisible.value && !hasPlus.value && credentials.value !== undefined,
+)
+
 async function fetchIntercomToken() {
 	const creds = await getCreds()
 	if (!creds?.session) {
@@ -880,28 +739,19 @@ async function fetchIntercomToken() {
 	return await response.json()
 }

-watch(
-	[showAd, adConsentAvailable],
-	async ([showAds, canManageConsent]) => {
-		if (showAds) {
-			await init_ads_window(true)
-			return
-		}
-
-		await hide_ads_window(true)
-		if (canManageConsent) {
-			await init_ads_window()
-		}
-	},
-	{ immediate: true },
-)
+watch(showAd, () => {
+	if (!showAd.value) {
+		hide_ads_window(true)
+	} else {
+		init_ads_window(true)
+	}
+})

 onMounted(() => {
 	invoke('show_window')

 	error.setErrorModal(errorModal.value)
 	error.setMinecraftAuthErrorModal(minecraftAuthErrorModal.value)
-	error.setMinecraftRequiredModal(minecraftRequiredModal.value)

 	setContentIncompatibilityWarningModal(incompatibilityWarningModal.value)
 	setContentInstallModal(modInstallModal.value)
@@ -970,48 +820,30 @@ function openServerInviteInviterProfile(inviterName) {
 }

 async function handleLiveNotification(notification) {
-	if (!liveNotificationsEnabled || !notification?.body || notification.read) return
-	if (await sharedInstanceInviteHandler.value?.handleNotification(notification)) return
+	if (notification?.body?.type !== 'server_invite' || notification.read) return
+	if (displayedServerInviteNotifications.has(notification.id)) return

-	if (notification.body.type === 'server_invite') {
-		if (displayedServerInviteNotifications.has(notification.id)) return
+	displayedServerInviteNotifications.add(notification.id)

-		const generation = liveNotificationGeneration
-		displayedServerInviteNotifications.add(notification.id)
+	const serverName =
+		typeof notification.body.server_name === 'string' ? notification.body.server_name : 'a server'
+	const inviterId = notification.body.invited_by
+	const invitedBy =
+		typeof inviterId === 'string' ? await get_user(inviterId, 'bypass').catch(() => null) : null

-		const serverName =
-			typeof notification.body.server_name === 'string' ? notification.body.server_name : 'a server'
-		const inviterId = notification.body.invited_by
-		const invitedBy =
-			typeof inviterId === 'string' ? await get_user(inviterId, 'bypass').catch(() => null) : null
-		if (generation !== liveNotificationGeneration) return
-
-		const popupNotification = addPopupNotification({
-			title: serverName,
-			autoCloseMs: null,
-			toast: {
-				type: 'server-invite',
-				actorName: invitedBy?.username ?? null,
-				actorAvatarUrl: invitedBy?.avatar_url ?? null,
-				entityName: serverName,
-				onAccept: () => acceptServerInviteNotification(notification),
-				onDecline: () => declineServerInviteNotification(notification),
-				onOpenActor: () => openServerInviteInviterProfile(invitedBy?.username ?? null),
-			},
-		})
-		serverInvitePopupNotificationIds.add(popupNotification.id)
-	}
-}
-
-function clearLiveNotifications() {
-	liveNotificationGeneration++
-	liveNotificationsEnabled = false
-	for (const id of serverInvitePopupNotificationIds) {
-		popupNotificationManager.removeNotification(id)
-	}
-	displayedServerInviteNotifications.clear()
-	serverInvitePopupNotificationIds.clear()
-	sharedInstanceInviteHandler.value?.clearNotifications()
+	addPopupNotification({
+		title: serverName,
+		autoCloseMs: null,
+		toast: {
+			type: 'server-invite',
+			actorName: invitedBy?.username ?? null,
+			actorAvatarUrl: invitedBy?.avatar_url ?? null,
+			entityName: serverName,
+			onAccept: () => acceptServerInviteNotification(notification),
+			onDecline: () => declineServerInviteNotification(notification),
+			onOpenActor: () => openServerInviteInviterProfile(invitedBy?.username ?? null),
+		},
+	})
 }

 async function handleCommand(e) {
@@ -1020,36 +852,13 @@ async function handleCommand(e) {
 	if (e.event === 'RunMRPack') {
 		// RunMRPack should directly install a local mrpack given a path
 		if (e.path.endsWith('.mrpack')) {
-			const location = { type: 'fromFile', path: e.path }
-			const preview = await install_get_modpack_preview(location).catch(handleError)
-			if (preview?.unknownFile || preview?.externalFilesInModpack.length > 0) {
-				const splitPath = e.path.split(/[\\/]/)
-				const fileName = splitPath ? splitPath[splitPath.length - 1] : e.path
-				unknownPackWarningModal.value?.show(
-					() => install_create_modpack_instance(location).then(() => undefined),
-					fileName,
-					preview.externalFilesInModpack,
-				)
-			} else {
-				await install_create_modpack_instance(location).catch(handleError)
-			}
+			await create_profile_and_install_from_file(e.path, (createProfile, fileName) =>
+				unknownPackWarningModal.value?.show(createProfile, fileName),
+			).catch(handleError)
 			trackEvent('InstanceCreate', {
 				source: 'CreationModalFileDrop',
 			})
 		}
-	} else if (e.event === 'LaunchInstance') {
-		const instance = await getInstance(e.id).catch(handleError)
-		if (!instance || instance.quarantined) return
-
-		if (e.server) {
-			await start_join_server(e.id, e.server).catch(handleError)
-		} else if (e.singleplayer_world) {
-			await start_join_singleplayer_world(e.id, e.singleplayer_world).catch(handleError)
-		} else {
-			await run(e.id).catch(handleError)
-		}
-	} else if (e.event === 'InstallSharedInstanceInvite') {
-		await sharedInstanceInviteHandler.value?.installFromInviteId(e.invite_id)
 	} else if (e.event === 'InstallServer') {
 		await router.push(`/project/${e.id}`)
 		await playServerProject(e.id).catch(handleError)
@@ -1514,11 +1323,12 @@ async function processPendingSurveys() {
 	const creds = await getCreds().catch(handleError)
 	const userId = creds?.user_id

-	const instances = (await list().catch(handleError)) ?? []
-	const isActivePlayer = instances.some(
-		(instance) =>
-			isWithinLastTwoWeeks(instance.last_played) && !isWithinLastTwoWeeks(instance.created),
-	)
+	const instances = await list().catch(handleError)
+	const isActivePlayer =
+		instances.findIndex(
+			(instance) =>
+				isWithinLastTwoWeeks(instance.last_played) && !isWithinLastTwoWeeks(instance.created),
+		) >= 0

 	let surveys = []
 	try {
@@ -1574,7 +1384,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			<AppSettingsModal ref="settingsModal" />
 		</Suspense>
 		<Suspense>
-			<ModrinthAccountRequiredModal ref="modrinthLoginModal" :request-auth="requestModrinthAuth" />
+			<AuthGrantFlowWaitModal ref="modrinthLoginFlowWaitModal" @flow-cancel="cancelLogin" />
 		</Suspense>
 		<CreationFlowModal
 			ref="installationModal"
@@ -1678,11 +1488,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 				</template>
 				<template #sign-out> <LogOutIcon /> Sign out </template>
 			</OverflowMenu>
-			<NavButton
-				v-else
-				v-tooltip.right="'Sign in to a Modrinth account'"
-				:to="() => requestSignIn()"
-			>
+			<NavButton v-else v-tooltip.right="'Sign in to a Modrinth account'" :to="() => signIn()">
 				<LogInIcon class="text-brand" />
 			</NavButton>
 		</div>
@@ -1829,7 +1635,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 					</div>
 					<div class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid">
 						<suspense>
-							<FriendsList :credentials="credentials" :sign-in="() => requestSignIn()" />
+							<FriendsList :credentials="credentials" :sign-in="() => signIn()" />
 						</suspense>
 					</div>
 					<PrideFundraiserBanner
@@ -1870,7 +1676,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 	<PopupNotificationPanel :has-sidebar="sidebarVisible" />
 	<ErrorModal ref="errorModal" />
 	<MinecraftAuthErrorModal ref="minecraftAuthErrorModal" />
-	<MinecraftRequiredModal ref="minecraftRequiredModal" />
 	<ContentInstallModal
 		ref="modInstallModal"
 		:instances="contentInstallInstances"
@@ -1914,9 +1719,8 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 		@create-anyway="handleContentInstallModpackDuplicateCreateAnyway"
 		@go-to-instance="handleContentInstallModpackDuplicateGoToInstance"
 	/>
-	<SharedInstanceInviteHandler ref="sharedInstanceInviteHandler" />
-	<InstallToPlayModal ref="installToPlayModal" :show-external-warnings="false" />
-	<UpdateToPlayModal ref="updateToPlayModal" :show-external-warnings="false" />
+	<InstallToPlayModal ref="installToPlayModal" />
+	<UpdateToPlayModal ref="updateToPlayModal" />
 </template>

 <style lang="scss" scoped>
@@ -24,8 +24,7 @@ import { computed, ref } from 'vue'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import Instance from '@/components/ui/Instance.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
-import { install_duplicate_instance } from '@/helpers/install'
-import { remove } from '@/helpers/instance'
+import { duplicate, remove } from '@/helpers/profile.js'

 const { handleError } = injectNotificationManager()

@@ -49,23 +48,24 @@ const instanceComponents = ref(null)
 const currentDeleteInstance = ref(null)
 const confirmModal = ref(null)

-async function deleteInstance() {
+async function deleteProfile() {
 	if (currentDeleteInstance.value) {
 		instanceComponents.value = instanceComponents.value.filter(
-			(x) => x.instance.id !== currentDeleteInstance.value,
+			(x) => x.instance.path !== currentDeleteInstance.value,
 		)
 		await remove(currentDeleteInstance.value).catch(handleError)
 	}
 }

-async function duplicateInstance(p) {
-	await install_duplicate_instance(p).catch(handleError)
+async function duplicateProfile(p) {
+	await duplicate(p).catch(handleError)
 }

-const handleRightClick = (event, instanceId) => {
-	const item = instanceComponents.value.find((x) => x.instance.id === instanceId)
+const handleRightClick = (event, profilePathId) => {
+	const item = instanceComponents.value.find((x) => x.instance.path === profilePathId)
 	const baseOptions = [
-		...(item.instance.quarantined ? [] : [{ name: 'add_content' }, { type: 'divider' }]),
+		{ name: 'add_content' },
+		{ type: 'divider' },
 		{ name: 'edit' },
 		{ name: 'duplicate' },
 		{ name: 'open' },
@@ -89,14 +89,10 @@ const handleRightClick = (event, instanceId) => {
 					...baseOptions,
 				]
 			: [
-					...(item.instance.quarantined
-						? []
-						: [
-								{
-									name: 'play',
-									color: 'primary',
-								},
-							]),
+					{
+						name: 'play',
+						color: 'primary',
+					},
 					...baseOptions,
 				],
 	)
@@ -118,16 +114,16 @@ const handleOptionsClick = async (args) => {
 			break
 		case 'duplicate':
 			if (args.item.instance.install_stage == 'installed')
-				await duplicateInstance(args.item.instance.id)
+				await duplicateProfile(args.item.instance.path)
 			break
 		case 'open':
 			await args.item.openFolder()
 			break
 		case 'copy':
-			await navigator.clipboard.writeText(args.item.instance.id)
+			await navigator.clipboard.writeText(args.item.instance.path)
 			break
 		case 'delete':
-			currentDeleteInstance.value = args.item.instance.id
+			currentDeleteInstance.value = args.item.instance.path
 			confirmModal.value.show()
 			break
 	}
@@ -325,13 +321,13 @@ const filteredResults = computed(() => {
 			<Instance
 				v-for="instance in instanceSection.value"
 				ref="instanceComponents"
-				:key="instance.id + instance.install_stage"
+				:key="instance.path + instance.install_stage"
 				:instance="instance"
-				@contextmenu.prevent.stop="(event) => handleRightClick(event, instance.id)"
+				@contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
 			/>
 		</section>
 	</Accordion>
-	<ConfirmDeleteInstanceModal ref="confirmModal" @delete="deleteInstance" />
+	<ConfirmDeleteInstanceModal ref="confirmModal" @delete="deleteProfile" />
 	<ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
 		<template #play> <PlayIcon /> Play </template>
 		<template #stop> <StopCircleIcon /> Stop </template>
@@ -21,10 +21,9 @@ import Instance from '@/components/ui/Instance.vue'
 import LegacyProjectCard from '@/components/ui/LegacyProjectCard.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { install_duplicate_instance } from '@/helpers/install'
-import { kill, remove, run } from '@/helpers/instance'
-import { get_by_instance_id } from '@/helpers/process.js'
-import { showInstanceInFolder } from '@/helpers/utils.js'
+import { get_by_profile_path } from '@/helpers/process.js'
+import { duplicate, kill, remove, run } from '@/helpers/profile.js'
+import { showProfileInFolder } from '@/helpers/utils.js'
 import { injectContentInstall } from '@/providers/content-install'
 import { handleSevereError } from '@/store/error.js'

@@ -61,19 +60,20 @@ const deleteConfirmModal = ref(null)

 const currentDeleteInstance = ref(null)

-async function deleteInstance() {
+async function deleteProfile() {
 	if (currentDeleteInstance.value) {
 		await remove(currentDeleteInstance.value).catch(handleError)
 	}
 }

-async function duplicateInstance(p) {
-	await install_duplicate_instance(p).catch(handleError)
+async function duplicateProfile(p) {
+	await duplicate(p).catch(handleError)
 }

 const handleInstanceRightClick = async (event, passedInstance) => {
 	const baseOptions = [
-		...(passedInstance.quarantined ? [] : [{ name: 'add_content' }, { type: 'divider' }]),
+		{ name: 'add_content' },
+		{ type: 'divider' },
 		{ name: 'edit' },
 		{ name: 'duplicate' },
 		{ name: 'open_folder' },
@@ -85,7 +85,7 @@ const handleInstanceRightClick = async (event, passedInstance) => {
 		},
 	]

-	const runningProcesses = await get_by_instance_id(passedInstance.id).catch(handleError)
+	const runningProcesses = await get_by_profile_path(passedInstance.path).catch(handleError)

 	const options =
 		runningProcesses.length > 0
@@ -97,14 +97,10 @@ const handleInstanceRightClick = async (event, passedInstance) => {
 					...baseOptions,
 				]
 			: [
-					...(passedInstance.quarantined
-						? []
-						: [
-								{
-									name: 'play',
-									color: 'primary',
-								},
-							]),
+					{
+						name: 'play',
+						color: 'primary',
+					},
 					...baseOptions,
 				]

@@ -130,14 +126,16 @@ const handleProjectClick = (event, passedInstance) => {
 const handleOptionsClick = async (args) => {
 	switch (args.option) {
 		case 'play':
-			await run(args.item.id).catch((err) => handleSevereError(err, { instanceId: args.item.id }))
+			await run(args.item.path).catch((err) =>
+				handleSevereError(err, { profilePath: args.item.path }),
+			)
 			trackEvent('InstanceStart', {
 				loader: args.item.loader,
 				game_version: args.item.game_version,
 			})
 			break
 		case 'stop':
-			await kill(args.item.id).catch(handleError)
+			await kill(args.item.path).catch(handleError)
 			trackEvent('InstanceStop', {
 				loader: args.item.loader,
 				game_version: args.item.game_version,
@@ -146,26 +144,26 @@ const handleOptionsClick = async (args) => {
 		case 'add_content':
 			await router.push({
 				path: `/browse/${args.item.loader === 'vanilla' ? 'datapack' : 'mod'}`,
-				query: { i: args.item.id },
+				query: { i: args.item.path },
 			})
 			break
 		case 'edit':
 			await router.push({
-				path: `/instance/${encodeURIComponent(args.item.id)}`,
+				path: `/instance/${encodeURIComponent(args.item.path)}`,
 			})
 			break
 		case 'duplicate':
-			if (args.item.install_stage == 'installed') await duplicateInstance(args.item.id)
+			if (args.item.install_stage == 'installed') await duplicateProfile(args.item.path)
 			break
 		case 'delete':
-			currentDeleteInstance.value = args.item.id
+			currentDeleteInstance.value = args.item.path
 			deleteConfirmModal.value.show()
 			break
 		case 'open_folder':
-			await showInstanceInFolder(args.item.id)
+			await showProfileInFolder(args.item.path)
 			break
 		case 'copy_path':
-			await navigator.clipboard.writeText(args.item.id)
+			await navigator.clipboard.writeText(args.item.path)
 			break
 		case 'install': {
 			await installVersion(
@@ -241,7 +239,7 @@ onUnmounted(() => {
 </script>

 <template>
-	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="deleteInstance" />
+	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="deleteProfile" />
 	<div ref="rowContainer" class="flex flex-col gap-4">
 		<div v-for="row in actualInstances" ref="rows" :key="row.label" class="row">
 			<HeadingLink class="mt-1" :to="row.route">
@@ -258,7 +256,7 @@ onUnmounted(() => {
 						0,
 						row.compact ? maxInstancesPerCompactRow : maxInstancesPerRow,
 					)"
-					:key="row.label + instance.id"
+					:key="row.label + instance.path"
 					:instance="instance"
 					:compact="row.compact"
 					:first="instanceIndex === 0"
@@ -4,7 +4,7 @@ import { ButtonStyled, injectNotificationManager, OverflowMenu } from '@modrinth
 import { open } from '@tauri-apps/plugin-dialog'
 import { useRouter } from 'vue-router'

-import { add_project_from_path } from '@/helpers/instance'
+import { add_project_from_path } from '@/helpers/profile.js'

 const { handleError } = injectNotificationManager()

@@ -22,14 +22,14 @@ const handleAddContentFromFile = async () => {
 	if (!newProject) return

 	for (const project of newProject) {
-		await add_project_from_path(props.instance.id, project.path ?? project).catch(handleError)
+		await add_project_from_path(props.instance.path, project.path ?? project).catch(handleError)
 	}
 }

 const handleSearchContent = async () => {
 	await router.push({
 		path: `/browse/${props.instance.loader === 'vanilla' ? 'resourcepack' : 'mod'}`,
-		query: { i: props.instance.id },
+		query: { i: props.instance.path },
 	})
 }
 </script>
@@ -14,7 +14,31 @@
 			<UnplugIcon class="text-secondary" />
 			<span class="text-sm text-contrast"> {{ formatMessage(messages.offline) }} </span>
 		</div>
-		<AppUpdateButton />
+		<ButtonStyled color="brand" type="outlined" hover-color-fill="background">
+			<button
+				v-if="showUpdatePill"
+				type="button"
+				class="!h-[34px] overflow-hidden text-sm !transition-[width,opacity,transform,background-color,color,filter] !duration-200 ease-out"
+				:class="[
+					updatePillWidthClass,
+					{
+						'update-pill-ready-hidden': finishedDownloading && !animateReadyPill,
+						'update-pill-ready-visible': finishedDownloading && animateReadyPill,
+					},
+				]"
+				:disabled="isUpdateDownloading"
+				:aria-busy="isUpdateDownloading"
+				@click="handleUpdateClick"
+			>
+				<RefreshCwIcon v-if="finishedDownloading" :class="{ 'animate-spin': restarting }" />
+				<DownloadIcon v-else />
+				<span v-if="isUpdateDownloading">
+					{{ formatMessage(messages.downloadingUpdate) }}
+					<span class="inline-block w-[3ch] text-right tabular-nums">{{ downloadPercent }}%</span>
+				</span>
+				<span v-else>{{ updateLabel }}</span>
+			</button>
+		</ButtonStyled>
 		<div
 			class="flex border-solid border-surface-5 text-sm items-center gap-2 py-1.5 px-3 rounded-xl border"
 		>
@@ -23,28 +47,28 @@
 				<div class="text-contrast flex items-center gap-2">
 					<router-link
 						v-tooltip="formatMessage(messages.viewInstance)"
-						:to="`/instance/${encodeURIComponent(selectedProcess.instance.id)}`"
+						:to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`"
 						class="hover:underline"
 					>
-						{{ selectedProcess.instance.name }}
+						{{ selectedProcess.profile.name }}
 					</router-link>
 					<Dropdown
 						v-if="currentProcesses.length > 1"
 						placement="bottom"
 						:triggers="['click']"
 						:hide-triggers="['click']"
-						@show="showInstances = true"
-						@hide="showInstances = false"
+						@show="showProfiles = true"
+						@hide="showProfiles = false"
 					>
 						<ButtonStyled type="transparent" circular size="small">
 							<button
 								v-tooltip="
-									showInstances
+									showProfiles
 										? formatMessage(messages.hideMoreRunningInstances)
 										: formatMessage(messages.showMoreRunningInstances)
 								"
 							>
-								<DropdownIcon :class="{ 'rotate-180': !!showInstances }" />
+								<DropdownIcon :class="{ 'rotate-180': !!showProfiles }" />
 							</button>
 						</ButtonStyled>
 						<template #popper>
@@ -69,7 +93,7 @@
 									>
 										<OnlineIndicatorIcon />
 										<span class="mr-auto text-contrast flex items-center gap-2">
-											{{ process.instance.name }}
+											{{ process.profile.name }}
 											<StarIcon v-if="process.uuid === selectedProcess.uuid" class="text-orange" />
 										</span>
 									</button>
@@ -83,7 +107,7 @@
 									<button
 										v-tooltip="formatMessage(messages.viewLogs)"
 										class="active:scale-95 flex"
-										@click.stop="goToTerminal(process.instance.id)"
+										@click.stop="goToTerminal(process.profile.path)"
 									>
 										<TerminalSquareIcon class="text-secondary size-5" />
 									</button>
@@ -120,6 +144,7 @@ import {
 	DownloadIcon,
 	DropdownIcon,
 	OnlineIndicatorIcon,
+	RefreshCwIcon,
 	StarIcon,
 	StopCircleIcon,
 	TerminalSquareIcon,
@@ -136,18 +161,21 @@ import {
 } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { Dropdown } from 'floating-vue'
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'

-import AppUpdateButton from '@/components/ui/app-update-button/index.vue'
-import { useInstallJobNotifications } from '@/composables/browse/install-job-notifications'
 import { trackEvent } from '@/helpers/analytics'
 import { loading_listener, process_listener } from '@/helpers/events'
-import { get_many as getInstances } from '@/helpers/instance'
 import { get_all as getRunningProcesses, kill as killProcess } from '@/helpers/process'
+import { get_many as getInstances } from '@/helpers/profile.js'
 import type { LoadingBar } from '@/helpers/state'
 import { progress_bars_list } from '@/helpers/state'
 import type { GameInstance } from '@/helpers/types'
+import {
+	appUpdateState,
+	downloadAvailableAppUpdate,
+	installAvailableAppUpdate,
+} from '@/providers/app-update'

 const { handleError } = injectNotificationManager()
 const popupNotificationManager = injectPopupNotificationManager()
@@ -155,12 +183,12 @@ const { formatMessage } = useVIntl()

 const router = useRouter()

-const showInstances = ref(false)
+const showProfiles = ref(false)

 interface RunningProcess {
 	uuid: string
-	instance_id: string
-	instance: GameInstance
+	profile_path: string
+	profile: GameInstance
 }

 const messages = defineMessages({
@@ -212,8 +240,96 @@ const messages = defineMessages({
 		id: 'app.action-bar.view-active-downloads',
 		defaultMessage: 'View active downloads',
 	},
+	update: {
+		id: 'app.action-bar.update',
+		defaultMessage: 'Update',
+	},
+	downloadingUpdate: {
+		id: 'app.action-bar.downloading-update',
+		defaultMessage: 'Downloading update',
+	},
+	reloadToUpdate: {
+		id: 'app.action-bar.reload-to-update',
+		defaultMessage: 'Reload to update',
+	},
 })

+const {
+	downloading,
+	downloadPercent,
+	downloadProgress,
+	finishedDownloading,
+	isVisible: isUpdateVisible,
+	metered,
+	restarting,
+} = appUpdateState
+
+const isUpdateDownloading = computed(
+	() =>
+		downloading.value ||
+		(downloadProgress.value > 0 && downloadProgress.value < 1 && !finishedDownloading.value),
+)
+const showUpdatePill = computed(
+	() => isUpdateVisible.value && (finishedDownloading.value || metered.value),
+)
+const animateReadyPill = ref(false)
+const updateLabel = computed(() => {
+	if (isUpdateDownloading.value) {
+		return formatMessage(messages.downloadingUpdate)
+	}
+
+	if (finishedDownloading.value) {
+		return formatMessage(messages.reloadToUpdate)
+	}
+
+	return formatMessage(messages.update)
+})
+const updatePillWidthClass = computed(() => {
+	if (isUpdateDownloading.value) {
+		return 'w-[219px]'
+	}
+
+	if (finishedDownloading.value) {
+		return 'w-[166px]'
+	}
+
+	return '!w-[96px]'
+})
+let readyPillAnimationFrame: number | null = null
+watch([showUpdatePill, finishedDownloading], async ([show, ready], [wasShown, wasReady]) => {
+	if (readyPillAnimationFrame !== null) {
+		cancelAnimationFrame(readyPillAnimationFrame)
+		readyPillAnimationFrame = null
+	}
+
+	if (!show || !ready) {
+		animateReadyPill.value = false
+		return
+	}
+
+	if (wasShown && wasReady) {
+		return
+	}
+
+	animateReadyPill.value = false
+	await nextTick()
+	readyPillAnimationFrame = requestAnimationFrame(() => {
+		animateReadyPill.value = true
+		readyPillAnimationFrame = null
+	})
+})
+async function handleUpdateClick() {
+	if (isUpdateDownloading.value) {
+		return
+	}
+
+	if (finishedDownloading.value) {
+		await installAvailableAppUpdate()
+	} else {
+		await downloadAvailableAppUpdate()
+	}
+}
+
 const currentProcesses = ref<RunningProcess[]>([])
 const selectedProcess = ref<RunningProcess | undefined>()

@@ -221,22 +337,22 @@ const refresh = async () => {
 	const processes = ((await getRunningProcesses().catch((error) => {
 		handleError(error)
 		return []
-	})) ?? []) as Array<{ uuid: string; instance_id: string }>
-	const instanceIds = processes.map((process) => process.instance_id)
-	const instances: GameInstance[] = await getInstances(instanceIds).catch((error) => {
+	})) ?? []) as Array<{ uuid: string; profile_path: string }>
+	const paths = processes.map((process) => process.profile_path)
+	const profiles: GameInstance[] = await getInstances(paths).catch((error) => {
 		handleError(error)
 		return []
 	})

 	currentProcesses.value = processes
 		.map((process) => {
-			const instance = instances.find((item) => process.instance_id === item.id)
-			if (!instance) {
+			const profile = profiles.find((item) => process.profile_path === item.path)
+			if (!profile) {
 				return null
 			}
 			return {
 				...process,
-				instance,
+				profile,
 			}
 		})
 		.filter((process): process is RunningProcess => process !== null)
@@ -269,8 +385,8 @@ const stop = async (process: RunningProcess) => {
 		await killProcess(process.uuid).catch(handleError)

 		trackEvent('InstanceStop', {
-			loader: process.instance.loader,
-			game_version: process.instance.game_version,
+			loader: process.profile.loader,
+			game_version: process.profile.game_version,
 			source: 'AppBar',
 		})
 	} catch (e) {
@@ -279,12 +395,12 @@ const stop = async (process: RunningProcess) => {
 	await refresh()
 }

-function goToTerminal(instanceId?: string) {
-	const selectedInstanceId = instanceId ?? selectedProcess.value?.instance.id
-	if (!selectedInstanceId) {
+function goToTerminal(path?: string) {
+	const selectedPath = path ?? selectedProcess.value?.profile.path
+	if (!selectedPath) {
 		return
 	}
-	router.push(`/instance/${encodeURIComponent(selectedInstanceId)}/logs`)
+	router.push(`/instance/${encodeURIComponent(selectedPath)}/logs`)
 }

 const currentLoadingBars = ref<LoadingBar[]>([])
@@ -304,7 +420,8 @@ function getLoadingProgress(loadingBar: LoadingBar): number {
 }

 function getLoadingText(loadingBar: LoadingBar): string {
-	return loadingBar.message ?? ''
+	const percent = Math.floor(getLoadingProgress(loadingBar) * 100)
+	return loadingBar.message ? `${percent}% ${loadingBar.message}` : `${percent}%`
 }

 function getDisplayIconUrl(icon: string | null | undefined): string | null {
@@ -336,33 +453,25 @@ function removeNotification(): void {
 }

 function buildDownloadItems(): PopupNotificationProgressItem[] {
-	return [
-		...installJobNotifications.progressItems.value,
-		...currentLoadingBars.value.map((bar) => ({
-			id: getLoadingBarKey(bar),
-			title: bar.title ?? '',
-			text: getLoadingText(bar),
-			iconUrl: currentLoadingBarIconUrls.value[getLoadingBarKey(bar)] ?? null,
-			progress: getLoadingProgress(bar),
-			waiting: !bar.total || bar.total <= 0,
-			progressType: 'percentage',
-			progressCurrent: bar.current,
-			progressTotal: bar.total,
-		})),
-	]
+	return currentLoadingBars.value.map((bar) => ({
+		id: getLoadingBarKey(bar),
+		title: bar.title ?? '',
+		text: getLoadingText(bar),
+		iconUrl: currentLoadingBarIconUrls.value[getLoadingBarKey(bar)] ?? null,
+		progress: getLoadingProgress(bar),
+		waiting: !bar.total || bar.total <= 0,
+	}))
 }

 const hasVisibleActiveDownloadToasts = computed(() => !!getNotification())
-const hasActiveLoadingBars = computed(
-	() => currentLoadingBars.value.length > 0 || installJobNotifications.active.value,
-)
+const hasActiveLoadingBars = computed(() => currentLoadingBars.value.length > 0)

 function updateNotification(resummon = false): void {
 	if (resummon) {
 		dismissed.value = false
 	}

-	if (currentLoadingBars.value.length === 0 && !installJobNotifications.active.value) {
+	if (currentLoadingBars.value.length === 0) {
 		removeNotification()
 		dismissed.value = false
 		return
@@ -381,23 +490,17 @@ function updateNotification(resummon = false): void {
 	const progressItems = buildDownloadItems()

 	if (notif) {
-		notif.title = installJobNotifications.active.value
-			? installJobNotifications.title.value
-			: formatMessage(messages.downloads)
+		notif.title = formatMessage(messages.downloads)
 		notif.text = undefined
 		notif.progressItems = progressItems
-		notif.buttons = installJobNotifications.buttons.value
 		notif.progress = undefined
 		notif.waiting = undefined
 	} else {
 		notif = popupNotificationManager.addPopupNotification({
-			title: installJobNotifications.active.value
-				? installJobNotifications.title.value
-				: formatMessage(messages.downloads),
+			title: formatMessage(messages.downloads),
 			type: 'download',
 			autoCloseMs: null,
 			progressItems,
-			buttons: installJobNotifications.buttons.value,
 		})
 		notificationId.value = notif.id
 	}
@@ -410,8 +513,8 @@ function formatLoadingBars(loadingBar: LoadingBar): LoadingBar {
 			version: formatted.bar_type.version,
 		})
 	}
-	if (formatted.bar_type?.instance_id) {
-		formatted.title = formatted.bar_type.instance_name ?? formatted.bar_type.instance_id
+	if (formatted.bar_type?.profile_path) {
+		formatted.title = formatted.bar_type.profile_path
 	}
 	if (formatted.bar_type?.pack_name) {
 		formatted.title = formatted.bar_type.pack_name
@@ -427,41 +530,31 @@ async function refreshLoadingBars() {

 	currentLoadingBars.value = Object.values(bars)
 		.map(formatLoadingBars)
-		.filter(
-			(bar) =>
-				bar?.bar_type?.type !== 'launcher_update' &&
-				![
-					'java_download',
-					'pack_file_download',
-					'pack_download',
-					'minecraft_download',
-					'copy_instance',
-				].includes(bar?.bar_type?.type ?? ''),
-		)
+		.filter((bar) => bar?.bar_type?.type !== 'launcher_update')

-	const instanceIds = Array.from(
+	const profilePaths = Array.from(
 		new Set(
 			currentLoadingBars.value
-				.map((bar) => bar.bar_type?.instance_id)
-				.filter((instanceId): instanceId is string => !!instanceId),
+				.map((bar) => bar.bar_type?.profile_path)
+				.filter((path): path is string => !!path),
 		),
 	)
-	const instances = instanceIds.length
-		? await getInstances(instanceIds).catch((error) => {
+	const profiles = profilePaths.length
+		? await getInstances(profilePaths).catch((error) => {
 				handleError(error)
 				return []
 			})
 		: []
-	const instanceIconUrls = new Map(
-		instances.map((instance) => [instance.id, getDisplayIconUrl(instance.icon_path)]),
+	const profileIconUrls = new Map(
+		profiles.map((profile) => [profile.path, getDisplayIconUrl(profile.icon_path)]),
 	)
 	currentLoadingBarIconUrls.value = Object.fromEntries(
 		currentLoadingBars.value.map((bar) => {
 			const barIconUrl = getDisplayIconUrl(bar.bar_type?.icon)
-			const instanceIconUrl = bar.bar_type?.instance_id
-				? instanceIconUrls.get(bar.bar_type.instance_id)
+			const profileIconUrl = bar.bar_type?.profile_path
+				? profileIconUrls.get(bar.bar_type.profile_path)
 				: null
-			return [getLoadingBarKey(bar), barIconUrl ?? instanceIconUrl ?? null]
+			return [getLoadingBarKey(bar), barIconUrl ?? profileIconUrl ?? null]
 		}),
 	)

@@ -474,12 +567,6 @@ async function refreshLoadingBars() {
 	updateNotification()
 }

-const installJobNotifications = await useInstallJobNotifications({
-	router,
-	handleError,
-	onChange: updateNotification,
-})
-
 await refreshLoadingBars()

 const unlistenLoading = await loading_listener(async () => {
@@ -501,6 +588,20 @@ onBeforeUnmount(() => {
 	window.removeEventListener('online', handleOnline)
 	unlistenProcess()
 	unlistenLoading()
-	installJobNotifications.dispose()
+	if (readyPillAnimationFrame !== null) {
+		cancelAnimationFrame(readyPillAnimationFrame)
+	}
 })
 </script>
+
+<style scoped>
+.update-pill-ready-hidden {
+	opacity: 0;
+	transform: scale(0.96);
+}
+
+.update-pill-ready-visible {
+	opacity: 1;
+	transform: scale(1);
+}
+</style>
@@ -12,7 +12,7 @@
 			<div v-for="(option, index) in options" :key="index" @click.stop="optionClicked(option.name)">
 				<hr v-if="option.type === 'divider'" class="divider" />
 				<div
-					v-else-if="!(isInstanceLink(item) && option.name === `add_content`)"
+					v-else-if="!(isLinkedData(item) && option.name === `add_content`)"
 					class="item clickable"
 					:class="[option.color ?? 'base']"
 				>
@@ -64,10 +64,10 @@ defineExpose({
 	},
 })

-const isInstanceLink = (item) => {
-	if (item.instance != undefined && item.instance.link) {
+const isLinkedData = (item) => {
+	if (item.instance != undefined && item.instance.linked_data) {
 		return true
-	} else if (item != undefined && item.link) {
+	} else if (item != undefined && item.linked_data) {
 		return true
 	}
 	return false
@@ -16,7 +16,7 @@ import { ChatIcon } from '@/assets/icons'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
-import { install_existing_instance } from '@/helpers/install'
+import { install } from '@/helpers/profile.js'
 import { cancel_directory_change } from '@/helpers/settings.ts'
 import { handleSevereError } from '@/store/error.js'

@@ -52,6 +52,10 @@ defineExpose({
 			if (errorVal.message.includes('because the target machine actively refused it')) {
 				metadata.value.hostsFile = true
 			}
+		} else if (errorVal.message && errorVal.message.includes('User is not logged in')) {
+			title.value = 'Sign in to Minecraft'
+			errorType.value = 'minecraft_sign_in'
+			supportLink.value = 'https://support.modrinth.com'
 		} else if (errorVal.message && errorVal.message.includes('Move directory error:')) {
 			title.value = 'Could not change app directory'
 			errorType.value = 'directory_move'
@@ -68,7 +72,7 @@ defineExpose({
 			title.value = 'No loader selected'
 			errorType.value = 'no_loader_version'
 			supportLink.value = 'https://support.modrinth.com'
-			metadata.value.instanceId = context.instanceId
+			metadata.value.profilePath = context.profilePath
 		} else if (source === 'state_init') {
 			title.value = 'Error initializing Modrinth App'
 			errorType.value = 'state_init'
@@ -121,7 +125,7 @@ const loadingRepair = ref(false)
 async function repairInstance() {
 	loadingRepair.value = true
 	try {
-		await install_existing_instance(metadata.value.instanceId, false)
+		await install(metadata.value.profilePath, false)
 		errorModal.value.hide()
 	} catch (err) {
 		handleSevereError(err)
@@ -239,6 +243,20 @@ async function copyToClipboard(text) {
 						</button>
 					</div>
 				</template>
+				<div v-else-if="errorType === 'minecraft_sign_in'">
+					<p>
+						To play this instance, you must sign in through Microsoft below. If you don't have a
+						Minecraft account, you can purchase the game on the
+						<a href="https://www.minecraft.net/en-us/store/minecraft-java-bedrock-edition-pc"
+							>Minecraft website</a
+						>.
+					</p>
+					<div class="cta-button">
+						<button class="btn btn-primary" :disabled="loadingMinecraft" @click="loginMinecraft">
+							<LogInIcon /> Sign in to Minecraft
+						</button>
+					</div>
+				</div>
 				<template v-else-if="errorType === 'state_init'">
 					<p>
 						Modrinth App failed to load correctly. This may be because of a corrupted file, or
@@ -1,32 +1,28 @@
 <script setup>
-import { XIcon } from '@modrinth/assets'
+import { WrenchIcon, XIcon } from '@modrinth/assets'
 import {
+	Accordion,
 	ButtonStyled,
+	Checkbox,
 	commonMessages,
 	defineMessages,
-	FileTreeSelect,
 	injectNotificationManager,
-	NewModal,
 	StyledInput,
 	useVIntl,
 } from '@modrinth/ui'
 import { save } from '@tauri-apps/plugin-dialog'
-import { readDir, stat } from '@tauri-apps/plugin-fs'
 import { ref } from 'vue'

-import { PackageIcon } from '@/assets/icons'
-import {
-	export_instance_mrpack,
-	get_full_path,
-	get_pack_export_candidates,
-} from '@/helpers/instance'
+import { PackageIcon, VersionIcon } from '@/assets/icons'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile.js'

 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()

 const messages = defineMessages({
 	header: { id: 'app.export-modal.header', defaultMessage: 'Export modpack' },
-	modpackNameLabel: { id: 'app.export-modal.modpack-name-label', defaultMessage: 'Modpack name' },
+	modpackNameLabel: { id: 'app.export-modal.modpack-name-label', defaultMessage: 'Modpack Name' },
 	modpackNamePlaceholder: {
 		id: 'app.export-modal.modpack-name-placeholder',
 		defaultMessage: 'Modpack name',
@@ -43,7 +39,15 @@ const messages = defineMessages({
 		id: 'app.export-modal.description-placeholder',
 		defaultMessage: 'Enter modpack description...',
 	},
+	selectFilesLabel: {
+		id: 'app.export-modal.select-files-label',
+		defaultMessage: 'Configure which files are included in this export',
+	},
 	exportButton: { id: 'app.export-modal.export-button', defaultMessage: 'Export' },
+	includeFile: {
+		id: 'app.export-modal.include-file-accessibility-label',
+		defaultMessage: 'Include "{file}"?',
+	},
 })

 const props = defineProps({
@@ -55,9 +59,8 @@ const props = defineProps({

 defineExpose({
 	show: () => {
-		resetExportState()
 		exportModal.value.show()
-		void initFiles().catch(handleError)
+		initFiles()
 	},
 })

@@ -66,33 +69,62 @@ const nameInput = ref(props.instance.name)
 const exportDescription = ref('')
 const versionInput = ref('1.0.0')
 const files = ref([])
-const selectedFilePaths = ref([])
-const fileTreeKey = ref(0)
-const filesLoadId = ref(0)
-const instanceRoot = ref('')
-const loadedDirectories = ref(new Set())
+const folders = ref([])

-async function initFiles() {
-	const loadId = ++filesLoadId.value
-	const [filePaths, root] = await Promise.all([
-		get_pack_export_candidates(props.instance.id),
-		get_full_path(props.instance.id),
-	])
-	if (loadId !== filesLoadId.value) return
-
-	instanceRoot.value = root
-	const exportCandidates = await Promise.all(
-		filePaths.map((path) => buildExportCandidateItem(root, path)),
+const initFiles = async () => {
+	const newFolders = new Map()
+	const sep = '/'
+	files.value = []
+	await get_pack_export_candidates(props.instance.path).then((filePaths) =>
+		filePaths
+			.map((folder) => ({
+				path: folder,
+				name: folder.split(sep).pop(),
+				selected:
+					folder.startsWith('mods') ||
+					folder.startsWith('datapacks') ||
+					folder.startsWith('resourcepacks') ||
+					folder.startsWith('shaderpacks') ||
+					folder.startsWith('config'),
+				disabled:
+					folder === 'profile.json' ||
+					folder.startsWith('modrinth_logs') ||
+					folder.startsWith('.fabric') ||
+					folder.startsWith('__MACOSX'),
+			}))
+			.forEach((pathData) => {
+				const parent = pathData.path.split(sep).slice(0, -1).join(sep)
+				if (parent !== '') {
+					if (newFolders.has(parent)) {
+						newFolders.get(parent).push(pathData)
+					} else {
+						newFolders.set(parent, [pathData])
+					}
+				} else {
+					files.value.push(pathData)
+				}
+			}),
 	)
-	if (loadId !== filesLoadId.value) return
-
-	files.value = exportCandidates
-	selectedFilePaths.value = files.value
-		.filter((file) => !file.disabled && isDefaultSelectedExportCandidate(file.path))
-		.map((file) => file.path)
+	folders.value = [...newFolders.entries()].map(([name, value]) => [
+		{
+			name,
+			showingMore: false,
+		},
+		value,
+	])
 }

+await initFiles()
+
 const exportPack = async () => {
+	const filesToExport = files.value.filter((file) => file.selected).map((file) => file.path)
+	folders.value.forEach((args) => {
+		args[1].forEach((child) => {
+			if (child.selected) {
+				filesToExport.push(child.path)
+			}
+		})
+	})
 	const outputPath = await save({
 		defaultPath: `${nameInput.value} ${versionInput.value}.mrpack`,
 		filters: [
@@ -104,10 +136,10 @@ const exportPack = async () => {
 	})

 	if (outputPath) {
-		export_instance_mrpack(
-			props.instance.id,
+		export_profile_mrpack(
+			props.instance.path,
 			outputPath,
-			selectedFilePaths.value,
+			filesToExport,
 			versionInput.value,
 			exportDescription.value,
 			nameInput.value,
@@ -115,176 +147,94 @@ const exportPack = async () => {
 		exportModal.value.hide()
 	}
 }
-
-function resetExportState() {
-	nameInput.value = props.instance.name
-	exportDescription.value = ''
-	versionInput.value = '1.0.0'
-	files.value = []
-	selectedFilePaths.value = []
-	fileTreeKey.value += 1
-	instanceRoot.value = ''
-	loadedDirectories.value = new Set()
-}
-
-async function loadExportDirectory(path) {
-	if (!path || !instanceRoot.value || loadedDirectories.value.has(path)) return
-
-	const loadId = filesLoadId.value
-	loadedDirectories.value.add(path)
-
-	try {
-		const entries = await readDir(`${instanceRoot.value}/${path}`)
-		const childItems = await Promise.all(
-			entries.map((entry) => buildExportDirectoryChildItem(instanceRoot.value, path, entry)),
-		)
-		if (loadId !== filesLoadId.value) return
-
-		appendExportItems(childItems)
-	} catch {
-		loadedDirectories.value.delete(path)
-	}
-}
-
-async function buildExportCandidateItem(instanceRoot, path) {
-	try {
-		const entries = await readDir(`${instanceRoot}/${path}`)
-		const metadata = await getExportCandidateMetadata(instanceRoot, path)
-		return {
-			path,
-			type: 'directory',
-			disabled: isExportCandidateDisabled(path),
-			modified: metadata.modified,
-			count: entries.length,
-		}
-	} catch {
-		return buildExportFileItem(instanceRoot, path)
-	}
-}
-
-async function buildExportDirectoryChildItem(instanceRoot, parentPath, entry) {
-	const path = `${parentPath}/${entry.name}`
-	if (entry.isDirectory) {
-		const metadata = await getExportCandidateMetadata(instanceRoot, path)
-		return {
-			path,
-			type: 'directory',
-			disabled: isExportCandidateDisabled(path),
-			modified: metadata.modified,
-		}
-	}
-
-	return buildExportFileItem(instanceRoot, path)
-}
-
-async function buildExportFileItem(instanceRoot, path) {
-	const metadata = await getExportCandidateMetadata(instanceRoot, path)
-	return {
-		path,
-		type: 'file',
-		disabled: isExportCandidateDisabled(path),
-		size: metadata.size,
-		modified: metadata.modified,
-	}
-}
-
-function appendExportItems(items) {
-	const nextFiles = new Map(files.value.map((file) => [normalizeExportPath(file.path), file]))
-	for (const item of items) {
-		nextFiles.set(normalizeExportPath(item.path), item)
-	}
-	files.value = [...nextFiles.values()]
-}
-
-async function getExportCandidateMetadata(instanceRoot, path) {
-	try {
-		const metadata = await stat(`${instanceRoot}/${path}`)
-		return {
-			size: metadata.size,
-			modified: metadata.mtime ? Math.floor(metadata.mtime.getTime() / 1000) : undefined,
-		}
-	} catch {
-		return {}
-	}
-}
-
-function normalizeExportPath(path) {
-	return path.replaceAll('\\', '/').split('/').filter(Boolean).join('/')
-}
-
-function isDefaultSelectedExportCandidate(path) {
-	return (
-		path.startsWith('mods') ||
-		path.startsWith('datapacks') ||
-		path.startsWith('resourcepacks') ||
-		path.startsWith('shaderpacks') ||
-		path.startsWith('config')
-	)
-}
-
-function isExportCandidateDisabled(path) {
-	return (
-		path === 'profile.json' ||
-		path.startsWith('modrinth_logs') ||
-		path.startsWith('.fabric') ||
-		path.startsWith('__MACOSX')
-	)
-}
 </script>

 <template>
-	<NewModal
-		ref="exportModal"
-		:header="formatMessage(messages.header)"
-		scrollable
-		width="46rem"
-		max-width="calc(100vw - 2rem)"
-	>
-		<div class="flex flex-col gap-4">
+	<ModalWrapper ref="exportModal" :header="formatMessage(messages.header)">
+		<div class="flex flex-col gap-4 w-[40rem]">
 			<div class="grid grid-cols-2 gap-4">
-				<div class="labeled_input w-full">
-					<p class="text-contrast font-semibold">{{ formatMessage(messages.modpackNameLabel) }}</p>
+				<div class="labeled_input">
+					<p>{{ formatMessage(messages.modpackNameLabel) }}</p>
 					<StyledInput
 						v-model="nameInput"
+						:icon="PackageIcon"
 						type="text"
 						:placeholder="formatMessage(messages.modpackNamePlaceholder)"
 						clearable
-						wrapper-class="w-full"
 					/>
 				</div>
-				<div class="labeled_input w-full">
-					<p class="text-contrast font-semibold">
-						{{ formatMessage(messages.versionNumberLabel) }}
-					</p>
+				<div class="labeled_input">
+					<p>{{ formatMessage(messages.versionNumberLabel) }}</p>
 					<StyledInput
 						v-model="versionInput"
+						:icon="VersionIcon"
 						type="text"
 						:placeholder="formatMessage(messages.versionNumberPlaceholder)"
 						clearable
-						wrapper-class="w-full"
 					/>
 				</div>
 			</div>
-			<div class="flex flex-col gap-2 min-w-0">
-				<p class="m-0 text-contrast font-semibold">
-					{{ formatMessage(commonMessages.descriptionLabel) }}
-				</p>
+			<div class="flex flex-col gap-2">
+				<p class="m-0">{{ formatMessage(commonMessages.descriptionLabel) }}</p>
 				<StyledInput
 					v-model="exportDescription"
 					multiline
 					:placeholder="formatMessage(messages.descriptionPlaceholder)"
-					wrapper-class="w-full"
 				/>
 			</div>
-			<FileTreeSelect
-				:key="fileTreeKey"
-				v-model="selectedFilePaths"
-				class="min-w-0"
-				:items="files"
-				@navigate="loadExportDirectory"
-			/>
-		</div>
-		<template #actions>
+			<Accordion
+				class="w-full bg-surface-4 border border-solid border-surface-5 rounded-2xl overflow-clip"
+				button-class="p-4 w-full border-b border-solid border-b-surface-5 bg-surface-2 -mb-px hover:brightness-[--hover-brightness] group"
+			>
+				<template #title>
+					<span class="flex items-center gap-3 text-contrast group-active:scale-[0.98]">
+						<WrenchIcon aria-hidden="true" class="size-5 text-secondary" />
+						Configure which files are included in this export
+					</span>
+				</template>
+				<div class="flex flex-col [&>*:nth-child(even)]:bg-surface-3">
+					<div v-for="[path, children] in folders" :key="path.name" class="flex flex-col">
+						<Accordion
+							class="flex flex-col"
+							button-class="flex gap-3 pr-4 hover:bg-surface-5 group"
+						>
+							<template #title>
+								<Checkbox
+									:model-value="children.every((child) => child.selected)"
+									:indeterminate="
+										!children.every((child) => child.selected) &&
+										children.some((child) => child.selected)
+									"
+									:description="formatMessage(messages.includeFile, { file: path.name })"
+									class="pl-4 py-2"
+									:disabled="children.every((x) => x.disabled)"
+									@update:model-value="
+										(newValue) => children.forEach((child) => (child.selected = newValue))
+									"
+									@click.stop
+								/>
+								<span class="ml-2 group-active:scale-95">{{ path.name }}/</span>
+							</template>
+							<div v-for="child in children" :key="child.path">
+								<Checkbox
+									v-model="child.selected"
+									:label="child.name"
+									class="w-full px-8 py-2 hover:bg-surface-4 text-primary"
+									:disabled="child.disabled"
+								/>
+							</div>
+						</Accordion>
+					</div>
+					<Checkbox
+						v-for="file in files"
+						:key="file.path"
+						v-model="file.selected"
+						:label="file.name"
+						:disabled="file.disabled"
+						class="w-full px-4 py-2 hover:bg-surface-4 text-primary"
+					/>
+				</div>
+			</Accordion>
 			<div class="flex items-center justify-end gap-2">
 				<ButtonStyled type="outlined">
 					<button @click="exportModal.hide">
@@ -299,6 +249,6 @@ function isExportCandidateDisabled(path) {
 					</button>
 				</ButtonStyled>
 			</div>
-		</template>
-	</NewModal>
+		</div>
+	</ModalWrapper>
 </template>
@@ -15,10 +15,9 @@ import { useRouter } from 'vue-router'

 import { trackEvent } from '@/helpers/analytics'
 import { process_listener } from '@/helpers/events'
-import { install_existing_instance, install_pack_to_existing_instance } from '@/helpers/install'
-import { kill, run } from '@/helpers/instance'
-import { get_by_instance_id } from '@/helpers/process'
-import { showInstanceInFolder } from '@/helpers/utils.js'
+import { get_by_profile_path } from '@/helpers/process'
+import { finish_install, kill, run } from '@/helpers/profile'
+import { showProfileInFolder } from '@/helpers/utils.js'
 import { handleSevereError } from '@/store/error.js'

 const { handleError } = injectNotificationManager()
@@ -55,21 +54,20 @@ const installed = computed(() => props.instance.install_stage === 'installed')
 const router = useRouter()

 const seeInstance = async () => {
-	await router.push(`/instance/${encodeURIComponent(props.instance.id)}`)
+	await router.push(`/instance/${encodeURIComponent(props.instance.path)}`)
 }

 const checkProcess = async () => {
-	const runningProcesses = await get_by_instance_id(props.instance.id).catch(handleError)
+	const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)

 	playing.value = runningProcesses.length > 0
 }

 const play = async (e, context) => {
 	e?.stopPropagation()
-	if (props.instance.quarantined) return
 	loading.value = true
-	await run(props.instance.id)
-		.catch((err) => handleSevereError(err, { instanceId: props.instance.id }))
+	await run(props.instance.path)
+		.catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: props.instance.loader,
@@ -84,7 +82,7 @@ const stop = async (e, context) => {
 	e?.stopPropagation()
 	playing.value = false

-	await kill(props.instance.id).catch(handleError)
+	await kill(props.instance.path).catch(handleError)

 	trackEvent('InstanceStop', {
 		loader: props.instance.loader,
@@ -95,33 +93,18 @@ const stop = async (e, context) => {

 const repair = async (e) => {
 	e?.stopPropagation()
-	if (props.instance.quarantined) return

-	if (
-		props.instance.install_stage !== 'pack_installed' &&
-		(props.instance.link?.type === 'modrinth_modpack' ||
-			props.instance.link?.type === 'server_project_modpack')
-	) {
-		await install_pack_to_existing_instance(props.instance.id, {
-			type: 'fromVersionId',
-			project_id: props.instance.link.project_id ?? props.instance.link.server_project_id ?? '',
-			version_id: props.instance.link.version_id ?? props.instance.link.content_version_id ?? '',
-			title: props.instance.name,
-		}).catch(handleError)
-	} else {
-		await install_existing_instance(props.instance.id, false).catch(handleError)
-	}
+	await finish_install(props.instance).catch(handleError)
 }

 const openFolder = async () => {
-	await showInstanceInFolder(props.instance.id)
+	await showProfileInFolder(props.instance.path)
 }

 const addContent = async () => {
-	if (props.instance.quarantined) return
 	await router.push({
 		path: `/browse/${props.instance.loader === 'vanilla' ? 'datapack' : 'mod'}`,
-		query: { i: props.instance.id },
+		query: { i: props.instance.path },
 	})
 }

@@ -137,7 +120,7 @@ defineExpose({
 const currentEvent = ref(null)

 const unlisten = await process_listener((e) => {
-	if (e.instance_id === props.instance.id) {
+	if (e.profile_path_id === props.instance.path) {
 		currentEvent.value = e.event
 		if (e.event === 'finished') {
 			playing.value = false
@@ -145,9 +128,7 @@ const unlisten = await process_listener((e) => {
 	}
 })

-onMounted(() => {
-	checkProcess()
-})
+onMounted(() => checkProcess())
 onUnmounted(() => unlisten())
 </script>

@@ -161,7 +142,7 @@ onUnmounted(() => unlisten())
 			<Avatar
 				size="48px"
 				:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-				:tint-by="instance.id"
+				:tint-by="instance.path"
 				alt="Mod card"
 			/>
 			<div class="h-full flex items-center font-bold text-contrast leading-normal">
@@ -178,11 +159,7 @@ onUnmounted(() => unlisten())
 						<SpinnerIcon class="animate-spin" />
 					</button>
 				</ButtonStyled>
-				<ButtonStyled
-					v-else-if="!instance.quarantined"
-					:color="first ? 'brand' : 'standard'"
-					circular
-				>
+				<ButtonStyled v-else :color="first ? 'brand' : 'standard'" circular>
 					<button
 						v-tooltip="'Play'"
 						@click="(e) => play(e, 'InstanceCard')"
@@ -214,7 +191,7 @@ onUnmounted(() => unlisten())
 				<Avatar
 					size="48px"
 					:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-					:tint-by="instance.id"
+					:tint-by="instance.path"
 					alt="Mod card"
 					:class="`transition-all ${modLoading || installing ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
 				/>
@@ -236,12 +213,7 @@ onUnmounted(() => unlisten())
 						class="animate-spin w-8 h-8"
 						tabindex="-1"
 					/>
-					<ButtonStyled
-						v-else-if="!installed && !instance.quarantined"
-						size="large"
-						color="brand"
-						circular
-					>
+					<ButtonStyled v-else-if="!installed" size="large" color="brand" circular>
 						<button
 							v-tooltip="'Repair'"
 							class="transition-all scale-75 group-hover:scale-100 group-focus-within:scale-100 origin-bottom opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 card-shadow"
@@ -250,7 +222,7 @@ onUnmounted(() => unlisten())
 							<DownloadIcon />
 						</button>
 					</ButtonStyled>
-					<ButtonStyled v-else-if="!instance.quarantined" size="large" color="brand" circular>
+					<ButtonStyled v-else size="large" color="brand" circular>
 						<button
 							v-tooltip="'Play'"
 							class="transition-all scale-75 group-hover:scale-100 group-focus-within:scale-100 origin-bottom opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 card-shadow"
@@ -22,7 +22,7 @@ const props = withDefaults(
 )

 const instanceLink = computed(() => {
-	const base = `/instance/${encodeURIComponent(props.instance.id)}`
+	const base = `/instance/${encodeURIComponent(props.instance.path)}`
 	return props.backTab ? `${base}/${props.backTab}` : base
 })
 </script>
@@ -5,7 +5,7 @@ import { computed, ref } from 'vue'

 import { SwapIcon } from '@/assets/icons/index.js'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { update_managed_modrinth_version } from '@/helpers/instance'
+import { update_managed_modrinth_version } from '@/helpers/profile'
 import { releaseColor } from '@/helpers/utils'

 const props = defineProps({
@@ -32,14 +32,14 @@ const filteredVersions = computed(() => {
 })

 const modpackVersionModal = ref(null)
-const installedVersion = computed(() => props.instance?.link?.version_id)
+const installedVersion = computed(() => props.instance?.linked_data?.version_id)
 const installing = computed(() => props.instance.install_stage !== 'installed')
 const inProgress = ref(false)

 const switchVersion = async (versionId) => {
 	modpackVersionModal.value.hide()
 	inProgress.value = true
-	await update_managed_modrinth_version(props.instance.id, versionId)
+	await update_managed_modrinth_version(props.instance.path, versionId)
 	inProgress.value = false
 	emit('finish-install')
 }
@@ -59,7 +59,7 @@ const onHide = () => {
 		:on-hide="onHide"
 	>
 		<div class="modal-body">
-			<div v-if="instance.link" class="mod-card">
+			<div v-if="instance.linked_data" class="mod-card">
 				<div class="table">
 					<div class="table-row with-columns table-head">
 						<div class="table-cell table-text download-cell" />
@@ -6,16 +6,16 @@ import dayjs from 'dayjs'
 import { onUnmounted, ref } from 'vue'

 import NavButton from '@/components/ui/NavButton.vue'
-import { instance_listener } from '@/helpers/events.js'
-import { list } from '@/helpers/instance'
+import { profile_listener } from '@/helpers/events.js'
+import { list } from '@/helpers/profile'

 const { handleError } = injectNotificationManager()

 const recentInstances = ref([])
 const getInstances = async () => {
-	const instances = await list().catch(handleError)
+	const profiles = await list().catch(handleError)

-	recentInstances.value = instances
+	recentInstances.value = profiles
 		.sort((a, b) => {
 			const dateACreated = dayjs(a.created)
 			const dateAPlayed = a.last_played ? dayjs(a.last_played) : dayjs(0)
@@ -37,24 +37,24 @@ const getInstances = async () => {

 await getInstances()

-const unlistenInstance = await instance_listener(async (event) => {
+const unlistenProfile = await profile_listener(async (event) => {
 	if (event.event !== 'synced') {
 		await getInstances()
 	}
 })

 onUnmounted(() => {
-	unlistenInstance()
+	unlistenProfile()
 })
 </script>

 <template>
 	<div v-for="instance in recentInstances" :key="instance.id" v-tooltip.right="instance.name">
-		<NavButton :to="`/instance/${encodeURIComponent(instance.id)}`" class="relative">
+		<NavButton :to="`/instance/${encodeURIComponent(instance.path)}`" class="relative">
 			<Avatar
 				:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
 				size="28px"
-				:tint-by="instance.id"
+				:tint-by="instance.path"
 				:class="`transition-all ${instance.install_stage !== 'installed' ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
 			/>
 			<div
@@ -65,7 +65,10 @@ onUnmounted(() => {
 			</div>
 		</NavButton>
 	</div>
-	<div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-divider"></div>
+	<div
+		v-if="instances && recentInstances.length > 0"
+		class="h-px w-6 mx-auto my-2 bg-divider"
+	></div>
 </template>

 <style scoped lang="scss"></style>
@@ -1,124 +0,0 @@
-<template>
-	<ButtonStyled color="brand" type="outlined" hover-color-fill="background">
-		<button
-			v-if="showUpdatePill"
-			type="button"
-			class="!h-[34px] text-sm !transition-[opacity,transform,background-color,color,filter] !duration-200 ease-out"
-			:class="{
-				'opacity-0 scale-[0.96]': finishedDownloading && !animateReadyPill,
-				'opacity-100 scale-100': finishedDownloading && animateReadyPill,
-			}"
-			:disabled="isUpdateDownloading"
-			:aria-busy="isUpdateDownloading"
-			@click="handleUpdateClick"
-		>
-			<RefreshCwIcon v-if="finishedDownloading" :class="{ 'animate-spin': restarting }" />
-			<DownloadIcon v-else />
-			<span v-if="isUpdateDownloading">
-				{{ formatMessage(messages.downloadingUpdate) }}
-				<span class="inline-block w-[3ch] text-right tabular-nums">{{ downloadPercent }}%</span>
-			</span>
-			<span v-else>{{ updateLabel }}</span>
-		</button>
-	</ButtonStyled>
-</template>
-
-<script setup lang="ts">
-import { DownloadIcon, RefreshCwIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
-import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
-
-import {
-	appUpdateState,
-	downloadAvailableAppUpdate,
-	installAvailableAppUpdate,
-} from '@/providers/app-update'
-
-const { formatMessage } = useVIntl()
-
-const messages = defineMessages({
-	update: {
-		id: 'app.action-bar.update',
-		defaultMessage: 'Update',
-	},
-	downloadingUpdate: {
-		id: 'app.action-bar.downloading-update',
-		defaultMessage: 'Downloading update',
-	},
-	reloadToUpdate: {
-		id: 'app.action-bar.reload-to-update',
-		defaultMessage: 'Reload to update',
-	},
-})
-
-const {
-	downloading,
-	downloadPercent,
-	downloadProgress,
-	finishedDownloading,
-	isVisible: isUpdateVisible,
-	metered,
-	restarting,
-} = appUpdateState
-
-const isUpdateDownloading = computed(
-	() =>
-		downloading.value ||
-		(downloadProgress.value > 0 && downloadProgress.value < 1 && !finishedDownloading.value),
-)
-const showUpdatePill = computed(
-	() => isUpdateVisible.value && (finishedDownloading.value || metered.value),
-)
-const animateReadyPill = ref(false)
-const updateLabel = computed(() => {
-	if (isUpdateDownloading.value) {
-		return formatMessage(messages.downloadingUpdate)
-	}
-
-	if (finishedDownloading.value) {
-		return formatMessage(messages.reloadToUpdate)
-	}
-
-	return formatMessage(messages.update)
-})
-let readyPillAnimationFrame: number | null = null
-watch([showUpdatePill, finishedDownloading], async ([show, ready], [wasShown, wasReady]) => {
-	if (readyPillAnimationFrame !== null) {
-		cancelAnimationFrame(readyPillAnimationFrame)
-		readyPillAnimationFrame = null
-	}
-
-	if (!show || !ready) {
-		animateReadyPill.value = false
-		return
-	}
-
-	if (wasShown && wasReady) {
-		return
-	}
-
-	animateReadyPill.value = false
-	await nextTick()
-	readyPillAnimationFrame = requestAnimationFrame(() => {
-		animateReadyPill.value = true
-		readyPillAnimationFrame = null
-	})
-})
-async function handleUpdateClick() {
-	if (isUpdateDownloading.value) {
-		return
-	}
-
-	if (finishedDownloading.value) {
-		await installAvailableAppUpdate()
-	} else {
-		await downloadAvailableAppUpdate()
-	}
-}
-
-onBeforeUnmount(() => {
-	if (readyPillAnimationFrame !== null) {
-		cancelAnimationFrame(readyPillAnimationFrame)
-	}
-})
-</script>
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { MailIcon, SearchIcon, SendIcon, UserIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
+import { MailIcon, SendIcon, UserIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
 import {
 	Avatar,
 	ButtonStyled,
@@ -10,12 +10,18 @@ import {
 	useRelativeTime,
 	useVIntl,
 } from '@modrinth/ui'
-import { computed, ref } from 'vue'
+import { computed, onUnmounted, ref, watch } from 'vue'

 import FriendsSection from '@/components/ui/friends/FriendsSection.vue'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { useFriends } from '@/composables/use-friends'
-import type { FriendWithUserData } from '@/helpers/friends.ts'
+import { friend_listener } from '@/helpers/events'
+import {
+	add_friend,
+	friends,
+	type FriendWithUserData,
+	remove_friend,
+	transformFriends,
+} from '@/helpers/friends.ts'
 import type { ModrinthCredentials } from '@/helpers/mr_auth'

 const { formatMessage } = useVIntl()
@@ -29,23 +35,36 @@ const props = defineProps<{
 }>()

 const userCredentials = computed(() => props.credentials)
-const {
-	friends: userFriends,
-	loading,
-	requestFriend,
-	acceptFriend,
-	removeFriend: removeFriendRecord,
-} = useFriends({
-	currentUserId: () => userCredentials.value?.user_id,
-	getCredentials: () => userCredentials.value,
-	onError: handleError,
-})

 const search = ref('')
 const friendInvitesModal = ref()
+
 const username = ref('')
 const addFriendModal = ref()
+async function addFriendFromModal() {
+	addFriendModal.value.hide()
+	await add_friend(username.value).catch(handleError)
+	username.value = ''
+	await loadFriends()
+}

+async function addFriend(friend: FriendWithUserData) {
+	const id = friend.id === userCredentials.value?.user_id ? friend.friend_id : friend.id
+	if (id) {
+		await add_friend(id).catch(handleError)
+		await loadFriends()
+	}
+}
+
+async function removeFriend(friend: FriendWithUserData) {
+	const id = friend.id === userCredentials.value?.user_id ? friend.friend_id : friend.id
+	if (id) {
+		await remove_friend(id).catch(handleError)
+		await loadFriends()
+	}
+}
+
+const userFriends = ref<FriendWithUserData[]>([])
 const sortedFriends = computed<FriendWithUserData[]>(() =>
 	userFriends.value.slice().sort((a, b) => {
 		if (a.last_updated === null && b.last_updated === null) {
@@ -89,22 +108,42 @@ const incomingRequests = computed(() =>
 		.sort((a, b) => b.created.diff(a.created)),
 )

-function addFriendFromModal() {
-	const target = username.value.trim()
-	if (!target) return
+const loading = ref(true)
+async function loadFriends(timeout = false) {
+	loading.value = timeout

-	addFriendModal.value.hide()
-	requestFriend({ id: target, username: target })
-	username.value = ''
+	try {
+		const friendsList = await friends()
+		userFriends.value = await transformFriends(friendsList, userCredentials.value)
+		loading.value = false
+	} catch (e) {
+		console.error('Error loading friends', e)
+		if (timeout) {
+			setTimeout(() => loadFriends(), 15 * 1000)
+		}
+	}
 }

-function addFriend(friend: FriendWithUserData) {
-	acceptFriend(friend)
-}
+watch(
+	userCredentials,
+	() => {
+		if (userCredentials.value === undefined) {
+			userFriends.value = []
+			loading.value = false
+		} else if (userCredentials.value === null) {
+			userFriends.value = []
+			loading.value = false
+		} else {
+			loadFriends(true)
+		}
+	},
+	{ immediate: true },
+)

-function removeFriend(friend: FriendWithUserData) {
-	removeFriendRecord(friend)
-}
+const unlisten = await friend_listener(() => loadFriends())
+onUnmounted(() => {
+	unlisten()
+})

 const messages = defineMessages({
 	addFriend: {
@@ -262,12 +301,11 @@ const messages = defineMessages({
 			</ButtonStyled>
 			<StyledInput
 				v-model="search"
-				:icon="SearchIcon"
 				type="text"
 				:placeholder="formatMessage(messages.searchFriends)"
 				clearable
-				input-class="!bg-transparent !border !border-solid !border-button-bg !text-primary !placeholder:text-primary"
-				wrapper-class="flex-1 [&>svg]:!text-primary [&>svg]:!opacity-100"
+				variant="outlined"
+				wrapper-class="flex-1"
 				@keyup.esc="search = ''"
 			/>
 		</template>
@@ -7,28 +7,26 @@ import {
 	injectNotificationManager,
 	StyledInput,
 } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { computed, ref } from 'vue'

 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { list } from '@/helpers/instance'
-import { add_server_to_instance, get_instance_worlds } from '@/helpers/worlds.ts'
+import { list } from '@/helpers/profile'
+import { add_server_to_profile, get_profile_worlds } from '@/helpers/worlds.ts'

 const { handleError } = injectNotificationManager()
-const queryClient = useQueryClient()

 const modal = ref()
 const searchFilter = ref('')
-const instances = ref([])
+const profiles = ref([])

 const serverName = ref('')
 const serverAddress = ref('')

-const shownInstances = computed(() =>
-	instances.value.filter((instance) => {
-		return instance.name.toLowerCase().includes(searchFilter.value.toLowerCase())
+const shownProfiles = computed(() =>
+	profiles.value.filter((profile) => {
+		return profile.name.toLowerCase().includes(searchFilter.value.toLowerCase())
 	}),
 )

@@ -38,15 +36,15 @@ defineExpose({
 		serverAddress.value = address
 		searchFilter.value = ''

-		const instanceValues = await list().catch(handleError)
+		const profilesVal = await list().catch(handleError)
 		await Promise.allSettled(
-			instanceValues.map(async (instance) => {
-				instance.adding = false
-				instance.added = false
+			profilesVal.map(async (profile) => {
+				profile.adding = false
+				profile.added = false

 				try {
-					const worlds = await get_instance_worlds(instance.id)
-					instance.added = worlds.some(
+					const worlds = await get_profile_worlds(profile.path)
+					profile.added = worlds.some(
 						(w) => w.type === 'server' && w.address === serverAddress.value,
 					)
 				} catch {
@@ -55,29 +53,28 @@ defineExpose({
 			}),
 		)

-		instances.value = instanceValues
+		profiles.value = profilesVal
 		modal.value.show()

 		trackEvent('AddServerToInstanceStart', { source: 'AddServerToInstanceModal' })
 	},
 })

-async function addServer(instance) {
-	instance.adding = true
+async function addServer(profile) {
+	profile.adding = true
 	try {
-		await add_server_to_instance(instance.id, serverName.value, serverAddress.value, 'prompt')
-		instance.added = true
-		await queryClient.invalidateQueries({ queryKey: ['worlds', instance.id] })
+		await add_server_to_profile(profile.path, serverName.value, serverAddress.value, 'prompt')
+		profile.added = true

 		trackEvent('AddServerToInstance', {
 			server_name: serverName.value,
-			instance_name: instance.name,
+			instance_name: profile.name,
 			source: 'AddServerToInstanceModal',
 		})
 	} catch (err) {
 		handleError(err)
 	}
-	instance.adding = false
+	profile.adding = false
 }
 </script>

@@ -94,26 +91,26 @@ async function addServer(instance) {
 			/>
 			<div class="max-h-[21rem] overflow-y-auto">
 				<div
-					v-for="instance in shownInstances"
-					:key="instance.id"
+					v-for="profile in shownProfiles"
+					:key="profile.path"
 					class="flex w-full items-center justify-between gap-2 bg-bg-raised text-icon shadow-none"
 				>
 					<router-link
 						class="btn btn-transparent p-2 text-left"
-						:to="`/instance/${encodeURIComponent(instance.id)}`"
+						:to="`/instance/${encodeURIComponent(profile.path)}`"
 						@click="modal.hide()"
 					>
 						<Avatar
-							:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
+							:src="profile.icon_path ? convertFileSrc(profile.icon_path) : null"
 							class="mr-2 [--size:2rem]"
 						/>
-						{{ instance.name }}
+						{{ profile.name }}
 					</router-link>
 					<ButtonStyled>
-						<button :disabled="instance.added || instance.adding" @click="addServer(instance)">
-							<PlusIcon v-if="!instance.added && !instance.adding" />
-							<CheckIcon v-else-if="instance.added" />
-							{{ instance.adding ? 'Adding...' : instance.added ? 'Added' : 'Add' }}
+						<button :disabled="profile.added || profile.adding" @click="addServer(profile)">
+							<PlusIcon v-if="!profile.added && !profile.adding" />
+							<CheckIcon v-else-if="profile.added" />
+							{{ profile.adding ? 'Adding...' : profile.added ? 'Added' : 'Add' }}
 						</button>
 					</ButtonStyled>
 				</div>
@@ -1,41 +1,108 @@
 <template>
-	<UnknownFileWarningModal
-		ref="modal"
-		:mode="externalFilesInModpack.length > 0 ? 'modpack' : 'mod'"
-		:file-name="fileName"
-		:external-files-in-modpack="externalFilesInModpack"
-		@cancel="reset"
-		@continue="proceed"
-	/>
+	<NewModal ref="modal" :header="formatMessage(messages.header)" :on-hide="reset">
+		<div class="max-w-[31rem] flex flex-col gap-6">
+			<Admonition
+				type="warning"
+				:header="formatMessage(messages.warningTitle)"
+				:body="formatMessage(messages.warningBody)"
+			/>
+			<div v-if="fileName" class="overflow-x-auto whitespace-nowrap text-sm text-secondary">
+				{{ fileName }}
+			</div>
+			<div>
+				<p class="mt-0 leading-tight">
+					{{ formatMessage(messages.body) }}
+				</p>
+				<p class="text-orange font-semibold mb-0 leading-tight">
+					{{ formatMessage(messages.malwareStatement) }}
+				</p>
+			</div>
+			<Checkbox v-model="dontShowAgain" :label="formatMessage(messages.dontShowAgain)" />
+			<div class="flex gap-2 justify-end">
+				<ButtonStyled type="outlined">
+					<button @click="cancel">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled color="orange">
+					<button :disabled="isProceeding" @click="proceed">
+						<SpinnerIcon v-if="isProceeding" class="animate-spin" />
+						<CircleArrowRightIcon v-else />
+						{{ formatMessage(messages.installAnyway) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+	</NewModal>
 </template>

 <script setup lang="ts">
-import { UnknownFileWarningModal } from '@modrinth/ui'
+import { CircleArrowRightIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
+import {
+	Admonition,
+	ButtonStyled,
+	Checkbox,
+	commonMessages,
+	defineMessages,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
 import { ref, useTemplateRef } from 'vue'

 import { get as getSettings, set as setSettings } from '@/helpers/settings'
 import { useTheming } from '@/store/state'
 import type { FeatureFlag } from '@/store/theme.ts'

+const { formatMessage } = useVIntl()
 const themeStore = useTheming()
 const skipUnknownPackWarningFeatureFlag = 'skip_unknown_pack_warning' as FeatureFlag

+const dontShowAgain = ref(false)
 const modal = useTemplateRef('modal')
 const onProceed = ref<() => Promise<void>>()
+const isProceeding = ref(false)
 const fileName = ref('')
-const externalFilesInModpack = ref<string[]>([])

-function show(
-	createInstance: () => Promise<void>,
-	selectedFileName = '',
-	selectedExternalFiles: string[] = [],
-) {
+const messages = defineMessages({
+	header: {
+		id: 'unknown-pack-warning-modal.header',
+		defaultMessage: 'Confirm installation',
+	},
+	warningTitle: {
+		id: 'unknown-pack-warning-modal.warning.title',
+		defaultMessage: 'Unknown file warning',
+	},
+	warningBody: {
+		id: 'unknown-pack-warning-modal.warning.body',
+		defaultMessage: `We couldn't find this file on Modrinth. We strongly recommend only installing files from sources you trust.`,
+	},
+	body: {
+		id: 'unknown-pack-warning-modal.body',
+		defaultMessage: `A file is only reviewed if it’s uploaded to Modrinth, regardless of its file format (including .mrpack).`,
+	},
+	malwareStatement: {
+		id: 'unknown-pack-warning-modal.malware-statement',
+		defaultMessage: `Malware is often distributed through modpack files by sharing them on platforms like Discord.`,
+	},
+	dontShowAgain: {
+		id: 'unknown-pack-warning-modal.dont-show-again',
+		defaultMessage: `Don't show this warning again`,
+	},
+	installAnyway: {
+		id: 'unknown-pack-warning-modal.install-anyway',
+		defaultMessage: `Install anyway`,
+	},
+})
+
+function show(createInstance: () => Promise<void>, selectedFileName = '') {
 	onProceed.value = createInstance
 	fileName.value = selectedFileName
-	externalFilesInModpack.value = selectedExternalFiles
+	dontShowAgain.value = false

 	if (themeStore.getFeatureFlag(skipUnknownPackWarningFeatureFlag)) {
-		void createInstance()
+		// noinspection ES6MissingAwait
+		createInstance()
 		return
 	}

@@ -45,11 +112,18 @@ function show(
 function reset() {
 	onProceed.value = undefined
 	fileName.value = ''
-	externalFilesInModpack.value = []
 }

-async function proceed(dontShowAgain: boolean) {
-	if (dontShowAgain) {
+function cancel() {
+	modal.value?.hide()
+}
+
+async function proceed() {
+	if (!onProceed.value) {
+		return
+	}
+
+	if (dontShowAgain.value) {
 		themeStore.featureFlags[skipUnknownPackWarningFeatureFlag] = true
 		const settings = await getSettings()
 		settings.feature_flags[skipUnknownPackWarningFeatureFlag] = true
@@ -57,8 +131,9 @@ async function proceed(dontShowAgain: boolean) {
 	}

 	const createInstance = onProceed.value
-	reset()
-	if (createInstance) void createInstance()
+	modal.value?.hide()
+	// noinspection ES6MissingAwait
+	createInstance()
 }

 defineExpose({ show })
@@ -1,408 +0,0 @@
-<template>
-	<PageHeader :title="instance.name">
-		<template #leading>
-			<Avatar :src="iconSrc" :alt="instance.name" size="64px" :tint-by="instance.id" />
-		</template>
-
-		<template v-if="instance.shared_instance || instance.quarantined" #badges>
-			<PageHeaderBadgeItem
-				v-if="instance.quarantined"
-				:icon="LockIcon"
-				aria-label="Locked instance information"
-				class="!border-orange !bg-highlight-orange !text-orange"
-			>
-				Locked
-			</PageHeaderBadgeItem>
-			<PageHeaderBadgeItem
-				v-else
-				:icon="UnknownIcon"
-				:tooltip="sharedInstanceTooltip"
-				aria-label="Shared instance information"
-				class="!border-blue !bg-highlight-blue !text-blue"
-			>
-				Shared
-			</PageHeaderBadgeItem>
-		</template>
-
-		<template #metadata>
-			<div v-if="isServerInstance" class="flex flex-wrap items-center gap-2">
-				<InstanceHeaderServerMetadata
-					:loading-server-ping="loadingServerPing"
-					:players-online="playersOnline"
-					:status-online="statusOnline"
-					:recent-plays="recentPlays"
-					:ping="ping"
-					:minecraft-server="minecraftServer"
-					:linked-project-v3="linkedProjectV3"
-					:instance-id="instance.id"
-				/>
-				<PageHeaderMetadataItem v-if="sharedInstanceManager" :action="sharedInstanceManagerAction">
-					{{ sharedInstanceManagerLabel }}
-					<Avatar
-						:src="sharedInstanceManager.avatarUrl"
-						:alt="sharedInstanceManager.name"
-						:tint-by="sharedInstanceManager.tintBy"
-						size="24px"
-						:circle="sharedInstanceManager.type === 'user'"
-						no-shadow
-					/>
-					<span class="min-w-0 truncate">{{ sharedInstanceManager.name }}</span>
-				</PageHeaderMetadataItem>
-			</div>
-			<PageHeaderMetadata v-else>
-				<PageHeaderMetadataItem :icon="Gamepad2Icon" tooltip="Minecraft version">
-					Minecraft {{ instance.game_version }}
-				</PageHeaderMetadataItem>
-				<PageHeaderMetadataItem
-					v-if="sharedInstanceManager?.type !== 'user'"
-					:icon="ServerLoaderIcon"
-					:icon-props="{ loader: loaderDisplayName }"
-					tooltip="Mod loader"
-				>
-					{{ loaderLabel }}
-				</PageHeaderMetadataItem>
-				<PageHeaderMetadataItem
-					v-if="showInstancePlayTime"
-					:icon="TimerIcon"
-					tooltip="Total playtime"
-				>
-					{{ playtimeLabel }}
-				</PageHeaderMetadataItem>
-				<PageHeaderMetadataItem v-if="sharedInstanceManager" :action="sharedInstanceManagerAction">
-					{{ sharedInstanceManagerLabel }}
-					<Avatar
-						:src="sharedInstanceManager.avatarUrl"
-						:alt="sharedInstanceManager.name"
-						:tint-by="sharedInstanceManager.tintBy"
-						size="24px"
-						:circle="sharedInstanceManager.type === 'user'"
-						no-shadow
-					/>
-					<span class="min-w-0 truncate">{{ sharedInstanceManager.name }}</span>
-				</PageHeaderMetadataItem>
-			</PageHeaderMetadata>
-		</template>
-
-		<template #actions>
-			<PageHeaderActions>
-				<ButtonStyled v-if="isInstalling" color="brand" size="large">
-					<button type="button" disabled>
-						{{ formatMessage(commonMessages.installingLabel) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="playing" color="red" size="large">
-					<button type="button" :disabled="stopping" @click="emit('stop')">
-						<StopCircleIcon />
-						{{
-							stopping ? formatMessage(messages.stopping) : formatMessage(commonMessages.stopButton)
-						}}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="instance.quarantined" color="brand" size="large">
-					<button v-tooltip="formatMessage(messages.lockedPlayTooltip)" type="button" disabled>
-						<PlayIcon />
-						{{ formatMessage(commonMessages.playButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="instance.install_stage !== 'installed'" color="brand" size="large">
-					<button type="button" @click="emit('repair')">
-						<DownloadIcon />
-						{{ formatMessage(messages.repair) }}
-					</button>
-				</ButtonStyled>
-				<JoinedButtons
-					v-else-if="!loading && isServerInstance"
-					:actions="serverPlayActions"
-					color="brand"
-					size="large"
-				/>
-				<ButtonStyled v-else-if="!loading" color="brand" size="large">
-					<button type="button" @click="emit('play')">
-						<PlayIcon />
-						{{ formatMessage(commonMessages.playButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else color="brand" size="large">
-					<button type="button" disabled>{{ formatMessage(messages.starting) }}</button>
-				</ButtonStyled>
-
-				<ButtonStyled circular size="large">
-					<button
-						v-tooltip="formatMessage(messages.instanceSettings)"
-						type="button"
-						:aria-label="formatMessage(messages.instanceSettings)"
-						@click="emit('settings')"
-					>
-						<SettingsIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular size="large" type="transparent">
-					<TeleportOverflowMenu
-						:options="moreActions"
-						:tooltip="formatMessage(messages.moreActions)"
-						:aria-label="formatMessage(messages.moreActions)"
-					>
-						<MoreVerticalIcon />
-					</TeleportOverflowMenu>
-				</ButtonStyled>
-			</PageHeaderActions>
-		</template>
-	</PageHeader>
-</template>
-
-<script setup lang="ts">
-import type { Labrinth } from '@modrinth/api-client'
-import {
-	DownloadIcon,
-	ExternalIcon,
-	FolderOpenIcon,
-	LockIcon,
-	MoreVerticalIcon,
-	PackageIcon,
-	PlayIcon,
-	ReportIcon,
-	SettingsIcon,
-	StopCircleIcon,
-	TagCategoryGamepad2Icon as Gamepad2Icon,
-	TimerIcon,
-	UnknownIcon,
-} from '@modrinth/assets'
-import {
-	Avatar,
-	ButtonStyled,
-	commonMessages,
-	defineMessages,
-	formatLoaderLabel,
-	type JoinedButtonAction,
-	JoinedButtons,
-	LoaderIcon as ServerLoaderIcon,
-	PageHeader,
-	PageHeaderActions,
-	PageHeaderBadgeItem,
-	PageHeaderMetadata,
-	PageHeaderMetadataItem,
-	type ServerLoader,
-	TeleportOverflowMenu,
-	type TeleportOverflowMenuItem,
-	useVIntl,
-} from '@modrinth/ui'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { computed } from 'vue'
-
-import type { GameInstance } from '@/helpers/types'
-
-import InstanceHeaderServerMetadata from './instance-page-header-server-metadata.vue'
-
-const messages = defineMessages({
-	createShortcut: {
-		id: 'instance.action.create-shortcut',
-		defaultMessage: 'Create shortcut',
-	},
-	exportModpack: {
-		id: 'instance.action.export-modpack',
-		defaultMessage: 'Export modpack',
-	},
-	instanceSettings: {
-		id: 'instance.action.settings',
-		defaultMessage: 'Instance settings',
-	},
-	launchInstance: {
-		id: 'instance.action.launch-instance',
-		defaultMessage: 'Launch instance',
-	},
-	moreActions: {
-		id: 'instance.action.more-actions',
-		defaultMessage: 'More actions',
-	},
-	neverPlayed: {
-		id: 'instance.playtime.never-played',
-		defaultMessage: 'Never played',
-	},
-	openFolder: {
-		id: 'instance.action.open-folder',
-		defaultMessage: 'Open folder',
-	},
-	repair: {
-		id: 'instance.action.repair',
-		defaultMessage: 'Repair',
-	},
-	lockedPlayTooltip: {
-		id: 'instance.locked.play-tooltip',
-		defaultMessage: 'This instance has been locked',
-	},
-	starting: {
-		id: 'instance.action.starting',
-		defaultMessage: 'Starting...',
-	},
-	stopping: {
-		id: 'instance.action.stopping',
-		defaultMessage: 'Stopping...',
-	},
-	sharedInstanceTooltip: {
-		id: 'instance.shared-instance.tooltip',
-		defaultMessage: "This instance's content is being managed by someone else.",
-	},
-	sharedInstanceOwnerTooltip: {
-		id: 'instance.shared-instance.owner-tooltip',
-		defaultMessage: "This instance's content is being shared to other users.",
-	},
-})
-
-const props = withDefaults(
-	defineProps<{
-		instance: GameInstance
-		iconSrc?: string | null
-		isServerInstance?: boolean
-		showInstancePlayTime?: boolean
-		timePlayed?: number
-		playing?: boolean
-		loading?: boolean
-		stopping?: boolean
-		loadingServerPing?: boolean
-		playersOnline?: number
-		statusOnline?: boolean
-		recentPlays?: number
-		ping?: number
-		minecraftServer?: Labrinth.Projects.v3.Project['minecraft_server']
-		linkedProjectV3?: Labrinth.Projects.v3.Project
-		sharedInstanceManager?: {
-			type: 'user' | 'server'
-			name: string
-			avatarUrl?: string
-			tintBy: string
-		} | null
-	}>(),
-	{
-		iconSrc: null,
-		isServerInstance: false,
-		showInstancePlayTime: false,
-		timePlayed: 0,
-		playing: false,
-		loading: false,
-		stopping: false,
-		loadingServerPing: false,
-		playersOnline: undefined,
-		statusOnline: false,
-		recentPlays: undefined,
-		ping: undefined,
-		minecraftServer: undefined,
-		linkedProjectV3: undefined,
-		sharedInstanceManager: null,
-	},
-)
-
-const emit = defineEmits<{
-	repair: []
-	stop: []
-	play: []
-	playServer: []
-	settings: []
-	openFolder: []
-	export: []
-	createShortcut: []
-	report: [event?: MouseEvent]
-}>()
-
-const installingStages = [
-	'installing',
-	'pack_installing',
-	'pack_installed',
-	'not_installed',
-	'minecraft_installing',
-]
-
-const { formatMessage } = useVIntl()
-
-const isInstalling = computed(() => installingStages.includes(props.instance.install_stage))
-const loaderDisplayName = computed(() => formatLoaderLabel(props.instance.loader) as ServerLoader)
-const loaderLabel = computed(() =>
-	[loaderDisplayName.value, props.instance.loader_version].filter(Boolean).join(' '),
-)
-const sharedInstanceTooltip = computed(() =>
-	formatMessage(
-		props.instance.shared_instance?.role === 'owner'
-			? messages.sharedInstanceOwnerTooltip
-			: messages.sharedInstanceTooltip,
-	),
-)
-const sharedInstanceManagerLabel = computed(() =>
-	props.sharedInstanceManager?.type === 'server' ? 'Linked to' : 'Managed by',
-)
-const sharedInstanceManagerAction = computed(() => {
-	const manager = props.sharedInstanceManager
-	if (manager?.type !== 'user') return undefined
-	return () => openUrl(`https://modrinth.com/user/${encodeURIComponent(manager.name)}`)
-})
-const playtimeLabel = computed(() => {
-	if (props.timePlayed <= 0) return formatMessage(messages.neverPlayed)
-
-	const hours = Math.floor(props.timePlayed / 3600)
-	if (hours >= 1) {
-		return `${hours} hour${hours > 1 ? 's' : ''}`
-	}
-
-	const minutes = Math.floor(props.timePlayed / 60)
-	if (minutes >= 1) {
-		return `${minutes} minute${minutes > 1 ? 's' : ''}`
-	}
-
-	const seconds = Math.floor(props.timePlayed)
-	return `${seconds} second${seconds > 1 ? 's' : ''}`
-})
-const serverPlayActions = computed<JoinedButtonAction[]>(() => [
-	{
-		id: 'join_server',
-		label: formatMessage(commonMessages.playButton),
-		icon: PlayIcon,
-		action: () => emit('playServer'),
-	},
-	{
-		id: 'launch_instance',
-		label: formatMessage(messages.launchInstance),
-		icon: PlayIcon,
-		action: () => emit('play'),
-	},
-])
-const moreActions = computed<TeleportOverflowMenuItem[]>(() => {
-	const actions: TeleportOverflowMenuItem[] = [
-		{
-			id: 'open-folder',
-			label: formatMessage(messages.openFolder),
-			icon: FolderOpenIcon,
-			action: () => emit('openFolder'),
-		},
-	]
-
-	if (!props.instance.quarantined) {
-		actions.push(
-			{
-				id: 'export-mrpack',
-				label: formatMessage(messages.exportModpack),
-				icon: PackageIcon,
-				action: () => emit('export'),
-			},
-			{
-				id: 'create-shortcut',
-				label: formatMessage(messages.createShortcut),
-				icon: ExternalIcon,
-				action: () => emit('createShortcut'),
-			},
-		)
-	}
-
-	if (props.instance.shared_instance?.role === 'member') {
-		actions.push(
-			{ divider: true },
-			{
-				id: 'report-shared-instance',
-				label: formatMessage(commonMessages.reportButton),
-				icon: ReportIcon,
-				color: 'red',
-				action: (event) => emit('report', event),
-			},
-		)
-	}
-
-	return actions
-})
-</script>
@@ -1,63 +0,0 @@
-<template>
-	<div class="flex items-center flex-wrap gap-2">
-		<template v-if="loadingServerPing">
-			<ServerOnlinePlayers
-				v-if="playersOnline !== undefined"
-				:online="playersOnline"
-				:status-online="statusOnline"
-				hide-label
-			/>
-			<ServerRecentPlays :recent-plays="recentPlays ?? 0" hide-label />
-			<div
-				v-if="
-					(playersOnline !== undefined || recentPlays !== undefined) &&
-					(minecraftServer?.region || ping)
-				"
-				class="w-1.5 h-1.5 rounded-full bg-surface-5"
-			></div>
-			<ServerPing v-if="ping" :ping="ping" />
-		</template>
-
-		<ServerRegion v-if="minecraftServer?.region" :region="minecraftServer?.region" />
-
-		<div v-if="minecraftServer?.region || ping" class="w-1.5 h-1.5 rounded-full bg-surface-5"></div>
-
-		<div v-if="linkedProjectV3" class="flex gap-1.5 items-center font-medium text-primary">
-			Linked to
-			<Avatar
-				:src="linkedProjectV3.icon_url"
-				:alt="linkedProjectV3.name"
-				:tint-by="instanceId"
-				size="24px"
-			/>
-			<router-link
-				:to="`/project/${linkedProjectV3.slug ?? linkedProjectV3.id}`"
-				class="hover:underline text-primary truncate"
-			>
-				{{ linkedProjectV3.name }}
-			</router-link>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import type { Labrinth } from '@modrinth/api-client'
-import {
-	Avatar,
-	ServerOnlinePlayers,
-	ServerPing,
-	ServerRecentPlays,
-	ServerRegion,
-} from '@modrinth/ui'
-
-defineProps<{
-	loadingServerPing?: boolean
-	playersOnline?: number
-	statusOnline?: boolean
-	recentPlays?: number
-	ping?: number
-	minecraftServer?: Labrinth.Projects.v3.Project['minecraft_server']
-	linkedProjectV3?: Labrinth.Projects.v3.Project
-	instanceId?: string
-}>()
-</script>
@@ -1,116 +0,0 @@
-<template>
-	<StackedAdmonitions v-bind="$attrs" :items="stackItems" class="w-full">
-		<template #item="{ item, dismissible }">
-			<InstanceAdmonitionsSharedInstanceStale
-				v-if="item.kind === 'shared-instance-stale'"
-				:instance="instance"
-				@published="emit('published')"
-			/>
-			<InstanceAdmonitionsSharedInstanceWrongAccount
-				v-else-if="item.kind === 'shared-instance-wrong-account'"
-				:expected-user-id="sharedInstanceExpectedUserId"
-				:role="sharedInstanceRole"
-				:signed-out="sharedInstanceSignedOut"
-			/>
-			<InstanceAdmonitionsSharedInstanceUnavailable
-				v-else-if="item.kind === 'shared-instance-unavailable'"
-				:reason="displayedSharedInstanceUnavailableReason"
-				:manager="sharedInstanceUnavailableManager"
-				:dismissible="dismissible"
-				@dismiss="sharedInstanceUnavailableDismissed = true"
-				@delete="emit('delete')"
-			/>
-		</template>
-	</StackedAdmonitions>
-</template>
-
-<script setup lang="ts">
-import { StackedAdmonitions } from '@modrinth/ui'
-import { computed, ref, watch } from 'vue'
-
-import type { SharedInstanceUnavailableReason } from '@/helpers/install'
-import type { GameInstance } from '@/helpers/types'
-
-import InstanceAdmonitionsSharedInstanceStale from './instance-admonitions-shared-instance-stale.vue'
-import InstanceAdmonitionsSharedInstanceUnavailable from './instance-admonitions-shared-instance-unavailable.vue'
-import InstanceAdmonitionsSharedInstanceWrongAccount from './instance-admonitions-shared-instance-wrong-account.vue'
-import type { InstanceAdmonitionItem, SharedInstanceRole } from './types'
-
-defineOptions({
-	inheritAttrs: false,
-})
-
-const props = defineProps<{
-	instance: GameInstance
-	sharedInstanceUnavailableReason?: SharedInstanceUnavailableReason | null
-	sharedInstanceUnavailableManager?: string | null
-	sharedInstanceWrongAccount?: boolean
-	sharedInstanceExpectedUserId?: string | null
-	sharedInstanceRole?: SharedInstanceRole | null
-	sharedInstanceSignedOut?: boolean
-}>()
-
-const emit = defineEmits<{
-	published: []
-	delete: []
-}>()
-
-const sharedInstanceWrongAccount = computed(() => props.sharedInstanceWrongAccount ?? false)
-const displayedSharedInstanceUnavailableReason = computed<SharedInstanceUnavailableReason | null>(
-	() =>
-		props.instance.quarantined ? 'quarantined' : (props.sharedInstanceUnavailableReason ?? null),
-)
-const sharedInstanceUnavailableDismissed = ref(false)
-const showSharedInstancePublishAdmonition = computed(
-	() =>
-		!sharedInstanceWrongAccount.value &&
-		props.instance.install_stage === 'installed' &&
-		props.instance.shared_instance?.role === 'owner' &&
-		props.instance.shared_instance.status === 'stale',
-)
-
-const stackItems = computed<InstanceAdmonitionItem[]>(() => {
-	const items: InstanceAdmonitionItem[] = []
-
-	if (sharedInstanceWrongAccount.value) {
-		items.push({
-			id: 'shared-instance-wrong-account',
-			type: 'warning',
-			dismissible: false,
-			kind: 'shared-instance-wrong-account',
-		})
-	}
-
-	const unavailableReason = displayedSharedInstanceUnavailableReason.value
-	const sharedInstanceQuarantined = unavailableReason === 'quarantined'
-	if (
-		unavailableReason &&
-		(sharedInstanceQuarantined || !sharedInstanceUnavailableDismissed.value)
-	) {
-		items.push({
-			id: 'shared-instance-unavailable',
-			type: 'warning',
-			dismissible: !sharedInstanceQuarantined,
-			kind: 'shared-instance-unavailable',
-		})
-	}
-
-	if (showSharedInstancePublishAdmonition.value) {
-		items.push({
-			id: 'shared-instance-stale',
-			type: 'warning',
-			dismissible: false,
-			kind: 'shared-instance-stale',
-		})
-	}
-
-	return items
-})
-
-watch(
-	() => [props.instance.id, displayedSharedInstanceUnavailableReason.value],
-	() => {
-		sharedInstanceUnavailableDismissed.value = false
-	},
-)
-</script>
@@ -1,69 +0,0 @@
-import { defineMessages } from '@modrinth/ui'
-
-export const instanceAdmonitionsMessages = defineMessages({
-	sharedInstanceChangesHeader: {
-		id: 'app.instance.admonitions.shared-instance.changes-header',
-		defaultMessage: "Your changes haven't been shared yet",
-	},
-	sharedInstanceChangesBody: {
-		id: 'app.instance.admonitions.shared-instance.changes-body',
-		defaultMessage: "Your local instance is ahead of the users you've shared it with.",
-	},
-	sharedInstancePublishButton: {
-		id: 'app.instance.admonitions.shared-instance.publish-button',
-		defaultMessage: 'Push update',
-	},
-	sharedInstancePublishingButton: {
-		id: 'app.instance.admonitions.shared-instance.publishing-button',
-		defaultMessage: 'Pushing...',
-	},
-	sharedInstanceReviewingButton: {
-		id: 'app.instance.admonitions.shared-instance.reviewing-button',
-		defaultMessage: 'Reviewing...',
-	},
-	sharedInstanceReviewHeader: {
-		id: 'app.instance.admonitions.shared-instance.review-header',
-		defaultMessage: 'Review changes',
-	},
-	sharedInstanceReviewAdmonitionHeader: {
-		id: 'app.instance.admonitions.shared-instance.review-admonition-header',
-		defaultMessage: 'Push update',
-	},
-	sharedInstanceReviewDescription: {
-		id: 'app.instance.admonitions.shared-instance.review-description',
-		defaultMessage:
-			'Review the content changes that will be shared with everyone using this instance.',
-	},
-	sharedInstanceAddedLabel: {
-		id: 'app.instance.admonitions.shared-instance.added-label',
-		defaultMessage: 'Added',
-	},
-	sharedInstanceRemovedLabel: {
-		id: 'app.instance.admonitions.shared-instance.removed-label',
-		defaultMessage: 'Removed',
-	},
-	sharedInstanceWrongAccountHeader: {
-		id: 'app.instance.shared-instance-wrong-account.warning-header',
-		defaultMessage: 'You are using the wrong Modrinth account',
-	},
-	sharedInstanceSignedOutHeader: {
-		id: 'app.instance.shared-instance-wrong-account.signed-out-header',
-		defaultMessage: 'You need to sign in to Modrinth',
-	},
-	sharedInstanceWrongAccountSignInAs: {
-		id: 'app.instance.shared-instance-wrong-account.sign-in-as-label',
-		defaultMessage: 'Sign in as',
-	},
-	sharedInstanceWrongAccountUserBody: {
-		id: 'app.instance.shared-instance-wrong-account.user-admonition-body-v2',
-		defaultMessage: 'to receive updates for this shared instance.',
-	},
-	sharedInstanceWrongAccountOwnerBody: {
-		id: 'app.instance.shared-instance-wrong-account.owner-admonition-body-v2',
-		defaultMessage: "to manage this shared instance. You won't be able to push updates to users.",
-	},
-	sharedInstanceWrongAccountFallbackUsername: {
-		id: 'app.instance.shared-instance-wrong-account.fallback-username',
-		defaultMessage: 'the linked account',
-	},
-})
@@ -1,66 +0,0 @@
-<template>
-	<Admonition
-		type="info"
-		inline-actions
-		:header="formatMessage(messages.sharedInstanceChangesHeader)"
-	>
-		{{ formatMessage(messages.sharedInstanceChangesBody) }}
-		<template #actions>
-			<ButtonStyled color="blue">
-				<button class="!h-10" :disabled="isPublishButtonDisabled" @click="reviewChanges">
-					<SpinnerIcon
-						v-if="isReviewingPublish || isPublishing"
-						class="animate-spin"
-						aria-hidden="true"
-					/>
-					<UploadIcon v-else aria-hidden="true" />
-					{{
-						isPublishing
-							? formatMessage(messages.sharedInstancePublishingButton)
-							: isReviewingPublish
-								? formatMessage(messages.sharedInstanceReviewingButton)
-								: formatMessage(messages.sharedInstancePublishButton)
-					}}
-				</button>
-			</ButtonStyled>
-		</template>
-	</Admonition>
-
-	<SharedInstancePublishModal
-		ref="publishModal"
-		:instance="instance"
-		@published="emit('published')"
-		@state-change="publishState = $event"
-	/>
-</template>
-
-<script setup lang="ts">
-import { SpinnerIcon, UploadIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, useVIntl } from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
-import SharedInstancePublishModal from '@/components/ui/shared-instances/SharedInstancePublishModal.vue'
-import type { GameInstance } from '@/helpers/types'
-
-import { instanceAdmonitionsMessages as messages } from './instance-admonitions-messages'
-
-defineProps<{
-	instance: GameInstance
-}>()
-
-const emit = defineEmits<{
-	published: []
-}>()
-
-const { formatMessage } = useVIntl()
-const publishModal = ref<InstanceType<typeof SharedInstancePublishModal>>()
-const publishState = ref<'idle' | 'reviewing' | 'publishing'>('idle')
-const isPublishing = computed(() => publishState.value === 'publishing')
-const isReviewingPublish = computed(() => publishState.value === 'reviewing')
-
-const isPublishButtonDisabled = computed(() => isPublishing.value || isReviewingPublish.value)
-
-function reviewChanges(e?: MouseEvent) {
-	publishModal.value?.show(e)
-}
-</script>
@@ -1,51 +0,0 @@
-<template>
-	<Admonition
-		type="warning"
-		:inline-actions="reason === 'quarantined'"
-		:header="formatMessage(sharedInstanceUnavailableTitleMessage(reason ?? null))"
-		:dismissible="dismissible"
-		@dismiss="emit('dismiss')"
-	>
-		{{ formatSharedInstanceUnavailable(reason ?? null, manager) }}
-		<template v-if="reason === 'quarantined'" #actions>
-			<ButtonStyled color="orange">
-				<button class="!h-10" @click="emit('delete')">
-					<TrashIcon aria-hidden="true" />
-					{{ formatMessage(messages.deleteInstance) }}
-				</button>
-			</ButtonStyled>
-		</template>
-	</Admonition>
-</template>
-
-<script setup lang="ts">
-import { TrashIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
-
-import type { SharedInstanceUnavailableReason } from '@/helpers/install'
-import {
-	sharedInstanceUnavailableTitleMessage,
-	useSharedInstanceErrors,
-} from '@/helpers/shared-instance-errors'
-
-defineProps<{
-	reason?: SharedInstanceUnavailableReason | null
-	manager?: string | null
-	dismissible?: boolean
-}>()
-
-const emit = defineEmits<{
-	dismiss: []
-	delete: []
-}>()
-
-const { formatMessage } = useVIntl()
-const { formatSharedInstanceUnavailable } = useSharedInstanceErrors()
-
-const messages = defineMessages({
-	deleteInstance: {
-		id: 'instance.locked.delete-button',
-		defaultMessage: 'Delete instance',
-	},
-})
-</script>
@@ -1,78 +0,0 @@
-<template>
-	<Admonition type="warning" :header="formatMessage(headerMessage)">
-		<span class="flex flex-wrap items-center gap-x-1.5 gap-y-1">
-			<span>{{ formatMessage(messages.sharedInstanceWrongAccountSignInAs) }}</span>
-			<span
-				v-if="sharedInstanceExpectedUser"
-				class="inline-flex max-w-full min-w-0 items-center gap-1.5 align-middle font-semibold text-contrast"
-			>
-				<Avatar
-					:src="sharedInstanceExpectedUser.avatarUrl"
-					:alt="sharedInstanceExpectedUsername"
-					:tint-by="sharedInstanceExpectedUser.tintBy"
-					size="20px"
-					circle
-					no-shadow
-				/>
-				<span class="min-w-0 truncate">{{ sharedInstanceExpectedUsername }}</span>
-			</span>
-			<span v-else class="font-semibold">{{ sharedInstanceExpectedUsername }}</span>
-			<span>{{ formatMessage(bodyMessage) }}</span>
-		</span>
-	</Admonition>
-</template>
-
-<script setup lang="ts">
-import { Admonition, Avatar, useVIntl } from '@modrinth/ui'
-import { useQuery } from '@tanstack/vue-query'
-import { computed } from 'vue'
-
-import { get_user } from '@/helpers/cache'
-
-import { instanceAdmonitionsMessages as messages } from './instance-admonitions-messages'
-import type { SharedInstanceRole } from './types'
-
-const props = defineProps<{
-	expectedUserId?: string | null
-	role?: SharedInstanceRole | null
-	signedOut?: boolean
-}>()
-
-const { formatMessage } = useVIntl()
-const expectedUserId = computed(() => props.expectedUserId ?? null)
-const expectedUserQuery = useQuery({
-	queryKey: computed(() => ['user', expectedUserId.value]),
-	queryFn: async () => {
-		if (!expectedUserId.value) return null
-
-		return await get_user(expectedUserId.value, 'bypass').catch(() => null)
-	},
-	enabled: () => !!expectedUserId.value,
-	staleTime: 30_000,
-})
-const sharedInstanceExpectedUser = computed(() => {
-	const user = expectedUserQuery.data.value
-	if (!user) return null
-
-	return {
-		username: user.username,
-		avatarUrl: user.avatar_url ?? undefined,
-		tintBy: user.id,
-	}
-})
-const sharedInstanceExpectedUsername = computed(
-	() =>
-		sharedInstanceExpectedUser.value?.username ||
-		formatMessage(messages.sharedInstanceWrongAccountFallbackUsername),
-)
-const headerMessage = computed(() =>
-	props.signedOut
-		? messages.sharedInstanceSignedOutHeader
-		: messages.sharedInstanceWrongAccountHeader,
-)
-const bodyMessage = computed(() =>
-	props.role === 'owner'
-		? messages.sharedInstanceWrongAccountOwnerBody
-		: messages.sharedInstanceWrongAccountUserBody,
-)
-</script>
@@ -1,12 +0,0 @@
-import type { StackedAdmonitionItem } from '@modrinth/ui'
-
-export type InstanceAdmonitionKind =
-	| 'shared-instance-stale'
-	| 'shared-instance-unavailable'
-	| 'shared-instance-wrong-account'
-
-export type InstanceAdmonitionItem = StackedAdmonitionItem & {
-	kind: InstanceAdmonitionKind
-}
-
-export type SharedInstanceRole = 'owner' | 'member'
@@ -19,8 +19,7 @@ import { useRouter } from 'vue-router'

 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { install_duplicate_instance } from '@/helpers/install'
-import { edit, edit_icon, list, remove } from '@/helpers/instance'
+import { duplicate, edit, edit_icon, list, remove } from '@/helpers/profile'
 import { injectInstanceSettings } from '@/providers/instance-settings'

 import type { GameInstance } from '../../../helpers/types'
@@ -33,14 +32,14 @@ const queryClient = useQueryClient()
 const deleteConfirmModal = ref()

 const { instance } = injectInstanceSettings()
-type ReleaseChannel = GameInstance['update_channel']
+type ReleaseChannel = GameInstance['preferred_update_channel']
 const releaseChannelOptions: ReleaseChannel[] = ['release', 'beta', 'alpha']

 const title = ref(instance.value.name)
 const icon: Ref<string | undefined> = ref(instance.value.icon_path)
 const groups = ref([...instance.value.groups])
 const savingReleaseChannel = ref(false)
-const selectedReleaseChannel = ref<ReleaseChannel>(instance.value.update_channel)
+const selectedReleaseChannel = ref<ReleaseChannel>(instance.value.preferred_update_channel)
 const releaseChannelDisabledItems = computed<ReleaseChannel[]>(() =>
 	savingReleaseChannel.value ? [...releaseChannelOptions] : [],
 )
@@ -49,8 +48,8 @@ const newCategoryInput = ref('')

 const installing = computed(() => instance.value.install_stage !== 'installed')

-async function duplicateInstance() {
-	await install_duplicate_instance(instance.value.id).catch(handleError)
+async function duplicateProfile() {
+	await duplicate(instance.value.path).catch(handleError)
 	trackEvent('InstanceDuplicate', {
 		loader: instance.value.loader,
 		game_version: instance.value.game_version,
@@ -85,22 +84,22 @@ function formatReleaseChannelDescription(channel: ReleaseChannel) {
 }

 watch(
-	() => [instance.value.id, instance.value.update_channel] as const,
+	() => [instance.value.path, instance.value.preferred_update_channel] as const,
 	() => {
 		if (!savingReleaseChannel.value) {
-			selectedReleaseChannel.value = instance.value.update_channel
+			selectedReleaseChannel.value = instance.value.preferred_update_channel
 		}
 	},
 )

 watch(selectedReleaseChannel, async (channel, previousChannel) => {
-	const previousReleaseChannel = previousChannel ?? instance.value.update_channel
-	if (channel === instance.value.update_channel) return
+	const previousReleaseChannel = previousChannel ?? instance.value.preferred_update_channel
+	if (channel === instance.value.preferred_update_channel) return

 	savingReleaseChannel.value = true
-	const instanceId = instance.value.id
-	await edit(instanceId, { update_channel: channel })
-		.then(() => queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instanceId] }))
+	const profilePath = instance.value.path
+	await edit(profilePath, { preferred_update_channel: channel })
+		.then(() => queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', profilePath] }))
 		.catch((error) => {
 			selectedReleaseChannel.value = previousReleaseChannel
 			handleError(error)
@@ -110,7 +109,7 @@ watch(selectedReleaseChannel, async (channel, previousChannel) => {

 async function resetIcon() {
 	icon.value = undefined
-	await edit_icon(instance.value.id, null).catch(handleError)
+	await edit_icon(instance.value.path, null).catch(handleError)
 	trackEvent('InstanceRemoveIcon')
 }

@@ -128,12 +127,12 @@ async function setIcon() {
 	if (!value) return

 	icon.value = value
-	await edit_icon(instance.value.id, icon.value).catch(handleError)
+	await edit_icon(instance.value.path, icon.value).catch(handleError)

 	trackEvent('InstanceSetIcon')
 }

-const editInstanceObject = computed(() => ({
+const editProfileObject = computed(() => ({
 	name: title.value.trim().substring(0, 32) ?? 'Instance',
 	groups: groups.value.map((x) => x.trim().substring(0, 32)).filter((x) => x.length > 0),
 }))
@@ -159,15 +158,15 @@ watch(
 	[title, groups, groups],
 	async () => {
 		if (removing.value) return
-		await edit(instance.value.id, editInstanceObject.value).catch(handleError)
+		await edit(instance.value.path, editProfileObject.value).catch(handleError)
 	},
 	{ deep: true },
 )

 const removing = ref(false)
-async function removeInstance() {
+async function removeProfile() {
 	removing.value = true
-	const path = instance.value.id
+	const path = instance.value.path

 	trackEvent('InstanceRemove', {
 		loader: instance.value.loader,
@@ -285,7 +284,7 @@ const messages = defineMessages({
 </script>

 <template>
-	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="removeInstance" />
+	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="removeProfile" />
 	<div class="block">
 		<div class="float-end ml-10 relative group w-fit">
 			<div class="flex flex-col gap-1">
@@ -311,7 +310,7 @@ const messages = defineMessages({
 							:src="icon ? convertFileSrc(icon) : icon"
 							size="108px"
 							class="transition-[filter] group-hover:brightness-75"
-							:tint-by="instance.id"
+							:tint-by="instance.path"
 							no-shadow
 						/>
 						<div
@@ -351,7 +350,7 @@ const messages = defineMessages({
 						aria-labelledby="duplicate-instance-label"
 						:disabled="installing"
 						class="w-max !shadow-none"
-						@click="duplicateInstance"
+						@click="duplicateProfile"
 					>
 						<CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
 					</button>
@@ -8,7 +8,7 @@ import {
 } from '@modrinth/ui'
 import { computed, ref, watch } from 'vue'

-import { edit } from '@/helpers/instance'
+import { edit } from '@/helpers/profile'
 import { get } from '@/helpers/settings.ts'
 import { injectInstanceSettings } from '@/providers/instance-settings'

@@ -28,21 +28,21 @@ const overrideHooks = ref(
 )
 const hooks = ref(instance.value.hooks ?? globalSettings.hooks)

-const editInstanceObject = computed(() => {
-	const editInstancePatch: {
+const editProfileObject = computed(() => {
+	const editProfile: {
 		hooks?: Hooks
 	} = {}

 	// When hooks are not overridden per-instance, we want to clear them
-	editInstancePatch.hooks = overrideHooks.value ? hooks.value : {}
+	editProfile.hooks = overrideHooks.value ? hooks.value : {}

-	return editInstancePatch
+	return editProfile
 })

 watch(
 	[overrideHooks, hooks],
 	async () => {
-		await edit(instance.value.id, editInstanceObject.value)
+		await edit(instance.value.path, editProfileObject.value)
 	},
 	{ deep: true },
 )
@@ -4,206 +4,146 @@ import {
 	commonMessages,
 	defineMessages,
 	formatLoaderLabel,
-	injectFilePicker,
 	injectNotificationManager,
 	InstallationSettingsLayout,
+	provideAppBackup,
 	provideInstallationSettings,
 	useDebugLogger,
 	useVIntl,
 } from '@modrinth/ui'
 import type { GameVersionTag, PlatformTag } from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
-import { computed, ref } from 'vue'
+import { computed, ref, shallowRef } from 'vue'

-import SharedInstanceInstallationSettingsControls from '@/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue'
-import { useManagedContentPolicy } from '@/composables/instances/use-managed-content-policy'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_version } from '@/helpers/cache'
+import { get_loader_versions } from '@/helpers/metadata'
 import {
-	install_existing_instance,
-	install_pack_to_existing_instance,
-	wait_for_install_job,
-} from '@/helpers/install'
-import {
+	duplicate,
 	edit,
 	get_linked_modpack_info,
-	unlink_shared_instance,
+	install,
+	list,
 	update_managed_modrinth_version,
 	update_repair_modrinth,
-} from '@/helpers/instance'
-import { get_loader_versions } from '@/helpers/metadata'
+} from '@/helpers/profile'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
-import { provideInstanceBackup } from '@/providers/instance-backup'
 import { injectInstanceSettings } from '@/providers/instance-settings'
-import { useTheming } from '@/store/state'

 import type { Manifest } from '../../../helpers/types'

 const { handleError } = injectNotificationManager()
-const filePicker = injectFilePicker()
 const { formatMessage } = useVIntl()
 const queryClient = useQueryClient()
 const debug = useDebugLogger('AppInstallationSettings')
-const themeStore = useTheming()

 const { instance, offline, isMinecraftServer, onUnlinked, closeModal } = injectInstanceSettings()
-const managedContentPolicy = useManagedContentPolicy(instance)
-const skipNonEssentialWarnings = computed(() =>
-	themeStore.getFeatureFlag('skip_non_essential_warnings'),
-)

 debug('metadata load: start', {
-	instanceId: instance.value.id,
+	instancePath: instance.value.path,
 	loader: instance.value.loader,
 	gameVersion: instance.value.game_version,
 	installStage: instance.value.install_stage,
 })

-function getSupportedModpackLoaders() {
-	return get_loaders().then((value: PlatformTag[]) =>
-		value
-			.filter((item) => item.supported_project_types.includes('modpack') || item.name === 'vanilla')
-			.sort((a, b) => (a.name === 'vanilla' ? -1 : b.name === 'vanilla' ? 1 : 0)),
-	)
-}
+const [
+	fabric_versions,
+	forge_versions,
+	quilt_versions,
+	neoforge_versions,
+	all_game_versions,
+	loaders,
+] = await Promise.all([
+	get_loader_versions('fabric')
+		.then((manifest: Manifest) => shallowRef(manifest))
+		.catch(handleError),
+	get_loader_versions('forge')
+		.then((manifest: Manifest) => shallowRef(manifest))
+		.catch(handleError),
+	get_loader_versions('quilt')
+		.then((manifest: Manifest) => shallowRef(manifest))
+		.catch(handleError),
+	get_loader_versions('neo')
+		.then((manifest: Manifest) => shallowRef(manifest))
+		.catch(handleError),
+	get_game_versions()
+		.then((gameVersions: GameVersionTag[]) => shallowRef(gameVersions))
+		.catch(handleError),
+	get_loaders()
+		.then((value: PlatformTag[]) =>
+			value
+				.filter(
+					(item) => item.supported_project_types.includes('modpack') || item.name === 'vanilla',
+				)
+				.sort((a, b) => (a.name === 'vanilla' ? -1 : b.name === 'vanilla' ? 1 : 0)),
+		)
+		.then((loader: PlatformTag[]) => ref(loader))
+		.catch(handleError),
+])

-const fabricVersionsQuery = useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'fabric'],
-	queryFn: () => get_loader_versions('fabric') as Promise<Manifest>,
-})
-const forgeVersionsQuery = useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'forge'],
-	queryFn: () => get_loader_versions('forge') as Promise<Manifest>,
-})
-const quiltVersionsQuery = useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'quilt'],
-	queryFn: () => get_loader_versions('quilt') as Promise<Manifest>,
-})
-const neoforgeVersionsQuery = useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'neo'],
-	queryFn: () => get_loader_versions('neo') as Promise<Manifest>,
-})
-const gameVersionsQuery = useQuery({
-	queryKey: ['instance-settings', 'game-versions'],
-	queryFn: () => get_game_versions() as Promise<GameVersionTag[]>,
-})
-const loadersQuery = useQuery({
-	queryKey: ['instance-settings', 'loaders', 'modpack'],
-	queryFn: getSupportedModpackLoaders,
+debug('metadata load: done', {
+	hasFabricManifest: !!fabric_versions?.value,
+	hasForgeManifest: !!forge_versions?.value,
+	hasQuiltManifest: !!quilt_versions?.value,
+	hasNeoforgeManifest: !!neoforge_versions?.value,
+	gameVersions: all_game_versions?.value?.length ?? 0,
+	availablePlatforms: loaders?.value?.map((loader) => loader.name) ?? [],
 })

-const metadataLoading = computed(() =>
-	[
-		fabricVersionsQuery,
-		forgeVersionsQuery,
-		quiltVersionsQuery,
-		neoforgeVersionsQuery,
-		gameVersionsQuery,
-		loadersQuery,
-	].some((query) => query.isLoading.value),
-)
-
-debug('metadata queries configured', {
-	instanceId: instance.value.id,
-	loader: instance.value.loader,
-	gameVersion: instance.value.game_version,
+const { data: modpackInfo } = useQuery({
+	queryKey: computed(() => ['linkedModpackInfo', instance.value.path]),
+	queryFn: () => get_linked_modpack_info(instance.value.path, 'must_revalidate'),
+	enabled: computed(() => !!instance.value.linked_data?.project_id && !offline),
 })

-const isModrinthLinkedModpack = computed(
-	() =>
-		instance.value.link?.type === 'modrinth_modpack' ||
-		instance.value.link?.type === 'server_project_modpack' ||
-		(instance.value.link?.type === 'shared_instance' &&
-			!!instance.value.link.modpack_project_id &&
-			!!instance.value.link.modpack_version_id),
-)
-const isImportedModpack = computed(() => instance.value.link?.type === 'imported_modpack')
-const isSharedInstanceManagedModpack = managedContentPolicy.isManagedModpack
-const canUnlinkSharedInstance = managedContentPolicy.canUnlink
-
-const modpackInfoQuery = useQuery({
-	queryKey: computed(() => ['linkedModpackInfo', instance.value.id]),
-	queryFn: () => get_linked_modpack_info(instance.value.id, 'must_revalidate'),
-	enabled: computed(() => isModrinthLinkedModpack.value && !offline),
-})
-const modpackInfo = modpackInfoQuery.data
-
 const repairing = ref(false)
 const reinstalling = ref(false)
-const unlinkingSharedInstance = ref(false)
-const installationSettingsBusy = computed(
-	() =>
-		instance.value.quarantined ||
-		instance.value.install_stage !== 'installed' ||
-		repairing.value ||
-		reinstalling.value ||
-		unlinkingSharedInstance.value ||
-		!!offline,
-)
-const installationSettingsBusyMessage = computed(() =>
-	instance.value.quarantined ? formatMessage(messages.locked) : null,
-)
-
-async function unlinkSharedInstance() {
-	unlinkingSharedInstance.value = true
-	try {
-		await unlink_shared_instance(instance.value.id)
-		await queryClient.invalidateQueries({ queryKey: ['sharedInstanceUsers', instance.value.id] })
-		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instance.value.id] })
-		onUnlinked()
-	} catch (error) {
-		handleError(error)
-	} finally {
-		unlinkingSharedInstance.value = false
-	}
-}

 const messages = defineMessages({
 	loaderVersion: {
 		id: 'instance.settings.tabs.installation.loader-version',
 		defaultMessage: '{loader} version',
 	},
-	locked: {
-		id: 'instance.settings.tabs.installation.locked',
-		defaultMessage: 'Installation settings are unavailable while this instance is locked.',
-	},
 })

 function getManifest(loader: string) {
-	const map: Record<string, Manifest | undefined> = {
-		fabric: fabricVersionsQuery.data.value,
-		forge: forgeVersionsQuery.data.value,
-		quilt: quiltVersionsQuery.data.value,
-		neoforge: neoforgeVersionsQuery.data.value,
+	const map: Record<string, typeof fabric_versions> = {
+		fabric: fabric_versions,
+		forge: forge_versions,
+		quilt: quilt_versions,
+		neoforge: neoforge_versions,
 	}
 	const manifest = map[loader]
 	debug('getManifest:', {
 		loader,
-		hasManifest: !!manifest,
-		gameVersions: manifest?.gameVersions?.length ?? 0,
+		hasManifest: !!manifest?.value,
+		gameVersions: manifest?.value?.gameVersions?.length ?? 0,
 	})
 	return manifest
 }

-async function installLocalModpackFromPicker() {
-	const picked = await filePicker.pickModpackFile({ readFile: false })
-	if (!picked?.path) return false
-
-	const job = await install_pack_to_existing_instance(instance.value.id, {
-		type: 'fromFile',
-		path: picked.path,
-	}).catch(handleError)
-	if (!job) return false
-
-	const completed = await wait_for_install_job(job.job_id).catch(handleError)
-	return !!completed
-}
-
-provideInstanceBackup(instance)
+provideAppBackup({
+	async createBackup() {
+		debug('createBackup: start', {
+			instancePath: instance.value.path,
+			instanceName: instance.value.name,
+		})
+		const allProfiles = await list()
+		const prefix = `${instance.value.name} - Backup #`
+		const existingNums = allProfiles
+			.filter((p) => p.name.startsWith(prefix))
+			.map((p) => parseInt(p.name.slice(prefix.length), 10))
+			.filter((n) => !isNaN(n))
+		const nextNum = existingNums.length > 0 ? Math.max(...existingNums) + 1 : 1
+		const newPath = await duplicate(instance.value.path)
+		await edit(newPath, { name: `${prefix}${nextNum}` })
+		debug('createBackup: done', { newPath, backupName: `${prefix}${nextNum}` })
+	},
+})

 provideInstallationSettings({
 	closeSettings: closeModal,
-	loading: computed(() => metadataLoading.value || modpackInfoQuery.isLoading.value),
+	loading: ref(false),
 	installationInfo: computed(() => {
 		const rows = [
 			{
@@ -225,24 +165,15 @@ provideInstallationSettings({
 		}
 		return rows
 	}),
-	isLinked: computed(
+	isLinked: computed(() => !!instance.value.linked_data?.locked),
+	isBusy: computed(
 		() =>
-			isModrinthLinkedModpack.value ||
-			isImportedModpack.value ||
-			isSharedInstanceManagedModpack.value,
+			instance.value.install_stage !== 'installed' ||
+			repairing.value ||
+			reinstalling.value ||
+			!!offline,
 	),
-	isBusy: installationSettingsBusy,
-	busyMessage: installationSettingsBusyMessage,
-	skipNonEssentialWarnings,
 	modpack: computed(() => {
-		if (isImportedModpack.value && instance.value.link?.type === 'imported_modpack') {
-			return {
-				iconUrl: instance.value.icon_path,
-				title: instance.value.link.name ?? instance.value.name,
-				versionNumber: instance.value.link.version_number ?? undefined,
-				filename: instance.value.link.filename ?? undefined,
-			}
-		}
 		if (!modpackInfo.value) return null
 		return {
 			iconUrl: modpackInfo.value.project.icon_url,
@@ -254,14 +185,14 @@ provideInstallationSettings({
 	currentPlatform: computed(() => instance.value.loader),
 	currentGameVersion: computed(() => instance.value.game_version),
 	currentLoaderVersion: computed(() => instance.value.loader_version ?? ''),
-	availablePlatforms: computed(() => loadersQuery.data.value?.map((x) => x.name) ?? []),
+	availablePlatforms: loaders?.value?.map((x) => x.name) ?? [],

 	resolveGameVersions(loader, showSnapshots) {
-		const versions = gameVersionsQuery.data.value ?? []
+		const versions = all_game_versions?.value ?? []
 		const filtered = versions.filter((item) => {
 			if (loader === 'vanilla') return true
 			const manifest = getManifest(loader)
-			return !!manifest?.gameVersions?.some((x) => item.version === x.id)
+			return !!manifest?.value?.gameVersions?.some((x) => item.version === x.id)
 		})
 		const result = (
 			showSnapshots ? filtered : filtered.filter((x) => x.version_type === 'release')
@@ -282,41 +213,27 @@ provideInstallationSettings({
 			return []
 		}
 		const manifest = getManifest(loader)
-		if (!manifest) {
+		if (!manifest?.value) {
 			debug('resolveLoaderVersions: no manifest', { loader, gameVersion })
 			return []
 		}
-		const entry = manifest.gameVersions?.find((item) => item.id === gameVersion)
-		if (entry?.versionGroup) {
-			const result =
-				manifest.versionGroups?.find((group) => group.id === entry.versionGroup)?.loaders ?? []
-			debug('resolveLoaderVersions: version group result', {
-				loader,
-				gameVersion,
-				versionGroup: entry.versionGroup,
-				count: result.length,
-			})
-			return result
-		}
-		const placeholder = manifest.gameVersions?.find((item) => item.id === '${modrinth.gameVersion}')
-		if (placeholder) {
-			const result = manifest.gameVersions?.some((item) => item.id === gameVersion)
-				? placeholder.loaders
-				: []
-			debug('resolveLoaderVersions: placeholder result', {
+		if (loader === 'fabric' || loader === 'quilt') {
+			const result = manifest.value.gameVersions[0]?.loaders ?? []
+			debug('resolveLoaderVersions: fabric/quilt result', {
 				loader,
 				gameVersion,
 				count: result.length,
 			})
 			return result
 		}
-		const result = entry?.loaders ?? []
+		const result =
+			manifest.value.gameVersions?.find((item) => item.id === gameVersion)?.loaders ?? []
 		debug('resolveLoaderVersions: result', { loader, gameVersion, count: result.length })
 		return result
 	},

 	resolveHasSnapshots(loader) {
-		const versions = gameVersionsQuery.data.value ?? []
+		const versions = all_game_versions?.value ?? []
 		if (loader === 'vanilla') {
 			const result = versions.some((x) => x.version_type !== 'release')
 			debug('resolveHasSnapshots: vanilla', { loader, result })
@@ -324,7 +241,7 @@ provideInstallationSettings({
 		}
 		const manifest = getManifest(loader)
 		const supported = versions.filter(
-			(item) => !!manifest?.gameVersions?.some((x) => item.version === x.id),
+			(item) => !!manifest?.value?.gameVersions?.some((x) => item.version === x.id),
 		)
 		const result = supported.some((x) => x.version_type !== 'release')
 		debug('resolveHasSnapshots:', {
@@ -338,25 +255,25 @@ provideInstallationSettings({

 	async save(platform, gameVersion, loaderVersionId) {
 		debug('save: called', {
-			instanceId: instance.value.id,
+			instancePath: instance.value.path,
 			platform,
 			gameVersion,
 			loaderVersionId,
 		})
-		const editInstancePatch: Record<string, string | undefined> = {
+		const editProfile: Record<string, string | undefined> = {
 			loader: platform,
 			game_version: gameVersion,
 		}
 		if (platform !== 'vanilla' && loaderVersionId) {
-			editInstancePatch.loader_version = loaderVersionId
+			editProfile.loader_version = loaderVersionId
 		}
-		await edit(instance.value.id, editInstancePatch).catch(handleError)
-		debug('save: edit complete', { editInstancePatch })
+		await edit(instance.value.path, editProfile).catch(handleError)
+		debug('save: edit complete', { editProfile })
 	},

 	afterSave: async () => {
-		debug('afterSave: installing', { instanceId: instance.value.id })
-		await install_existing_instance(instance.value.id, false).catch(handleError)
+		debug('afterSave: installing', { instancePath: instance.value.path })
+		await install(instance.value.path, false).catch(handleError)
 		trackEvent('InstanceRepair', {
 			loader: instance.value.loader,
 			game_version: instance.value.game_version,
@@ -365,9 +282,9 @@ provideInstallationSettings({
 	},

 	async repair() {
-		debug('repair: called', { instanceId: instance.value.id })
+		debug('repair: called', { instancePath: instance.value.path })
 		repairing.value = true
-		await install_existing_instance(instance.value.id, true).catch(handleError)
+		await install(instance.value.path, true).catch(handleError)
 		repairing.value = false
 		trackEvent('InstanceRepair', {
 			loader: instance.value.loader,
@@ -377,52 +294,24 @@ provideInstallationSettings({
 	},

 	async reinstallModpack() {
-		debug('reinstallModpack: called', { instanceId: instance.value.id })
+		debug('reinstallModpack: called', { instancePath: instance.value.path })
 		reinstalling.value = true
-		let shouldTrack = false
-		try {
-			if (isImportedModpack.value) {
-				shouldTrack = await installLocalModpackFromPicker()
-			} else {
-				await update_repair_modrinth(instance.value.id).catch(handleError)
-				shouldTrack = true
-			}
-		} finally {
-			reinstalling.value = false
-		}
-		if (shouldTrack) {
-			trackEvent('InstanceRepair', {
-				loader: instance.value.loader,
-				game_version: instance.value.game_version,
-			})
-		}
+		await update_repair_modrinth(instance.value.path).catch(handleError)
+		reinstalling.value = false
+		trackEvent('InstanceRepair', {
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
+		})
 		debug('reinstallModpack: done')
 	},

-	async swapModpack() {
-		debug('swapModpack: called', { instanceId: instance.value.id })
-		reinstalling.value = true
-		try {
-			const installed = await installLocalModpackFromPicker()
-			if (installed) {
-				trackEvent('InstanceRepair', {
-					loader: instance.value.loader,
-					game_version: instance.value.game_version,
-				})
-			}
-		} finally {
-			reinstalling.value = false
-		}
-		debug('swapModpack: done')
-	},
-
 	async unlinkModpack() {
-		debug('unlinkModpack: called', { instanceId: instance.value.id })
-		await edit(instance.value.id, {
-			link: null as unknown as undefined,
+		debug('unlinkModpack: called', { instancePath: instance.value.path })
+		await edit(instance.value.path, {
+			linked_data: null as unknown as undefined,
 		})
 		await queryClient.invalidateQueries({
-			queryKey: ['linkedModpackInfo', instance.value.id],
+			queryKey: ['linkedModpackInfo', instance.value.path],
 		})
 		onUnlinked()
 		debug('unlinkModpack: done')
@@ -431,9 +320,11 @@ provideInstallationSettings({
 	getCachedModpackVersions: () => null,
 	async fetchModpackVersions() {
 		debug('fetchModpackVersions: called', {
-			projectId: instance.value.link?.project_id,
+			projectId: instance.value.linked_data?.project_id,
 		})
-		const versions = await get_project_versions(instance.value.link!.project_id!).catch(handleError)
+		const versions = await get_project_versions(instance.value.linked_data!.project_id!).catch(
+			handleError,
+		)
 		debug('fetchModpackVersions: done', { count: versions?.length ?? 0 })
 		return (versions ?? []) as Labrinth.Versions.v2.Version[]
 	},
@@ -448,18 +339,19 @@ provideInstallationSettings({
 	async onModpackVersionConfirm(version) {
 		debug('onModpackVersionConfirm: called', {
 			versionId: version.id,
-			instanceId: instance.value.id,
+			instancePath: instance.value.path,
 		})
-		await update_managed_modrinth_version(instance.value.id, version.id)
+		await update_managed_modrinth_version(instance.value.path, version.id)
 		await queryClient.invalidateQueries({
-			queryKey: ['linkedModpackInfo', instance.value.id],
+			queryKey: ['linkedModpackInfo', instance.value.path],
 		})
 		debug('onModpackVersionConfirm: done')
 	},

 	updaterModalProps: computed(() => ({
 		isApp: true,
-		currentVersionId: modpackInfo.value?.update_version_id ?? instance.value.link?.version_id ?? '',
+		currentVersionId:
+			modpackInfo.value?.update_version_id ?? instance.value.linked_data?.version_id ?? '',
 		projectIconUrl: modpackInfo.value?.project?.icon_url,
 		projectName: modpackInfo.value?.project?.title ?? 'Modpack',
 		currentGameVersion: instance.value.game_version,
@@ -468,29 +360,12 @@ provideInstallationSettings({

 	isServer: false,
 	isApp: true,
-	showModpackVersionActions: computed(
-		() =>
-			isModrinthLinkedModpack.value &&
-			!isMinecraftServer.value &&
-			!isSharedInstanceManagedModpack.value,
-	),
-	isLocalFile: isImportedModpack,
-	isManagedModpack: isSharedInstanceManagedModpack,
-	managedModpackWarning: managedContentPolicy.managedModpackWarning,
+	showModpackVersionActions: !isMinecraftServer.value,
 	repairing,
 	reinstalling,
 })
 </script>

 <template>
-	<InstallationSettingsLayout>
-		<template #extra>
-			<SharedInstanceInstallationSettingsControls
-				:can-unlink="canUnlinkSharedInstance"
-				:busy="installationSettingsBusy"
-				:unlinking="unlinkingSharedInstance"
-				:unlink="unlinkSharedInstance"
-			/>
-		</template>
-	</InstallationSettingsLayout>
+	<InstallationSettingsLayout />
 </template>
@@ -23,7 +23,7 @@ import { computed, readonly, ref, watch } from 'vue'
 import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import useJavaTest from '@/composables/useJavaTest'
 import useMemorySlider from '@/composables/useMemorySlider'
-import { edit, get_optimal_jre_key } from '@/helpers/instance'
+import { edit, get_optimal_jre_key } from '@/helpers/profile'
 import { get } from '@/helpers/settings.ts'
 import { injectInstanceSettings } from '@/providers/instance-settings'

@@ -36,7 +36,7 @@ const { instance } = injectInstanceSettings()

 const globalSettings = (await get().catch(handleError)) as unknown as AppSettings

-const optimalJava = readonly(await get_optimal_jre_key(instance.value.id).catch(handleError))
+const optimalJava = readonly(await get_optimal_jre_key(instance.value.path).catch(handleError))

 const overrideJavaInstall = ref(!!instance.value.java_path)
 const javaPath = ref(instance.value.java_path ?? optimalJava?.path ?? '')
@@ -104,7 +104,7 @@ const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) a
 	snapPoints: number[]
 }

-const editInstanceObject = computed(() => {
+const editProfileObject = computed(() => {
 	return {
 		java_path:
 			overrideJavaInstall.value && javaPath.value
@@ -136,7 +136,7 @@ watch(
 		memory,
 	],
 	async () => {
-		await edit(instance.value.id, editInstanceObject.value)
+		await edit(instance.value.path, editProfileObject.value)
 	},
 	{ deep: true },
 )
@@ -1,42 +0,0 @@
-<template>
-	<div>
-		<SharedInstanceInstallationSettingsControls
-			can-unpublish
-			:busy="isBusy"
-			:unpublishing="unpublishing"
-			:unpublish="unpublishSharedInstance"
-		/>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { injectNotificationManager } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
-import { computed, ref } from 'vue'
-
-import SharedInstanceInstallationSettingsControls from '@/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue'
-import { unpublish_shared_instance } from '@/helpers/instance'
-import { injectInstanceSettings } from '@/providers/instance-settings'
-
-const { instance, offline, onUnlinked } = injectInstanceSettings()
-const { handleError } = injectNotificationManager()
-const queryClient = useQueryClient()
-const unpublishing = ref(false)
-const isBusy = computed(
-	() => instance.value.install_stage !== 'installed' || unpublishing.value || !!offline,
-)
-
-async function unpublishSharedInstance() {
-	unpublishing.value = true
-	try {
-		await unpublish_shared_instance(instance.value.id)
-		queryClient.setQueryData(['sharedInstanceUsers', instance.value.id], [])
-		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instance.value.id] })
-		onUnlinked()
-	} catch (error) {
-		handleError(error)
-	} finally {
-		unpublishing.value = false
-	}
-}
-</script>
@@ -9,7 +9,7 @@ import {
 } from '@modrinth/ui'
 import { computed, type Ref, ref, watch } from 'vue'

-import { edit } from '@/helpers/instance'
+import { edit } from '@/helpers/profile'
 import { get } from '@/helpers/settings.ts'
 import { injectInstanceSettings } from '@/providers/instance-settings'

@@ -32,7 +32,7 @@ const fullscreenSetting: Ref<boolean> = ref(
 	instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
 )

-const editInstanceObject = computed(() => {
+const editProfileObject = computed(() => {
 	if (!overrideWindowSettings.value) {
 		return {
 			force_fullscreen: null,
@@ -48,7 +48,7 @@ const editInstanceObject = computed(() => {
 watch(
 	[overrideWindowSettings, resolution, fullscreenSetting],
 	async () => {
-		await edit(instance.value.id, editInstanceObject.value)
+		await edit(instance.value.path, editProfileObject.value)
 	},
 	{ deep: true },
 )
@@ -1,144 +0,0 @@
-<template>
-	<NewModal ref="modal" :header="formatMessage(messages.header)" max-width="544px" no-padding>
-		<div class="grid grid-cols-[1fr_auto] gap-2.5 h-[154px] px-7 pt-4 pb-1 pr-9">
-			<div class="flex flex-col gap-2.5 items-start justify-center h-min mt-5">
-				<div class="font-semibold text-xl text-contrast">
-					{{ formatMessage(messages.descriptionHeader) }}
-				</div>
-				<div class="text-secondary leading-6">
-					{{ formatMessage(messages.description) }}
-				</div>
-			</div>
-			<div class="relative h-full w-[96px] overflow-hidden mx-3">
-				<div class="absolute top-0 left-0 z-0 w-full flex grow-0 flex-col items-end p-0">
-					<img :src="steveImage" alt="" class="self-stretch" />
-				</div>
-				<div
-					class="absolute left-0 bottom-0 z-10 order-1 h-6 w-[120px] shrink-0 grow-0 bg-[linear-gradient(180deg,rgba(39,41,46,0)_0%,#27292E_80%,#27292E_100%)]"
-				></div>
-			</div>
-		</div>
-
-		<div class="flex flex-col gap-6 px-6 pb-6">
-			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<a class="w-full !shadow-none" href="https://support.modrinth.com" @click="modal?.hide()">
-						<MessagesSquareIcon />
-						{{ formatMessage(messages.getSupport) }}
-					</a>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button class="w-full !shadow-none" :disabled="loadingSignIn" @click="signIn">
-						<SpinnerIcon v-if="loadingSignIn" class="animate-spin" />
-						<svg
-							v-else
-							width="20"
-							height="20"
-							viewBox="0 0 20 20"
-							fill="none"
-							xmlns="http://www.w3.org/2000/svg"
-						>
-							<rect width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
-							<rect x="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
-							<rect y="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
-							<rect
-								x="10.75"
-								y="10.75"
-								width="9.25"
-								height="9.25"
-								fill="black"
-								fill-opacity="0.9"
-							/>
-						</svg>
-						{{ formatMessage(messages.signIn) }}
-					</button>
-				</ButtonStyled>
-			</div>
-			<p class="m-0 text-center text-sm text-secondary">
-				{{ formatMessage(messages.dontHaveAccount) }}
-				<a
-					class="text-blue font-medium hover:underline"
-					href="https://www.minecraft.net/en-us/store/minecraft-java-bedrock-edition-pc"
-				>
-					{{ formatMessage(messages.getMinecraft) }}
-				</a>
-			</p>
-		</div>
-	</NewModal>
-</template>
-
-<script setup lang="ts">
-import { MessagesSquareIcon, SpinnerIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, NewModal, useVIntl } from '@modrinth/ui'
-import { inject, type Ref, ref } from 'vue'
-
-import steveImage from '@/assets/steve-look-up-left.webp'
-import type AccountsCard from '@/components/ui/AccountsCard.vue'
-import { trackEvent } from '@/helpers/analytics'
-import { login as loginFlow, set_default_user } from '@/helpers/auth.js'
-import { handleSevereError } from '@/store/error.js'
-
-const { formatMessage } = useVIntl()
-const accountsCard = inject('accountsCard') as Ref<InstanceType<typeof AccountsCard> | null>
-
-const messages = defineMessages({
-	header: {
-		id: 'minecraft-required.header',
-		defaultMessage: 'Minecraft required',
-	},
-	descriptionHeader: {
-		id: 'minecraft-required.description-header',
-		defaultMessage: 'Sign in to a Microsoft account',
-	},
-	description: {
-		id: 'minecraft-required.description',
-		defaultMessage:
-			'You need a Microsoft account that owns Minecraft before you can launch and play.',
-	},
-	getSupport: {
-		id: 'minecraft-required.get-support',
-		defaultMessage: 'Get support',
-	},
-	signIn: {
-		id: 'minecraft-required.sign-in',
-		defaultMessage: 'Sign in to Microsoft',
-	},
-	dontHaveAccount: {
-		id: 'minecraft-required.dont-have-account',
-		defaultMessage: 'Don’t have an account?',
-	},
-	getMinecraft: {
-		id: 'minecraft-required.get-minecraft',
-		defaultMessage: 'Get Minecraft',
-	},
-})
-
-const modal = ref<InstanceType<typeof NewModal>>()
-const loadingSignIn = ref(false)
-
-function show() {
-	modal.value?.show()
-}
-
-async function signIn() {
-	loadingSignIn.value = true
-
-	try {
-		const loggedIn = await loginFlow()
-		if (!loggedIn) return
-
-		await set_default_user(loggedIn.profile.id)
-		await accountsCard.value?.refreshValues()
-		await trackEvent('AccountLogIn', { source: 'MinecraftRequiredModal' })
-		modal.value?.hide()
-	} catch (error) {
-		handleSevereError(error)
-	} finally {
-		loadingSignIn.value = false
-	}
-}
-
-defineExpose({
-	show,
-})
-</script>
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { LogInIcon, SpinnerIcon } from '@modrinth/assets'
+import { ref } from 'vue'
+
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+
+defineProps({
+	onFlowCancel: {
+		type: Function,
+		default() {
+			return async () => {}
+		},
+	},
+})
+
+const modal = ref()
+
+function show() {
+	modal.value.show()
+}
+
+function hide() {
+	modal.value.hide()
+}
+
+defineExpose({ show, hide })
+</script>
+<template>
+	<ModalWrapper ref="modal" @hide="onFlowCancel">
+		<template #title>
+			<span class="items-center gap-2 text-lg font-extrabold text-contrast">
+				<LogInIcon /> Sign in
+			</span>
+		</template>
+
+		<div class="flex justify-center gap-2">
+			<SpinnerIcon class="w-12 h-12 animate-spin" />
+		</div>
+		<p class="text-sm text-secondary">
+			Please sign in at the browser window that just opened to continue.
+		</p>
+	</ModalWrapper>
+</template>
@@ -1,22 +1,15 @@
 <template>
-	<NewModal
-		ref="modal"
-		:header="formatMessage(messages.installToPlay)"
-		:closable="true"
-		:on-hide="show_ads_window"
-		max-width="544px"
-		width="544px"
-	>
-		<div v-if="requiredContentProject" class="flex w-full flex-col gap-6">
-			<p class="m-0 text-primary">
-				{{ formatMessage(messages.inviteWarning) }}
-			</p>
+	<NewModal ref="modal" :header="formatMessage(messages.installToPlay)" :closable="true">
+		<div v-if="requiredContentProject" class="flex flex-col gap-6 max-w-[500px]">
+			<Admonition type="info" :header="formatMessage(messages.contentRequired)">
+				{{ formatMessage(messages.serverRequiresMods) }}
+			</Admonition>

-			<div class="flex flex-col gap-2.5">
-				<div class="flex items-center justify-between">
-					<span class="font-semibold text-contrast">
-						{{ formatMessage(messages.sharedInstance) }}
-					</span>
+			<div class="flex flex-col gap-1">
+				<div class="flex justify-between items-center">
+					<span class="font-semibold text-contrast">{{
+						formatMessage(messages.requiredModpack)
+					}}</span>

 					<ButtonStyled type="transparent">
 						<button @click="openViewContents">
@@ -26,16 +19,14 @@
 					</ButtonStyled>
 				</div>

-				<div class="flex items-center gap-3 rounded-2xl bg-surface-2 p-3">
+				<div class="flex items-center gap-3 rounded-xl bg-surface-2 p-3">
 					<Avatar
 						:src="requiredContentProject.icon_url"
 						:alt="requiredContentProject.title"
-						size="56px"
-						no-shadow
-						class="!rounded-2xl"
+						size="48px"
 					/>
-					<div class="flex min-w-0 flex-col gap-0.5">
-						<span class="truncate font-semibold text-contrast">
+					<div class="flex flex-col gap-0.5">
+						<span class="font-semibold text-contrast">
 							<template v-if="usingCustomModpack && modpackVersion">
 								{{ modpackVersion.name }}
 							</template>
@@ -43,7 +34,7 @@
 								{{ requiredContentProject.title }}
 							</template>
 						</span>
-						<span class="truncate text-sm font-medium text-secondary">
+						<span class="text-sm text-secondary">
 							{{ loaderDisplay }} {{ requiredContentProject.game_versions?.[0] }}
 							<template v-if="modCount">
 								· {{ formatMessage(messages.modCount, { count: modCount }) }}
@@ -52,105 +43,24 @@
 					</div>
 				</div>
 			</div>
+		</div>

-			<Admonition
-				v-if="hasExternalFiles"
-				type="warning"
-				:header="formatMessage(messages.unknownFilesWarning)"
-			>
-				{{ formatMessage(messages.unknownFilesDescription) }}
-			</Admonition>
-
-			<div v-if="hasExternalFiles" class="relative w-full">
-				<div
-					ref="externalFileTable"
-					class="max-h-[242px] overflow-y-auto rounded-2xl"
-					@scroll="checkTableScrollState"
-				>
-					<Table
-						:columns="externalFileColumns"
-						:data="externalFileRows"
-						row-key="id"
-						virtualized
-						:virtual-row-height="48"
-						class="shadow-sm"
-					>
-						<template #cell-name="{ value }">
-							<span class="block truncate" :title="String(value)">{{ value }}</span>
-						</template>
-					</Table>
-				</div>
-				<Transition
-					enter-active-class="transition-all duration-200 ease-out"
-					enter-from-class="opacity-0 max-h-0"
-					enter-to-class="opacity-100 max-h-2"
-					leave-active-class="transition-all duration-200 ease-in"
-					leave-from-class="opacity-100 max-h-2"
-					leave-to-class="opacity-0 max-h-0"
-				>
-					<div
-						v-if="showTableTopFade"
-						class="pointer-events-none absolute left-0 right-0 top-0 z-10 h-2 bg-gradient-to-b from-bg-raised to-transparent"
-					/>
-				</Transition>
-				<Transition
-					enter-active-class="transition-all duration-200 ease-out"
-					enter-from-class="opacity-0 max-h-0"
-					enter-to-class="opacity-100 max-h-2"
-					leave-active-class="transition-all duration-200 ease-in"
-					leave-from-class="opacity-100 max-h-2"
-					leave-to-class="opacity-0 max-h-0"
-				>
-					<div
-						v-if="showTableBottomFade"
-						class="pointer-events-none absolute bottom-0 left-0 right-0 z-10 h-2 bg-gradient-to-t from-bg-raised to-transparent"
-					/>
-				</Transition>
-			</div>
-
-			<p v-if="hasExternalFiles" class="m-0 text-primary">
-				{{ formatMessage(messages.reviewedFiles) }}
-			</p>
-
-			<div class="flex w-full items-center justify-between gap-2">
-				<ButtonStyled type="transparent" color="red">
-					<button @click="handleReport">
-						<ReportIcon />
-						{{ formatMessage(commonMessages.reportButton) }}
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<ButtonStyled>
+					<button @click="handleDecline">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled color="brand">
+					<button @click="handleAccept">
+						<DownloadIcon />
+						{{ formatMessage(messages.installButton) }}
 					</button>
 				</ButtonStyled>
-
-				<div class="flex items-center gap-2">
-					<template v-if="hasExternalFiles">
-						<ButtonStyled type="transparent" color="orange">
-							<button @click="handleAccept">
-								{{ formatMessage(messages.installAnyway) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleDecline">
-								<BanIcon />
-								{{ formatMessage(messages.dontInstall) }}
-							</button>
-						</ButtonStyled>
-					</template>
-					<template v-else>
-						<ButtonStyled>
-							<button @click="handleDecline">
-								<XIcon />
-								{{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleAccept">
-								<DownloadIcon />
-								{{ formatMessage(messages.installButton) }}
-							</button>
-						</ButtonStyled>
-					</template>
-				</div>
 			</div>
-		</div>
+		</template>
 	</NewModal>

 	<ModpackContentModal
@@ -162,56 +72,33 @@

 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
-import { BanIcon, DownloadIcon, EyeIcon, ReportIcon, XIcon } from '@modrinth/assets'
+import { DownloadIcon, EyeIcon, XIcon } from '@modrinth/assets'
+import type { ContentItem } from '@modrinth/ui'
 import {
 	Admonition,
 	Avatar,
 	ButtonStyled,
 	commonMessages,
-	type ContentItem,
 	defineMessages,
 	formatLoader,
 	ModpackContentModal,
 	NewModal,
-	Table,
-	type TableColumn,
-	useScrollIndicator,
 	useVIntl,
 } from '@modrinth/ui'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { computed, nextTick, ref } from 'vue'
+import { computed, ref } from 'vue'

 import { hide_ads_window, show_ads_window } from '@/helpers/ads'
 import { get_project, get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
 import { injectServerInstall } from '@/providers/server-install'

-type ExternalFileColumn = 'name'
-type ExternalFileRow = {
-	id: string
-	name: string
-}
-
 const modal = ref<InstanceType<typeof NewModal>>()
 const modpackVersionId = ref<string | null>(null)
 const modpackVersion = ref<Labrinth.Versions.v2.Version | null>(null)
 const project = ref<Labrinth.Projects.v3.Project | null>(null)
 const requiredContentProject = ref<Labrinth.Projects.v2.Project | null>(null)
-const externalFiles = ref<string[]>([])
-const externalFileTable = ref<HTMLElement | null>(null)
 const onInstallComplete = ref<() => void>(() => {})
 const { formatMessage } = useVIntl()
-
-const props = defineProps<{
-	showExternalWarnings?: boolean
-}>()
-
 const { installServerProject, startInstallingServer, stopInstallingServer } = injectServerInstall()
-const {
-	showTopFade: showTableTopFade,
-	showBottomFade: showTableBottomFade,
-	checkScrollState: checkTableScrollState,
-	forceCheck: forceCheckTableScroll,
-} = useScrollIndicator(externalFileTable)

 const usingCustomModpack = computed(() => {
 	return requiredContentProject.value?.id === project.value?.id
@@ -224,36 +111,13 @@ const loaderDisplay = computed(() => {
 })

 const modCount = computed(() => modpackVersion.value?.dependencies?.length)
-const hasExternalFiles = computed(
-	() => Boolean(props.showExternalWarnings) && externalFiles.value.length > 0,
-)
-const externalFileRows = computed<ExternalFileRow[]>(() =>
-	externalFiles.value.map((name, index) => ({
-		id: `${index}-${name}`,
-		name,
-	})),
-)

 async function fetchData(versionId: string) {
 	// cache is making version null for some reason so bypassing for now
-	const version = await get_version(versionId, 'bypass')
-	modpackVersion.value = version
+	modpackVersion.value = await get_version(versionId, 'bypass')

-	if (version?.project_id) {
-		requiredContentProject.value = await get_project(version.project_id, 'bypass')
-		externalFiles.value = [
-			...new Set(
-				(version.dependencies ?? [])
-					.filter(
-						(dependency) =>
-							dependency.dependency_type === 'embedded' &&
-							!dependency.project_id &&
-							!dependency.version_id &&
-							dependency.file_name,
-					)
-					.flatMap((dependency) => (dependency.file_name ? [dependency.file_name] : [])),
-			),
-		].sort((left, right) => left.localeCompare(right))
+	if (modpackVersion.value?.project_id) {
+		requiredContentProject.value = await get_project(modpackVersion.value.project_id, 'bypass')
 	}
 }

@@ -275,12 +139,6 @@ function handleDecline() {
 	hide()
 }

-function handleReport() {
-	if (project.value?.id) {
-		openUrl(`https://modrinth.com/report?item=project&itemID=${project.value.id}`)
-	}
-}
-
 const modpackContentModal = ref<InstanceType<typeof ModpackContentModal>>()

 async function openViewContents() {
@@ -359,19 +217,17 @@ async function show(
 	modpackVersionId.value = modpackVersionIdVal
 	modpackVersion.value = null
 	requiredContentProject.value = null
-	externalFiles.value = []
 	onInstallComplete.value = callback

 	if (modpackVersionIdVal) await fetchData(modpackVersionIdVal)

 	hide_ads_window()
 	modal.value?.show(e)
-	await nextTick()
-	forceCheckTableScroll()
 }

 function hide() {
 	modal.value?.hide()
+	show_ads_window()
 }

 const messages = defineMessages({
@@ -379,10 +235,22 @@ const messages = defineMessages({
 		id: 'app.modal.install-to-play.header',
 		defaultMessage: 'Install to play',
 	},
-	inviteWarning: {
-		id: 'app.modal.install-to-play.invite-warning',
+	sharedServerInstance: {
+		id: 'app.modal.install-to-play.shared-server-instance',
+		defaultMessage: 'Shared server instance',
+	},
+	contentRequired: {
+		id: 'app.modal.install-to-play.content-required',
+		defaultMessage: 'Content required',
+	},
+	serverRequiresMods: {
+		id: 'app.modal.install-to-play.server-requires-mods',
 		defaultMessage:
-			'This invite was created by another Modrinth user, not Modrinth. Only accept invites from people you trust.',
+			'This server requires mods to play. Click Install to set up the required files from Modrinth, then launch directly into the server.',
+	},
+	requiredModpack: {
+		id: 'app.modal.install-to-play.required-modpack',
+		defaultMessage: 'Required modpack',
 	},
 	sharedInstance: {
 		id: 'app.modal.install-to-play.shared-instance',
@@ -400,41 +268,7 @@ const messages = defineMessages({
 		id: 'app.modal.install-to-play.view-contents',
 		defaultMessage: 'View contents',
 	},
-	unknownFilesWarning: {
-		id: 'app.modal.install-to-play.unknown-files-warning',
-		defaultMessage: 'Unknown files warning',
-	},
-	unknownFilesDescription: {
-		id: 'app.modal.install-to-play.unknown-files-description',
-		defaultMessage:
-			'This server modpack contains files that aren’t published on Modrinth. We strongly recommend only installing files from sources you trust.',
-	},
-	unrecognizedFiles: {
-		id: 'app.modal.install-to-play.unrecognized-files',
-		defaultMessage: 'Unrecognized files',
-	},
-	reviewedFiles: {
-		id: 'app.modal.install-to-play.reviewed-files',
-		defaultMessage:
-			'A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack).',
-	},
-	installAnyway: {
-		id: 'app.modal.install-to-play.install-anyway',
-		defaultMessage: 'Install anyway',
-	},
-	dontInstall: {
-		id: 'app.modal.install-to-play.external-files-dont-install',
-		defaultMessage: "Don't install",
-	},
 })

-const externalFileColumns = computed<TableColumn<ExternalFileColumn>[]>(() => [
-	{
-		key: 'name',
-		label: formatMessage(messages.unrecognizedFiles),
-		cellClass: '!h-12',
-	},
-])
-
 defineExpose({ show, hide })
 </script>
@@ -14,7 +14,7 @@ defineProps<{
 		<Avatar
 			:src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
 			size="24px"
-			:tint-by="instance.id"
+			:tint-by="instance.path"
 		/>
 		{{ instance.name }} <ChevronRightIcon />
 	</span>
@@ -6,7 +6,6 @@ import {
 	CoffeeIcon,
 	InfoIcon,
 	MonitorIcon,
-	UsersIcon,
 	WrenchIcon,
 } from '@modrinth/assets'
 import {
@@ -17,8 +16,7 @@ import {
 	type TabbedModalTab,
 	useVIntl,
 } from '@modrinth/ui'
-import type { PlatformTag } from '@modrinth/utils'
-import { useQuery, useQueryClient } from '@tanstack/vue-query'
+import { useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { computed, nextTick, ref, watch } from 'vue'

@@ -26,18 +24,14 @@ import GeneralSettings from '@/components/ui/instance_settings/GeneralSettings.v
 import HooksSettings from '@/components/ui/instance_settings/HooksSettings.vue'
 import InstallationSettings from '@/components/ui/instance_settings/InstallationSettings.vue'
 import JavaSettings from '@/components/ui/instance_settings/JavaSettings.vue'
-import SharingSettings from '@/components/ui/instance_settings/SharingSettings.vue'
 import WindowSettings from '@/components/ui/instance_settings/WindowSettings.vue'
 import { get_project_v3 } from '@/helpers/cache'
-import { get_linked_modpack_info } from '@/helpers/instance'
-import { get_loader_versions } from '@/helpers/metadata'
-import { get_game_versions, get_loaders } from '@/helpers/tags'
+import { get_linked_modpack_info } from '@/helpers/profile'
 import { provideInstanceSettings } from '@/providers/instance-settings'

 import type { GameInstance } from '../../../helpers/types'

 const { formatMessage } = useVIntl()
-const queryClient = useQueryClient()

 const props = defineProps<{
 	instance: GameInstance
@@ -51,6 +45,7 @@ const isMinecraftServer = ref(false)
 const handleUnlinked = () => emit('unlinked')

 const instanceRef = computed(() => props.instance)
+const queryClient = useQueryClient()
 const tabbedModal = ref<InstanceType<typeof TabbedModal> | null>(null)

 function hide() {
@@ -69,8 +64,8 @@ watch(
 	() => props.instance,
 	(instance) => {
 		isMinecraftServer.value = false
-		if (instance.link?.project_id) {
-			get_project_v3(instance.link.project_id, 'must_revalidate')
+		if (instance.linked_data?.project_id) {
+			get_project_v3(instance.linked_data.project_id, 'must_revalidate')
 				.then((project: Labrinth.Projects.v3.Project | undefined) => {
 					if (project?.minecraft_server != null) {
 						isMinecraftServer.value = true
@@ -99,15 +94,6 @@ const tabs = computed<TabbedModalTab[]>(() => [
 		icon: WrenchIcon,
 		content: InstallationSettings,
 	},
-	{
-		name: defineMessage({
-			id: 'instance.settings.tabs.sharing',
-			defaultMessage: 'Sharing',
-		}),
-		icon: UsersIcon,
-		content: SharingSettings,
-		shown: props.instance.shared_instance?.role === 'owner' && !props.instance.quarantined,
-	},
 	{
 		name: defineMessage({
 			id: 'instance.settings.tabs.window',
@@ -134,50 +120,11 @@ const tabs = computed<TabbedModalTab[]>(() => [
 	},
 ])

-function getSupportedModpackLoaders() {
-	return get_loaders().then((value: PlatformTag[]) =>
-		value
-			.filter((item) => item.supported_project_types.includes('modpack') || item.name === 'vanilla')
-			.sort((a, b) => (a.name === 'vanilla' ? -1 : b.name === 'vanilla' ? 1 : 0)),
-	)
-}
-
-// Preload
-useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'fabric'],
-	queryFn: () => get_loader_versions('fabric'),
-})
-useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'forge'],
-	queryFn: () => get_loader_versions('forge'),
-})
-useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'quilt'],
-	queryFn: () => get_loader_versions('quilt'),
-})
-useQuery({
-	queryKey: ['instance-settings', 'loader-versions', 'neo'],
-	queryFn: () => get_loader_versions('neo'),
-})
-useQuery({
-	queryKey: ['instance-settings', 'game-versions'],
-	queryFn: get_game_versions,
-})
-useQuery({
-	queryKey: ['instance-settings', 'loaders', 'modpack'],
-	queryFn: getSupportedModpackLoaders,
-})
-useQuery({
-	queryKey: computed(() => ['linkedModpackInfo', props.instance.id]),
-	queryFn: () => get_linked_modpack_info(props.instance.id, 'stale_while_revalidate'),
-	enabled: computed(() => !!props.instance.link?.project_id && !props.offline),
-})
-
 function show(tabIndex?: number) {
-	if (props.instance.link?.project_id) {
+	if (props.instance.linked_data?.project_id) {
 		queryClient.prefetchQuery({
-			queryKey: ['linkedModpackInfo', props.instance.id],
-			queryFn: () => get_linked_modpack_info(props.instance.id, 'stale_while_revalidate'),
+			queryKey: ['linkedModpackInfo', props.instance.path],
+			queryFn: () => get_linked_modpack_info(props.instance.path, 'stale_while_revalidate'),
 		})
 	}
 	tabbedModal.value?.show()
@@ -200,7 +147,7 @@ defineExpose({ show, hide })
 				<Avatar
 					:src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
 					size="24px"
-					:tint-by="props.instance.id"
+					:tint-by="props.instance.path"
 				/>
 				{{ instance.name }} <ChevronRightIcon />
 				<span class="font-extrabold text-contrast">{{
@@ -68,17 +68,17 @@ const messages = defineMessages({
 })

 const emit = defineEmits<{
-	(e: 'go-to-instance', instanceId: string): void
+	(e: 'go-to-instance', instancePath: string): void
 	(e: 'create-anyway'): void
 }>()

 const modal = ref<InstanceType<typeof NewModal>>()
 const instanceName = ref('')
-const instanceId = ref('')
+const instancePath = ref('')

-function show(name: string, id: string) {
+function show(name: string, path: string) {
 	instanceName.value = name
-	instanceId.value = id
+	instancePath.value = path
 	modal.value?.show()
 }

@@ -88,7 +88,7 @@ function handleCancel() {

 function handleGoToInstance() {
 	modal.value?.hide()
-	emit('go-to-instance', instanceId.value)
+	emit('go-to-instance', instancePath.value)
 }

 function handleCreateAnyway() {
@@ -1,265 +0,0 @@
-<template>
-	<NewModal
-		ref="modal"
-		:header="formatMessage(authenticating ? messages.signingInHeader : messages.header)"
-		:on-hide="handleHide"
-		no-padding
-		max-width="548px"
-		width="100%"
-	>
-		<div v-if="authenticating === null" class="flex w-full flex-col gap-6 p-6">
-			<div class="flex flex-col gap-2 px-3">
-				<h2 class="m-0 text-xl font-semibold leading-7 text-contrast">
-					{{ formatMessage(messages.signInHeading) }}
-				</h2>
-				<p class="m-0 text-base leading-6 text-primary">
-					{{ formatMessage(messages.description) }}
-				</p>
-			</div>
-
-			<div class="flex flex-col gap-6">
-				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
-					<ButtonStyled>
-						<button class="w-full !shadow-none" type="button" @click="authenticate('sign-up')">
-							<UserPlusIcon aria-hidden="true" />
-							{{ formatMessage(messages.createAccountButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button class="w-full" type="button" @click="authenticate('sign-in')">
-							<LogInIcon aria-hidden="true" />
-							{{ formatMessage(messages.signInButton) }}
-						</button>
-					</ButtonStyled>
-				</div>
-
-				<p class="m-0 text-center text-base font-medium leading-6 text-primary">
-					<IntlFormatted :message-id="messages.supportPrompt">
-						<template #support="{ children }">
-							<button
-								type="button"
-								class="inline cursor-pointer border-0 bg-transparent p-0 text-base font-medium leading-6 text-blue hover:underline"
-								@click="openSupport"
-							>
-								<component :is="() => children" />
-							</button>
-						</template>
-					</IntlFormatted>
-				</p>
-			</div>
-		</div>
-
-		<div v-else class="flex w-full flex-col gap-6 p-6">
-			<div class="flex flex-col gap-2.5 px-3">
-				<div class="flex flex-col gap-2">
-					<h2 class="m-0 text-xl font-semibold leading-7 text-contrast">
-						{{ formatMessage(messages.continueInBrowserHeading) }}
-					</h2>
-					<p class="m-0 text-base leading-6 text-primary">
-						{{ formatMessage(messages.browserDescription) }}
-					</p>
-				</div>
-				<div class="flex items-center gap-1.5 text-primary">
-					<SpinnerIcon aria-hidden="true" class="h-5 w-5 shrink-0 animate-spin" />
-					<span class="text-base leading-6">
-						{{ formatMessage(messages.waitingForBrowser) }}
-					</span>
-				</div>
-			</div>
-
-			<div class="flex flex-col gap-6">
-				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
-					<ButtonStyled type="outlined">
-						<button class="w-full" type="button" @click="modal?.hide()">
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(messages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button
-							class="w-full !shadow-none"
-							type="button"
-							:disabled="reopeningBrowser"
-							@click="reopenBrowser"
-						>
-							<RefreshCwIcon aria-hidden="true" />
-							{{ formatMessage(messages.openBrowserAgainButton) }}
-						</button>
-					</ButtonStyled>
-				</div>
-
-				<p class="m-0 text-center text-base font-medium leading-6 text-primary">
-					<IntlFormatted :message-id="messages.supportPrompt">
-						<template #support="{ children }">
-							<button
-								type="button"
-								class="inline cursor-pointer border-0 bg-transparent p-0 text-base font-medium leading-6 text-blue hover:underline"
-								@click="openSupport"
-							>
-								<component :is="() => children" />
-							</button>
-						</template>
-					</IntlFormatted>
-				</p>
-			</div>
-		</div>
-	</NewModal>
-</template>
-
-<script setup lang="ts">
-import { LogInIcon, RefreshCwIcon, SpinnerIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { ref } from 'vue'
-
-import { cancelLogin, type ModrinthAuthFlow } from '@/helpers/mr_auth'
-
-const props = defineProps<{
-	requestAuth: (flow: ModrinthAuthFlow) => Promise<boolean>
-}>()
-
-const { formatMessage } = useVIntl()
-const modal = ref<InstanceType<typeof NewModal>>()
-const authenticating = ref<ModrinthAuthFlow | null>(null)
-const reopeningBrowser = ref(false)
-let resolveShow: ((signedIn: boolean) => void) | undefined
-let authenticationId = 0
-let activeAuthentication: Promise<void> | undefined
-
-function show(event?: MouseEvent) {
-	resetAuthentication(true)
-	resolveShow?.(false)
-	const modalInstance = modal.value
-	if (!modalInstance) return Promise.resolve(false)
-
-	return new Promise<boolean>((resolve) => {
-		resolveShow = resolve
-		modalInstance.show(event)
-	})
-}
-
-function showSigningIn(flow: ModrinthAuthFlow = 'sign-in', event?: MouseEvent) {
-	const result = show(event)
-	authenticate(flow)
-	return result
-}
-
-function finish(signedIn: boolean) {
-	resolveShow?.(signedIn)
-	resolveShow = undefined
-}
-
-function authenticate(flow: ModrinthAuthFlow) {
-	const id = ++authenticationId
-	authenticating.value = flow
-
-	const authentication = (async () => {
-		try {
-			if ((await props.requestAuth(flow)) && authenticationId === id) {
-				authenticating.value = null
-				activeAuthentication = undefined
-				finish(true)
-				modal.value?.hide()
-			}
-		} finally {
-			if (authenticationId === id) {
-				authenticating.value = null
-				activeAuthentication = undefined
-			}
-		}
-	})()
-
-	activeAuthentication = authentication
-}
-
-async function reopenBrowser() {
-	const flow = authenticating.value
-	if (!flow || reopeningBrowser.value) return
-
-	reopeningBrowser.value = true
-	const previousAuthentication = activeAuthentication
-	++authenticationId
-
-	try {
-		await cancelLogin()
-		await previousAuthentication?.catch(() => undefined)
-		if (authenticating.value === flow) authenticate(flow)
-	} finally {
-		reopeningBrowser.value = false
-	}
-}
-
-function resetAuthentication(cancelActive: boolean) {
-	const wasAuthenticating = authenticating.value !== null
-	++authenticationId
-	activeAuthentication = undefined
-	authenticating.value = null
-	reopeningBrowser.value = false
-
-	if (cancelActive && wasAuthenticating) void cancelLogin()
-}
-
-function handleHide() {
-	resetAuthentication(true)
-	finish(false)
-}
-
-function openSupport() {
-	openUrl('https://support.modrinth.com')
-}
-
-const messages = defineMessages({
-	header: {
-		id: 'modal.modrinth-account-required.header',
-		defaultMessage: 'Account required',
-	},
-	signingInHeader: {
-		id: 'modal.modrinth-account-required.signing-in-header',
-		defaultMessage: 'Signing in',
-	},
-	signInHeading: {
-		id: 'modal.modrinth-account-required.sign-in-heading',
-		defaultMessage: 'Sign in to a Modrinth account',
-	},
-	description: {
-		id: 'modal.modrinth-account-required.description',
-		defaultMessage:
-			"You'll need to sign into your Modrinth account before you can use this feature.",
-	},
-	createAccountButton: {
-		id: 'modal.modrinth-account-required.create-account-button',
-		defaultMessage: 'Create an account',
-	},
-	signInButton: {
-		id: 'modal.modrinth-account-required.sign-in-button',
-		defaultMessage: 'Sign in to Modrinth',
-	},
-	continueInBrowserHeading: {
-		id: 'modal.modrinth-account-required.continue-in-browser-heading',
-		defaultMessage: 'Continue in your browser',
-	},
-	browserDescription: {
-		id: 'modal.modrinth-account-required.browser-description',
-		defaultMessage:
-			'A new tab opened to sign in. Complete the sign in there, then return to the app.',
-	},
-	waitingForBrowser: {
-		id: 'modal.modrinth-account-required.waiting-for-browser',
-		defaultMessage: 'Waiting for browser confirmation...',
-	},
-	cancelButton: {
-		id: 'modal.modrinth-account-required.cancel-button',
-		defaultMessage: 'Cancel',
-	},
-	openBrowserAgainButton: {
-		id: 'modal.modrinth-account-required.open-browser-again-button',
-		defaultMessage: 'Open browser again',
-	},
-	supportPrompt: {
-		id: 'modal.modrinth-account-required.support-prompt',
-		defaultMessage: 'Having trouble signing in? <support>Get support</support>',
-	},
-})
-
-defineExpose({ show, showSigningIn })
-</script>
@@ -2,18 +2,17 @@
 	<ContentDiffModal
 		ref="diffModal"
 		:header="formatMessage(messages.updateToPlay)"
+		:admonition-header="formatMessage(messages.updateRequired)"
 		:description="
 			instance ? formatMessage(messages.updateRequiredDescription, { name: instance.name }) : ''
 		"
 		:diffs="normalizedDiffs"
-		:version-date="versionDate"
-		:show-external-warnings="showExternalWarnings"
-		:external-warning-description="formatMessage(messages.externalWarningDescription)"
 		:confirm-label="formatMessage(commonMessages.updateButton)"
 		:confirm-icon="DownloadIcon"
-		:removed-label="formatMessage(messages.removed)"
+		:show-report-button="true"
 		@confirm="handleUpdate"
 		@cancel="handleDecline"
+		@report="handleReport"
 	/>
 </template>

@@ -27,12 +26,12 @@ import {
 	defineMessages,
 	useVIntl,
 } from '@modrinth/ui'
+import { openUrl } from '@tauri-apps/plugin-opener'
 import dayjs from 'dayjs'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'

 import { get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
-import { wait_for_install_job } from '@/helpers/install'
-import { update_managed_modrinth_version } from '@/helpers/instance'
+import { update_managed_modrinth_version } from '@/helpers/profile'
 import type { GameInstance } from '@/helpers/types'
 import { injectServerInstall } from '@/providers/server-install'

@@ -77,15 +76,6 @@ const { formatMessage } = useVIntl()
 const { startInstallingServer, stopInstallingServer } = injectServerInstall()
 type UpdateCompleteCallback = () => void | Promise<void>

-const { showExternalWarnings } = defineProps<{
-	showExternalWarnings?: boolean
-}>()
-
-const emit = defineEmits<{
-	cancel: []
-	complete: []
-}>()
-
 const diffModal = ref<InstanceType<typeof ContentDiffModal>>()
 const instance = ref<GameInstance | null>(null)
 const onUpdateComplete = ref<UpdateCompleteCallback>(() => {})
@@ -93,21 +83,14 @@ const diffs = ref<DependencyDiff[]>([])
 const modpackVersionId = ref<string | null>(null)
 const modpackVersion = ref<Version | null>(null)

-const normalizedDiffs = computed<ContentDiffItem[]>(() => {
-	return diffs.value.map((diff) => ({
+const normalizedDiffs = computed<ContentDiffItem[]>(() =>
+	diffs.value.map((diff) => ({
 		type: diff.type,
-		external: Boolean(diff.fileName && !diff.project),
 		projectName: diff.project?.title,
 		fileName: diff.fileName,
 		currentVersionName: diff.currentVersion?.version_number,
 		newVersionName: diff.newVersion?.version_number,
-	}))
-})
-
-const versionDate = computed(() =>
-	modpackVersion.value?.date_published
-		? dayjs(modpackVersion.value.date_published).format('MMMM D, YYYY')
-		: undefined,
+	})),
 )

 async function computeDependencyDiffs(
@@ -206,10 +189,6 @@ async function computeDependencyDiffs(
 			}
 		})
 		.sort((a, b) => {
-			const aExternal = Boolean(a.fileName && !a.project)
-			const bExternal = Boolean(b.fileName && !b.project)
-			if (aExternal !== bExternal) return aExternal ? -1 : 1
-
 			const typeOrder = { added: 0, updated: 1, removed: 2 }
 			const typeCompare = typeOrder[a.type] - typeOrder[b.type]
 			if (typeCompare !== 0) return typeCompare
@@ -223,15 +202,15 @@ async function computeDependencyDiffs(
 }

 async function checkUpdateAvailable(inst: GameInstance): Promise<DependencyDiff[] | null> {
-	if (!inst.link) return null
-	if (!modpackVersionId.value || !inst.link.version_id) return null
+	if (!inst.linked_data) return null
+	if (!modpackVersionId.value || !inst.linked_data.version_id) return null

 	try {
-		// For server projects, link.project_id is the server project but
-		// link.version_id references a content modpack version from a different project.
-		// Detect this by comparing the version's project_id with link.project_id.
+		// For server projects, linked_data.project_id is the server project but
+		// linked_data.version_id references a content modpack version from a different project.
+		// Detect this by comparing the version's project_id with linked_data.project_id.
 		modpackVersion.value = await get_version(modpackVersionId.value, 'bypass')
-		const instanceModpackVersion = await get_version(inst.link.version_id, 'bypass')
+		const instanceModpackVersion = await get_version(inst.linked_data.version_id, 'bypass')

 		// Compute dependency diffs between current and latest version
 		if (instanceModpackVersion && modpackVersion.value) {
@@ -247,25 +226,42 @@ async function checkUpdateAvailable(inst: GameInstance): Promise<DependencyDiff[
 	return null
 }

+watch(
+	() => instance.value,
+	async (newInstance) => {
+		if (!newInstance) return
+		const result = await checkUpdateAvailable(newInstance)
+		diffs.value = result || []
+	},
+	{ immediate: true, deep: true },
+)
+
 async function handleUpdate() {
-	const serverProjectId = instance.value?.link?.project_id
+	hide()
+	const serverProjectId = instance.value?.linked_data?.project_id
 	if (serverProjectId) startInstallingServer(serverProjectId)
 	try {
 		if (modpackVersionId.value && instance.value) {
-			const job = await update_managed_modrinth_version(instance.value.id, modpackVersionId.value)
-			await wait_for_install_job(job.job_id)
+			await update_managed_modrinth_version(instance.value.path, modpackVersionId.value)
 			await onUpdateComplete.value()
 		}
 	} catch (error) {
 		console.error('Error updating instance:', error)
 	} finally {
 		if (serverProjectId) stopInstallingServer(serverProjectId)
-		emit('complete')
+	}
+}
+
+function handleReport() {
+	if (instance.value?.linked_data?.project_id) {
+		openUrl(
+			`https://modrinth.com/report?item=project&itemID=${instance.value.linked_data.project_id}`,
+		)
 	}
 }

 function handleDecline() {
-	emit('cancel')
+	hide()
 }

 function show(
@@ -276,15 +272,8 @@ function show(
 ) {
 	instance.value = instanceVal
 	modpackVersionId.value = modpackVersionIdVal
-	modpackVersion.value = null
-	diffs.value = []
 	onUpdateComplete.value = callback
 	diffModal.value?.show(e)
-	void checkUpdateAvailable(instanceVal).then((result) => {
-		if (instance.value?.id === instanceVal.id && modpackVersionId.value === modpackVersionIdVal) {
-			diffs.value = result || []
-		}
-	})
 }

 function hide() {
@@ -296,25 +285,23 @@ const messages = defineMessages({
 		id: 'app.modal.update-to-play.header',
 		defaultMessage: 'Update to play',
 	},
+	updateRequired: {
+		id: 'app.modal.update-to-play.update-required',
+		defaultMessage: 'Update required',
+	},
 	updateRequiredDescription: {
 		id: 'app.modal.update-to-play.update-required-description',
 		defaultMessage:
-			'An update is required to play {name}. Please update to latest version to launch the game.',
-	},
-	removed: {
-		id: 'app.modal.update-to-play.removed',
-		defaultMessage: 'Removed',
-	},
-	externalWarningDescription: {
-		id: 'app.modal.update-to-play.server-modpack-unknown-files-description',
-		defaultMessage:
-			'This server modpack update contains files that aren’t published on Modrinth. We strongly recommend only installing files from sources you trust.',
+			'An update is required to play {name}. Please update to the latest version to launch the game.',
 	},
 })

 const hasUpdate = computed(() => {
-	if (!instance.value?.link) return false
-	return modpackVersionId.value != null && modpackVersionId.value !== instance.value.link.version_id
+	if (!instance.value?.linked_data) return false
+	return (
+		modpackVersionId.value != null &&
+		modpackVersionId.value !== instance.value.linked_data.version_id
+	)
 })

 defineExpose({ show, hide, hasUpdate })
@@ -11,7 +11,6 @@ const themeStore = useTheming()
 const { formatMessage } = useVIntl()

 const worldsInHomeFlag: FeatureFlag = 'worlds_in_home'
-const skipNonEssentialWarningsFlag: FeatureFlag = 'skip_non_essential_warnings'
 const skipUnknownPackWarningFlag: FeatureFlag = 'skip_unknown_pack_warning'
 const showPlayTimeFlag: FeatureFlag = 'show_instance_play_time'

@@ -102,15 +101,6 @@ const messages = defineMessages({
 		defaultMessage:
 			"If you attempt to install a Modrinth Pack file (.mrpack) that isn't hosted on Modrinth, we'll make sure you understand the risks before installing it.",
 	},
-	skipNonEssentialWarningsTitle: {
-		id: 'app.appearance-settings.skip-non-essential-warnings.title',
-		defaultMessage: 'Skip non-essential warnings',
-	},
-	skipNonEssentialWarningsDescription: {
-		id: 'app.appearance-settings.skip-non-essential-warnings.description',
-		defaultMessage:
-			'Automatically skips low-risk confirmations like duplicate modpack installs, normal content deletion, bulk updates, unlinking modpacks, and repair prompts. Dangerous warnings will still be shown.',
-	},
 	showPlayTimeTitle: {
 		id: 'app.appearance-settings.show-play-time.title',
 		defaultMessage: 'Show play time',
@@ -295,25 +285,6 @@ watch(
 		/>
 	</div>

-	<div class="mt-6 flex items-center justify-between gap-4">
-		<div>
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.skipNonEssentialWarningsTitle) }}
-			</h2>
-			<p class="m-0 mt-1">{{ formatMessage(messages.skipNonEssentialWarningsDescription) }}</p>
-		</div>
-		<Toggle
-			:model-value="themeStore.getFeatureFlag(skipNonEssentialWarningsFlag)"
-			@update:model-value="
-				() => {
-					const newValue = !themeStore.getFeatureFlag(skipNonEssentialWarningsFlag)
-					themeStore.featureFlags[skipNonEssentialWarningsFlag] = newValue
-					settings.feature_flags[skipNonEssentialWarningsFlag] = newValue
-				}
-			"
-		/>
-	</div>
-
 	<div class="mt-6 flex items-center justify-between">
 		<div>
 			<h2 class="m-0 text-lg font-semibold text-contrast">
@@ -1,44 +1,12 @@
 <script setup lang="ts">
-import { Settings2Icon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	defineMessages,
-	injectNotificationManager,
-	injectPageContext,
-	Toggle,
-	useVIntl,
-} from '@modrinth/ui'
+import { Toggle } from '@modrinth/ui'
 import { ref, watch } from 'vue'

-import { open_ads_consent_preferences } from '@/helpers/ads.js'
 import { optInAnalytics, optOutAnalytics } from '@/helpers/analytics'
 import { get, set } from '@/helpers/settings.ts'

-const { formatMessage } = useVIntl()
-const { handleError } = injectNotificationManager()
-const { adConsentAvailable } = injectPageContext()
 const settings = ref(await get())

-const messages = defineMessages({
-	adsConsentTitle: {
-		id: 'app.ads-consent.title',
-		defaultMessage: 'Your privacy and how ads support Modrinth',
-	},
-	adsConsentIntro: {
-		id: 'app.settings.privacy.ads-consent.intro',
-		defaultMessage:
-			'Ads make Modrinth possible and fund creator payouts. Our partners may store or access cookies in the app to personalize ads and measure performance. You can opt out or manage your preferences below.',
-	},
-	adsConsentManage: {
-		id: 'app.ads-consent.manage',
-		defaultMessage: 'Manage preferences',
-	},
-})
-
-async function manageAdsPreferences() {
-	await open_ads_consent_preferences().catch(handleError)
-}
-
 watch(
 	settings,
 	async () => {
@@ -55,26 +23,18 @@ watch(
 </script>

 <template>
-	<div v-if="adConsentAvailable">
-		<h2 class="m-0 text-lg font-semibold text-contrast">
-			{{ formatMessage(messages.adsConsentTitle) }}
-		</h2>
-		<div class="mt-1 flex flex-col gap-2.5 items-start">
-			<div class="flex flex-col gap-1 items-start">
-				<div class="text-sm">
-					{{ formatMessage(messages.adsConsentIntro) }}
-				</div>
-			</div>
-			<ButtonStyled>
-				<button class="!shadow-none" @click="manageAdsPreferences">
-					<Settings2Icon aria-hidden="true" />
-					{{ formatMessage(messages.adsConsentManage) }}
-				</button>
-			</ButtonStyled>
+	<div class="flex items-center justify-between gap-4">
+		<div>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Personalized ads</h2>
+			<p class="m-0 mt-1 text-sm">
+				Modrinth's ad provider, Aditude, shows ads based on your preferences. By disabling this
+				option, you opt out and ads will no longer be shown based on your interests.
+			</p>
 		</div>
+		<Toggle id="personalized-ads" v-model="settings.personalized_ads" />
 	</div>

-	<div class="mt-8 flex items-center justify-between gap-4">
+	<div class="mt-4 flex items-center justify-between gap-4">
 		<div>
 			<h2 class="m-0 text-lg font-semibold text-contrast">Telemetry</h2>
 			<p class="m-0 mt-1 text-sm">
@@ -1,5 +1,5 @@
 <script setup>
-import { BoxIcon, FolderOpenIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
+import { BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
 import { ButtonStyled, injectNotificationManager, Slider, StyledInput } from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
 import { ref, watch } from 'vue'
@@ -7,13 +7,9 @@ import { ref, watch } from 'vue'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 import { purge_cache_types } from '@/helpers/cache.js'
 import { get, set } from '@/helpers/settings.ts'
-import { showAppDbBackupsFolder } from '@/helpers/utils.js'
-import { useTheming } from '@/store/state'

 const { handleError } = injectNotificationManager()
-const themeStore = useTheming()
 const settings = ref(await get())
-const purgeCacheConfirmModal = ref(null)

 watch(
 	settings,
@@ -52,19 +48,6 @@ async function purgeCache() {
 	]).catch(handleError)
 }

-function handlePurgeCacheClick() {
-	if (themeStore.getFeatureFlag('skip_non_essential_warnings')) {
-		void purgeCache()
-		return
-	}
-
-	purgeCacheConfirmModal.value?.show()
-}
-
-async function openDbBackupsFolder() {
-	await showAppDbBackupsFolder().catch(handleError)
-}
-
 async function findLauncherDir() {
 	const newDir = await open({
 		multiple: false,
@@ -114,7 +97,7 @@ async function findLauncherDir() {
 				@proceed="purgeCache"
 			/>
 			<h2 class="m-0 text-lg font-semibold text-contrast">App cache</h2>
-			<button id="purge-cache" class="btn min-w-max" @click="handlePurgeCacheClick">
+			<button id="purge-cache" class="btn min-w-max" @click="$refs.purgeCacheConfirmModal.show()">
 				<TrashIcon />
 				Purge cache
 			</button>
@@ -153,16 +136,5 @@ async function findLauncherDir() {
 				value if you are frequently getting I/O errors. (app restart required to take effect)
 			</p>
 		</div>
-
-		<div class="flex flex-col gap-2.5">
-			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">App database backups</h2>
-			<button id="open-db-backups-folder" class="btn min-w-max" @click="openDbBackupsFolder">
-				<FolderOpenIcon />
-				Open backups folder
-			</button>
-			<p class="m-0 leading-tight text-secondary">
-				Backups of important app data are stored here in case you need to recover them later.
-			</p>
-		</div>
 	</div>
 </template>
@@ -1,100 +0,0 @@
-<template>
-	<NewModal ref="modal" :header="formatMessage(messages.header)" fade="warning" max-width="500px">
-		<p class="m-0 text-secondary">
-			<IntlFormatted :message-id="messages.body" :values="{ instanceName }">
-				<template #bold="{ children }">
-					<span class="font-medium text-contrast"><component :is="() => children" /></span>
-				</template>
-			</IntlFormatted>
-		</p>
-
-		<template #actions>
-			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="handleGoToInstance">
-						{{ formatMessage(messages.instance) }}
-						<RightArrowIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button @click="handleInstallAnyway">
-						<DownloadIcon />
-						{{ formatMessage(messages.installAnyway) }}
-					</button>
-				</ButtonStyled>
-			</div>
-		</template>
-	</NewModal>
-</template>
-
-<script setup lang="ts">
-import { DownloadIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	commonMessages,
-	defineMessages,
-	IntlFormatted,
-	NewModal,
-	useVIntl,
-} from '@modrinth/ui'
-import { ref } from 'vue'
-
-const { formatMessage } = useVIntl()
-
-const messages = defineMessages({
-	header: {
-		id: 'app.instance.shared-instance-already-installed.header',
-		defaultMessage: 'Shared instance already installed',
-	},
-	body: {
-		id: 'app.instance.shared-instance-already-installed.body',
-		defaultMessage:
-			'This shared instance is already installed as <bold>{instanceName}</bold>. Are you sure you want to install another copy?',
-	},
-	instance: {
-		id: 'app.instance.shared-instance-already-installed.instance',
-		defaultMessage: 'Instance',
-	},
-	installAnyway: {
-		id: 'app.instance.shared-instance-already-installed.install-anyway',
-		defaultMessage: 'Install anyway',
-	},
-})
-
-const emit = defineEmits<{
-	(e: 'cancel' | 'go-to-instance' | 'install-anyway'): void
-}>()
-
-const modal = ref<InstanceType<typeof NewModal>>()
-const instanceName = ref('')
-
-function show(name: string) {
-	instanceName.value = name
-	modal.value?.show()
-}
-
-function handleCancel() {
-	modal.value?.hide()
-	emit('cancel')
-}
-
-function handleGoToInstance() {
-	modal.value?.hide()
-	emit('go-to-instance')
-}
-
-function handleInstallAnyway() {
-	modal.value?.hide()
-	emit('install-anyway')
-}
-
-defineExpose({
-	show,
-})
-</script>
@@ -1,195 +0,0 @@
-<template>
-	<div v-if="canUnpublish" class="flex flex-col gap-2.5">
-		<span class="text-lg font-semibold text-contrast">{{ formatMessage(messages.title) }}</span>
-		<div>
-			<ButtonStyled color="orange">
-				<button :disabled="busy" @click="unpublishModal?.show()">
-					<SpinnerIcon v-if="unpublishing" class="animate-spin" />
-					<UnlinkIcon v-else class="size-5" />
-					{{ formatMessage(unpublishing ? messages.unpublishingButton : messages.unpublishButton) }}
-				</button>
-			</ButtonStyled>
-		</div>
-		<span class="text-primary">{{ formatMessage(messages.unpublishDescription) }}</span>
-	</div>
-	<div v-if="canUnlink" class="flex flex-col gap-2.5">
-		<span class="text-lg font-semibold text-contrast">{{
-			formatMessage(messages.linkedTitle)
-		}}</span>
-		<div>
-			<ButtonStyled color="orange">
-				<button :disabled="busy" @click="unlinkModal?.show()">
-					<SpinnerIcon v-if="unlinking" class="animate-spin" />
-					<UnlinkIcon v-else class="size-5" />
-					{{ formatMessage(unlinking ? messages.unlinkingButton : messages.unlinkButton) }}
-				</button>
-			</ButtonStyled>
-		</div>
-		<span class="text-primary">{{ formatMessage(messages.unlinkDescription) }}</span>
-	</div>
-
-	<NewModal
-		ref="unpublishModal"
-		:header="formatMessage(messages.unpublishModalHeader)"
-		fade="warning"
-		max-width="500px"
-	>
-		<Admonition type="warning" :header="formatMessage(messages.unpublishModalAdmonitionHeader)">{{
-			formatMessage(messages.unpublishModalBody)
-		}}</Admonition>
-		<template #actions
-			><div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined"
-					><button class="!border" @click="unpublishModal?.hide()">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button></ButtonStyled
-				><ButtonStyled color="orange"
-					><button :disabled="busy" @click="confirmUnpublish">
-						<UnlinkIcon />{{ formatMessage(messages.unpublishButton) }}
-					</button></ButtonStyled
-				>
-			</div></template
-		>
-	</NewModal>
-	<NewModal
-		ref="unlinkModal"
-		:header="formatMessage(messages.unlinkModalHeader)"
-		fade="warning"
-		max-width="500px"
-		:on-hide="() => backupCreator?.cancelBackup()"
-	>
-		<div class="flex flex-col gap-6">
-			<Admonition type="warning" :header="formatMessage(messages.unlinkModalAdmonitionHeader)">{{
-				formatMessage(messages.unlinkModalBody)
-			}}</Admonition>
-			<InlineBackupCreator
-				ref="backupCreator"
-				backup-name="Before unlinking shared instance"
-				@update:buttons-disabled="backupBusy = $event"
-			/>
-		</div>
-		<template #actions
-			><div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined"
-					><button class="!border" @click="unlinkModal?.hide()">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button></ButtonStyled
-				><ButtonStyled color="orange"
-					><button :disabled="busy || backupBusy" @click="confirmUnlink">
-						<UnlinkIcon />{{ formatMessage(messages.unlinkButton) }}
-					</button></ButtonStyled
-				>
-			</div></template
-		>
-	</NewModal>
-</template>
-
-<script setup lang="ts">
-import { SpinnerIcon, UnlinkIcon, XIcon } from '@modrinth/assets'
-import {
-	Admonition,
-	ButtonStyled,
-	commonMessages,
-	defineMessages,
-	InlineBackupCreator,
-	NewModal,
-	useVIntl,
-} from '@modrinth/ui'
-import { ref } from 'vue'
-
-const props = withDefaults(
-	defineProps<{
-		canUnpublish?: boolean
-		canUnlink?: boolean
-		busy: boolean
-		unpublishing?: boolean
-		unlinking?: boolean
-		unpublish?: () => Promise<void>
-		unlink?: () => Promise<void>
-	}>(),
-	{
-		canUnpublish: false,
-		canUnlink: false,
-		unpublishing: false,
-		unlinking: false,
-		unpublish: undefined,
-		unlink: undefined,
-	},
-)
-const { formatMessage } = useVIntl()
-const unpublishModal = ref<InstanceType<typeof NewModal>>()
-const unlinkModal = ref<InstanceType<typeof NewModal>>()
-const backupCreator = ref<InstanceType<typeof InlineBackupCreator>>()
-const backupBusy = ref(false)
-
-async function confirmUnpublish() {
-	unpublishModal.value?.hide()
-	await props.unpublish?.()
-}
-async function confirmUnlink() {
-	unlinkModal.value?.hide()
-	await props.unlink?.()
-}
-
-const messages = defineMessages({
-	title: {
-		id: 'installation-settings.shared-instance.title',
-		defaultMessage: 'Unpublish instance',
-	},
-	linkedTitle: {
-		id: 'installation-settings.shared-instance.linked-title',
-		defaultMessage: 'Linked shared instance',
-	},
-	unpublishButton: {
-		id: 'installation-settings.shared-instance.unpublish-button',
-		defaultMessage: 'Unpublish shared instance',
-	},
-	unpublishingButton: {
-		id: 'installation-settings.shared-instance.unpublishing-button',
-		defaultMessage: 'Unpublishing...',
-	},
-	unpublishDescription: {
-		id: 'installation-settings.shared-instance.unpublish-description',
-		defaultMessage:
-			'Remove this shared instance from Modrinth and stop sending updates to anyone using it. Your local instance will not be affected.',
-	},
-	unlinkButton: {
-		id: 'installation-settings.shared-instance.unlink-button',
-		defaultMessage: 'Unlink shared instance',
-	},
-	unlinkingButton: {
-		id: 'installation-settings.shared-instance.unlinking-button',
-		defaultMessage: 'Unlinking...',
-	},
-	unlinkDescription: {
-		id: 'installation-settings.shared-instance.unlink-description',
-		defaultMessage: 'Disconnect this local instance from future shared updates.',
-	},
-	unpublishModalHeader: {
-		id: 'installation-settings.unpublish-shared-instance.modal.header',
-		defaultMessage: 'Unpublish shared instance',
-	},
-	unpublishModalAdmonitionHeader: {
-		id: 'installation-settings.unpublish-shared-instance.modal.admonition-header',
-		defaultMessage: 'Unpublishing shared instance',
-	},
-	unpublishModalBody: {
-		id: 'installation-settings.unpublish-shared-instance.modal.admonition-body',
-		defaultMessage:
-			"This deletes the shared instance from Modrinth's servers. People using it in the Modrinth App will stop receiving updates, but your local instance and its content will stay on this device.",
-	},
-	unlinkModalHeader: {
-		id: 'installation-settings.unlink-shared-instance.modal.header',
-		defaultMessage: 'Unlink shared instance',
-	},
-	unlinkModalAdmonitionHeader: {
-		id: 'installation-settings.unlink-shared-instance.modal.admonition-header',
-		defaultMessage: 'Unlinking shared instance',
-	},
-	unlinkModalBody: {
-		id: 'installation-settings.unlink-shared-instance.modal.admonition-body',
-		defaultMessage:
-			'This only affects your local instance. Your installed content will stay on this device, and the shared instance and other people using it will not be affected.',
-	},
-})
-</script>
@@ -1,189 +0,0 @@
-<template>
-	<ContentDiffModal
-		ref="publishReviewModal"
-		:header="formatMessage(messages.header)"
-		:admonition-header="formatMessage(messages.admonitionHeader)"
-		:description="formatMessage(messages.description)"
-		:diffs="publishDiffs"
-		:confirm-label="formatMessage(messages.publishButton)"
-		:confirm-icon="UploadIcon"
-		:confirm-disabled="publishDiffs.length === 0 && selectedConfigPaths.length === 0"
-		:added-label="formatMessage(messages.addedLabel)"
-		:removed-label="formatMessage(messages.removedLabel)"
-		@confirm="publishChanges"
-		@cancel="finishReview"
-	>
-		<template #additional-content>
-			<Accordion
-				class="min-w-0"
-				overflow-visible
-				button-class="w-full bg-transparent m-0 p-0 border-none"
-			>
-				<template #title>
-					<FileCogIcon class="size-4 shrink-0 text-primary" />
-					<span class="text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.configTitle) }}
-					</span>
-				</template>
-				<div class="flex min-w-0 flex-col gap-3 pt-4">
-					<div class="max-h-[292px] overflow-y-auto rounded-[20px]">
-						<FileTreeSelect
-							v-model="selectedConfigPaths"
-							:items="configFileItems"
-							:show-size="false"
-							:show-modified="false"
-						/>
-					</div>
-				</div>
-			</Accordion>
-		</template>
-	</ContentDiffModal>
-</template>
-
-<script setup lang="ts">
-import { FileCogIcon, UploadIcon } from '@modrinth/assets'
-import {
-	Accordion,
-	type ContentDiffItem,
-	ContentDiffModal,
-	defineMessages,
-	FileTreeSelect,
-	type FileTreeSelectItem,
-	useVIntl,
-} from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
-import {
-	getSharedInstanceUnavailableReason,
-	isSharedInstanceUnavailableError,
-} from '@/helpers/install'
-import { get_shared_instance_publish_preview, publish_shared_instance } from '@/helpers/instance'
-import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
-import type { GameInstance } from '@/helpers/types'
-
-type SharedInstancePublishState = 'idle' | 'reviewing' | 'publishing'
-
-const props = defineProps<{
-	instance: GameInstance
-}>()
-
-const emit = defineEmits<{
-	published: []
-	'state-change': [state: SharedInstancePublishState]
-}>()
-
-const { formatMessage } = useVIntl()
-const { notifySharedInstanceError, notifySharedInstanceUnavailable } = useSharedInstanceErrors()
-const publishReviewModal = ref<InstanceType<typeof ContentDiffModal>>()
-const publishDiffs = ref<ContentDiffItem[]>([])
-const configFilePaths = ref<string[]>([])
-const selectedConfigPaths = ref<string[]>([])
-const state = ref<SharedInstancePublishState>('idle')
-const configFileItems = computed<FileTreeSelectItem[]>(() =>
-	configFilePaths.value.map((path) => ({ path, type: 'file' })),
-)
-
-async function show(e?: MouseEvent) {
-	if (state.value !== 'idle') return
-
-	setState('reviewing')
-	let reviewOpened = false
-	try {
-		const preview = await get_shared_instance_publish_preview(props.instance.id)
-		if (!preview) {
-			notifySharedInstanceUnavailable()
-			emit('published')
-			return
-		}
-
-		publishDiffs.value = preview.diffs.map((diff) => ({
-			type: diff.type,
-			projectName: diff.projectName ?? undefined,
-			fileName: diff.fileName ?? undefined,
-			currentVersionName: diff.currentVersionName ?? undefined,
-			newVersionName: diff.newVersionName ?? undefined,
-			fileCount: diff.configFileCount ?? undefined,
-			disabled: diff.disabled,
-		}))
-		configFilePaths.value = preview.configFiles
-		selectedConfigPaths.value = []
-		if (!publishReviewModal.value) return
-
-		publishReviewModal.value.show(e)
-		reviewOpened = true
-	} catch (error) {
-		handlePublishError(error)
-	} finally {
-		if (!reviewOpened) finishReview()
-	}
-}
-
-async function publishChanges() {
-	if (state.value !== 'reviewing') return
-
-	setState('publishing')
-	try {
-		await publish_shared_instance(props.instance.id, selectedConfigPaths.value)
-		emit('published')
-	} catch (error) {
-		handlePublishError(error)
-	} finally {
-		setState('idle')
-	}
-}
-
-function finishReview() {
-	if (state.value === 'reviewing') {
-		setState('idle')
-	}
-}
-
-function handlePublishError(error: unknown) {
-	if (isSharedInstanceUnavailableError(error)) {
-		notifySharedInstanceUnavailable(getSharedInstanceUnavailableReason(error))
-		emit('published')
-		return
-	}
-
-	notifySharedInstanceError(error)
-}
-
-function setState(nextState: SharedInstancePublishState) {
-	state.value = nextState
-	emit('state-change', nextState)
-}
-
-const messages = defineMessages({
-	header: {
-		id: 'instance.shared-instance.publish-review.header',
-		defaultMessage: 'Review changes',
-	},
-	admonitionHeader: {
-		id: 'instance.shared-instance.publish-review.admonition-header',
-		defaultMessage: 'Push update to players',
-	},
-	description: {
-		id: 'instance.shared-instance.publish-review.description',
-		defaultMessage:
-			'Review the content changes and choose any config files to include in this update.',
-	},
-	publishButton: {
-		id: 'instance.shared-instance.publish-review.publish-button',
-		defaultMessage: 'Push update',
-	},
-	addedLabel: {
-		id: 'instance.shared-instance.publish-review.added-label',
-		defaultMessage: 'Added',
-	},
-	removedLabel: {
-		id: 'instance.shared-instance.publish-review.removed-label',
-		defaultMessage: 'Removed',
-	},
-	configTitle: {
-		id: 'instance.shared-instance.publish-review.config-title-v2',
-		defaultMessage: 'Select config files',
-	},
-})
-
-defineExpose({ show })
-</script>
@@ -1,134 +0,0 @@
-<template>
-	<ContentDiffModal
-		ref="modal"
-		:header="formatMessage(messages.updateToPlay)"
-		:admonition-header="formatMessage(messages.updateRequired)"
-		:description="instance ? formatMessage(messages.description, { name: instance.name }) : ''"
-		:diffs="diffs"
-		:confirm-label="formatMessage(commonMessages.updateButton)"
-		:confirm-icon="DownloadIcon"
-		:added-label="formatMessage(messages.addedLabel)"
-		:removed-label="formatMessage(messages.removedLabel)"
-		show-report-button
-		show-external-warnings
-		:external-warning-description="formatMessage(messages.externalWarningDescription)"
-		@confirm="update"
-		@cancel="emit('cancel')"
-		@report="emit('report', $event)"
-	/>
-</template>
-
-<script setup lang="ts">
-import { DownloadIcon } from '@modrinth/assets'
-import {
-	commonMessages,
-	type ContentDiffItem,
-	ContentDiffModal,
-	defineMessages,
-	useVIntl,
-} from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
-import {
-	getSharedInstanceUnavailableReason,
-	install_update_shared_instance,
-	isSharedInstanceUnavailableError,
-	type SharedInstanceUnavailableReason,
-	type SharedInstanceUpdatePreview,
-	wait_for_install_job,
-} from '@/helpers/install'
-import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
-import type { GameInstance } from '@/helpers/types'
-
-type UpdateCompleteCallback = () => void | Promise<void>
-
-const emit = defineEmits<{
-	cancel: []
-	complete: []
-	report: [event?: MouseEvent]
-	sharedInstanceUnavailable: [reason: SharedInstanceUnavailableReason | null]
-}>()
-const modal = ref<InstanceType<typeof ContentDiffModal>>()
-const instance = ref<GameInstance | null>(null)
-const preview = ref<SharedInstanceUpdatePreview | null>(null)
-const onComplete = ref<UpdateCompleteCallback>(() => {})
-const { formatMessage } = useVIntl()
-const { notifySharedInstanceError } = useSharedInstanceErrors()
-const diffs = computed<ContentDiffItem[]>(
-	() =>
-		preview.value?.diffs
-			// TODO: This is TEMP!!! Hashing needs to be done on backend
-			.filter((diff) => !(diff.type === 'updated' && !diff.projectId && diff.fileName))
-			.map((diff) => ({
-				type: diff.type,
-				projectName: diff.projectName ?? undefined,
-				fileName: diff.fileName ?? undefined,
-				currentVersionName: diff.currentVersionName ?? undefined,
-				newVersionName: diff.newVersionName ?? undefined,
-				fileCount: diff.configFileCount ?? undefined,
-				disabled: diff.disabled,
-				external: diff.type === 'added' && !diff.projectId && !!diff.fileName,
-			})) ?? [],
-)
-
-async function update() {
-	try {
-		if (instance.value) {
-			const job = await install_update_shared_instance(instance.value.id)
-			await wait_for_install_job(job.job_id)
-			await onComplete.value()
-		}
-	} catch (error) {
-		if (isSharedInstanceUnavailableError(error)) {
-			emit('sharedInstanceUnavailable', getSharedInstanceUnavailableReason(error))
-			return
-		}
-		notifySharedInstanceError(error)
-	} finally {
-		emit('complete')
-	}
-}
-
-function show(
-	instanceValue: GameInstance,
-	previewValue: SharedInstanceUpdatePreview,
-	callback: UpdateCompleteCallback = () => {},
-	event?: MouseEvent,
-) {
-	instance.value = instanceValue
-	preview.value = previewValue
-	onComplete.value = callback
-	modal.value?.show(event)
-}
-function hide() {
-	modal.value?.hide()
-}
-
-const messages = defineMessages({
-	updateToPlay: { id: 'app.modal.update-to-play.header', defaultMessage: 'Update to play' },
-	updateRequired: {
-		id: 'app.modal.update-to-play.update-required',
-		defaultMessage: 'Update required',
-	},
-	description: {
-		id: 'app.modal.update-to-play.update-required-description',
-		defaultMessage:
-			'An update is required to play {name}. Please update to latest version to launch the game.',
-	},
-	addedLabel: {
-		id: 'app.modal.update-to-play.shared-instance-added-label',
-		defaultMessage: 'Added',
-	},
-	removedLabel: {
-		id: 'app.modal.update-to-play.shared-instance-removed-label',
-		defaultMessage: 'Removed',
-	},
-	externalWarningDescription: {
-		id: 'app.modal.update-to-play.shared-instance-unknown-files-description',
-		defaultMessage:
-			'This shared instance update contains files that aren’t published on Modrinth. We strongly recommend only installing files from sources you trust.',
-	},
-})
-
-defineExpose({ show, hide })
-</script>
@@ -1,533 +0,0 @@
-<template>
-	<NewModal
-		ref="modal"
-		:header="
-			reportMode
-				? formatMessage(messages.reportSharedInstance)
-				: formatMessage(messages.installToPlay)
-		"
-		:closable="!submitLoading"
-		:on-hide="handleHide"
-		:max-width="reportMode ? '816px' : '544px'"
-		:width="reportMode ? '816px' : '544px'"
-		:no-padding="reportMode"
-		:scrollable="reportMode"
-	>
-		<div v-if="preview" class="flex w-full flex-col gap-6" :class="{ 'p-6 pb-2': reportMode }">
-			<Admonition v-if="reportMode" type="info">
-				<div class="flex flex-col gap-2">
-					<p class="m-0">
-						<IntlFormatted :message-id="messages.reportDescription">
-							<template #rules-link="{ children }">
-								<AutoLink class="text-link hover:underline" to="https://modrinth.com/legal/rules">
-									<component :is="() => children" />
-								</AutoLink>
-							</template>
-							<template #terms-link="{ children }">
-								<AutoLink class="text-link hover:underline" to="https://modrinth.com/legal/terms">
-									<component :is="() => children" />
-								</AutoLink>
-							</template>
-						</IntlFormatted>
-					</p>
-					<ul class="m-0 list-disc pl-5">
-						<li>
-							<IntlFormatted :message-id="messages.supportAndBugReports">
-								<template #support-link="{ children }">
-									<AutoLink class="text-link hover:underline" to="https://support.modrinth.com">
-										<component :is="() => children" />
-									</AutoLink>
-								</template>
-								<template #github-link="{ children }">
-									<AutoLink
-										class="text-link hover:underline"
-										to="https://github.com/modrinth/code/issues"
-									>
-										<component :is="() => children" />
-									</AutoLink>
-								</template>
-							</IntlFormatted>
-						</li>
-						<li>
-							<IntlFormatted :message-id="messages.legalClaims">
-								<template #copyright-link="{ children }">
-									<AutoLink
-										class="text-link hover:underline"
-										to="https://modrinth.com/legal/copyright"
-									>
-										<component :is="() => children" />
-									</AutoLink>
-								</template>
-							</IntlFormatted>
-						</li>
-					</ul>
-				</div>
-			</Admonition>
-			<p v-else class="m-0 text-primary">
-				{{ formatMessage(messages.inviteWarning) }}
-			</p>
-			<SharedInstanceInstallSummary
-				:preview="preview"
-				:heading="reportMode ? formatMessage(messages.contentYouAreReporting) : undefined"
-				@view-contents="openViewContents"
-			/>
-			<Transition
-				enter-active-class="overflow-hidden transition-all duration-200 ease-out"
-				enter-from-class="max-h-0 opacity-0"
-				enter-to-class="max-h-[400px] opacity-100"
-				leave-active-class="overflow-hidden transition-all duration-200 ease-in"
-				leave-from-class="max-h-[400px] opacity-100"
-				leave-to-class="max-h-0 opacity-0"
-			>
-				<div v-if="reportMode" class="flex flex-col gap-6">
-					<div class="flex flex-col gap-2.5">
-						<span class="font-semibold text-contrast">
-							{{ formatMessage(messages.reportReason) }}
-						</span>
-						<Combobox v-model="reportReason" :options="reportReasonOptions" />
-					</div>
-					<div class="flex flex-col gap-2.5">
-						<span class="font-semibold text-contrast">
-							{{ formatMessage(messages.additionalContext) }}
-						</span>
-						<MarkdownEditor
-							v-model="additionalContext"
-							:placeholder="formatMessage(messages.additionalContextPlaceholder)"
-							:on-image-upload="onImageUpload"
-							:min-height="120"
-							:max-height="240"
-						/>
-					</div>
-					<div v-if="reportOnly" class="flex flex-col gap-2">
-						<Checkbox v-model="deleteInstance" :label="formatMessage(messages.deleteInstance)" />
-					</div>
-				</div>
-			</Transition>
-			<Admonition
-				v-if="!reportMode && hasExternalFiles"
-				type="warning"
-				:header="formatMessage(messages.unknownFilesWarning)"
-			>
-				{{ formatMessage(messages.unknownFilesDescription) }}
-			</Admonition>
-
-			<div v-if="!reportMode && hasExternalFiles" class="relative w-full">
-				<div
-					ref="externalFileTable"
-					class="max-h-[242px] overflow-y-auto rounded-2xl"
-					@scroll="checkTableScrollState"
-				>
-					<Table
-						:columns="externalFileColumns"
-						:data="externalFileRows"
-						row-key="id"
-						virtualized
-						:virtual-row-height="48"
-						class="shadow-sm"
-					>
-						<template #cell-name="{ value }">
-							<span class="block truncate" :title="String(value)">{{ value }}</span>
-						</template>
-					</Table>
-				</div>
-				<Transition
-					enter-active-class="transition-all duration-200 ease-out"
-					enter-from-class="opacity-0 max-h-0"
-					enter-to-class="opacity-100 max-h-2"
-					leave-active-class="transition-all duration-200 ease-in"
-					leave-from-class="opacity-100 max-h-2"
-					leave-to-class="opacity-0 max-h-0"
-				>
-					<div
-						v-if="showTableTopFade"
-						class="pointer-events-none absolute left-0 right-0 top-0 z-10 h-2 bg-gradient-to-b from-bg-raised to-transparent"
-					/>
-				</Transition>
-				<Transition
-					enter-active-class="transition-all duration-200 ease-out"
-					enter-from-class="opacity-0 max-h-0"
-					enter-to-class="opacity-100 max-h-2"
-					leave-active-class="transition-all duration-200 ease-in"
-					leave-from-class="opacity-100 max-h-2"
-					leave-to-class="opacity-0 max-h-0"
-				>
-					<div
-						v-if="showTableBottomFade"
-						class="pointer-events-none absolute bottom-0 left-0 right-0 z-10 h-2 bg-gradient-to-t from-bg-raised to-transparent"
-					/>
-				</Transition>
-			</div>
-
-			<p v-if="!reportMode && hasExternalFiles" class="m-0 text-primary">
-				{{ formatMessage(messages.reviewedFiles) }}
-			</p>
-			<div v-if="!reportMode" class="flex w-full items-center justify-between gap-2">
-				<ButtonStyled color="red" type="transparent">
-					<button @click="reportMode = true">
-						<ReportIcon />{{ formatMessage(commonMessages.reportButton) }}
-					</button>
-				</ButtonStyled>
-				<div class="flex items-center gap-2">
-					<template v-if="hasExternalFiles">
-						<ButtonStyled type="transparent" color="orange">
-							<button @click="accept">
-								{{ formatMessage(messages.installAnyway) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleCancel">
-								<BanIcon />{{ formatMessage(messages.dontInstall) }}
-							</button>
-						</ButtonStyled>
-					</template>
-					<template v-else>
-						<ButtonStyled type="outlined">
-							<button class="!border" @click="handleCancel">
-								<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="accept">
-								<DownloadIcon />{{ formatMessage(messages.installButton) }}
-							</button>
-						</ButtonStyled>
-					</template>
-				</div>
-			</div>
-		</div>
-		<template v-if="reportMode" #actions>
-			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button class="!border" :disabled="submitLoading" @click="handleCancel">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!canSubmitReport" @click="submitReport">
-						<SpinnerIcon v-if="submitLoading" class="animate-spin" />
-						<SendIcon v-else />
-						{{ formatMessage(commonMessages.reportButton) }}
-					</button>
-				</ButtonStyled>
-			</div>
-		</template>
-	</NewModal>
-	<ModpackContentModal
-		ref="contentModal"
-		:header="formatMessage(messages.sharedInstanceContent)"
-		:modpack-name="preview?.name ?? ''"
-		:modpack-icon-url="preview?.iconUrl ?? undefined"
-	/>
-</template>
-
-<script setup lang="ts">
-import type { Labrinth } from '@modrinth/api-client'
-import { BanIcon, DownloadIcon, ReportIcon, SendIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
-import {
-	Admonition,
-	AutoLink,
-	ButtonStyled,
-	Checkbox,
-	Combobox,
-	type ComboboxOption,
-	commonMessages,
-	defineMessages,
-	injectModrinthClient,
-	injectNotificationManager,
-	IntlFormatted,
-	MarkdownEditor,
-	ModpackContentModal,
-	NewModal,
-	Table,
-	type TableColumn,
-	useScrollIndicator,
-	useVIntl,
-} from '@modrinth/ui'
-import { computed, nextTick, ref } from 'vue'
-
-import { hide_ads_window, show_ads_window } from '@/helpers/ads'
-import { toError } from '@/helpers/errors'
-import type { SharedInstanceInstallPreview } from '@/helpers/install'
-import { create_report } from '@/helpers/reports'
-
-import SharedInstanceInstallSummary from './shared-instance-install-summary.vue'
-import { useSharedInstancePreviewContent } from './use-shared-instance-preview-content'
-
-type ExternalFileColumn = 'name'
-type ExternalFileRow = {
-	id: string
-	name: string
-}
-
-const modal = ref<InstanceType<typeof NewModal>>()
-const contentModal = ref<InstanceType<typeof ModpackContentModal>>()
-const externalFileTable = ref<HTMLElement | null>(null)
-const preview = ref<SharedInstanceInstallPreview | null>(null)
-const install = ref<() => void | Promise<void>>(() => {})
-const reportMode = ref(false)
-const reportOnly = ref(false)
-type ReportReason = 'malicious' | 'inappropriate' | 'spam'
-const reportReason = ref<ReportReason>('malicious')
-const additionalContext = ref('')
-const deleteInstance = ref(true)
-const submitLoading = ref(false)
-const uploadedImageIDs = ref<string[]>([])
-const emit = defineEmits<{
-	reported: [deleteInstance: boolean]
-}>()
-const { formatMessage } = useVIntl()
-const client = injectModrinthClient()
-const { addNotification, handleError } = injectNotificationManager()
-const { load } = useSharedInstancePreviewContent()
-const {
-	showTopFade: showTableTopFade,
-	showBottomFade: showTableBottomFade,
-	checkScrollState: checkTableScrollState,
-	forceCheck: forceCheckTableScroll,
-} = useScrollIndicator(externalFileTable)
-const hasExternalFiles = computed(() => Boolean(preview.value?.externalFiles.length))
-const externalFileRows = computed<ExternalFileRow[]>(() =>
-	(preview.value?.externalFiles ?? [])
-		.map((file, index) => ({
-			id: `${index}-${file.fileType}-${file.fileName}`,
-			name: file.fileName,
-		}))
-		.sort((left, right) => left.name.localeCompare(right.name)),
-)
-const reportReasonOptions = computed<ComboboxOption<ReportReason>[]>(() => [
-	{ value: 'malicious', label: formatMessage(messages.maliciousReason) },
-	{ value: 'inappropriate', label: formatMessage(messages.inappropriateReason) },
-	{ value: 'spam', label: formatMessage(messages.spamReason) },
-])
-const canSubmitReport = computed(
-	() => Boolean(preview.value && additionalContext.value.trim()) && !submitLoading.value,
-)
-
-async function accept() {
-	hide()
-	try {
-		await install.value()
-	} catch (error) {
-		console.error('Failed to install shared instance:', error)
-	}
-}
-async function openViewContents() {
-	if (!preview.value) return
-	contentModal.value?.showLoading()
-	try {
-		contentModal.value?.show(await load(preview.value))
-	} catch (error) {
-		console.error('Failed to load shared instance contents:', error)
-		contentModal.value?.show([])
-	}
-}
-async function submitReport() {
-	const reportPreview = preview.value
-	const body = additionalContext.value.trim()
-	if (!reportPreview || !body || submitLoading.value) return
-
-	submitLoading.value = true
-	try {
-		const uploadedImages = uploadedImageIDs.value.slice(-10)
-		await create_report({
-			report_type: reportReason.value,
-			item_type: 'shared-instance',
-			item_id: `${reportPreview.sharedInstanceId}/${reportPreview.version}`,
-			body,
-			uploaded_images: uploadedImages,
-		})
-
-		const shouldDeleteInstance = reportOnly.value && deleteInstance.value
-		hide()
-		addNotification({
-			type: 'success',
-			title: formatMessage(messages.reportSubmitted),
-		})
-		emit('reported', shouldDeleteInstance)
-	} catch (error) {
-		handleError(toError(error))
-	} finally {
-		submitLoading.value = false
-	}
-}
-async function onImageUpload(file: File) {
-	const imageExtensionByType: Partial<Record<string, Labrinth.Images.v3.ImageExtension>> = {
-		'image/gif': 'gif',
-		'image/jpeg': 'jpeg',
-		'image/png': 'png',
-		'image/webp': 'webp',
-	}
-	const extension = imageExtensionByType[file.type]
-	if (!extension) {
-		throw new Error(formatMessage(messages.invalidImageType))
-	}
-	if (file.size > 1024 * 1024) {
-		throw new Error(formatMessage(messages.imageTooLarge))
-	}
-
-	const image = await client.labrinth.images_v3.uploadImage(file, extension, {
-		context: 'report',
-	}).promise
-	uploadedImageIDs.value.push(image.id)
-	return image.url
-}
-function handleCancel() {
-	if (reportMode.value && !reportOnly.value) {
-		reportMode.value = false
-		void nextTick(() => forceCheckTableScroll())
-		return
-	}
-	hide()
-}
-function handleHide() {
-	resetReportState()
-	show_ads_window()
-}
-function resetReportState() {
-	reportMode.value = false
-	reportOnly.value = false
-	reportReason.value = 'malicious'
-	additionalContext.value = ''
-	deleteInstance.value = true
-	submitLoading.value = false
-	uploadedImageIDs.value = []
-}
-function show(
-	previewValue: SharedInstanceInstallPreview,
-	installValue: () => void | Promise<void>,
-	event?: MouseEvent,
-) {
-	resetReportState()
-	install.value = installValue
-	showPreview(previewValue, event)
-}
-function showReport(previewValue: SharedInstanceInstallPreview, event?: MouseEvent) {
-	resetReportState()
-	reportMode.value = true
-	reportOnly.value = true
-	install.value = () => {}
-	showPreview(previewValue, event)
-}
-function showPreview(previewValue: SharedInstanceInstallPreview, event?: MouseEvent) {
-	preview.value = previewValue
-	hide_ads_window()
-	modal.value?.show(event)
-	void nextTick(() => forceCheckTableScroll())
-}
-function hide() {
-	modal.value?.hide()
-}
-
-const messages = defineMessages({
-	installToPlay: { id: 'app.modal.install-to-play.header', defaultMessage: 'Install to play' },
-	reportSharedInstance: {
-		id: 'app.modal.install-to-play.report-shared-instance-header',
-		defaultMessage: 'Report shared instance',
-	},
-	reportSubmitted: {
-		id: 'app.modal.install-to-play.report-submitted',
-		defaultMessage: 'Report submitted',
-	},
-	sharedInstanceContent: {
-		id: 'app.modal.install-to-play.shared-instance-content',
-		defaultMessage: 'Shared instance content',
-	},
-	inviteWarning: {
-		id: 'app.modal.install-to-play.invite-warning',
-		defaultMessage:
-			'This invite was created by another Modrinth user, not Modrinth. Only accept invites from people you trust.',
-	},
-	reportDescription: {
-		id: 'app.modal.install-to-play.report-description',
-		defaultMessage:
-			'Use this form to report instances that may violate our <rules-link>Rules</rules-link> or <terms-link>Terms of Use</terms-link>.',
-	},
-	supportAndBugReports: {
-		id: 'app.modal.install-to-play.report-support-and-bugs',
-		defaultMessage:
-			'For support requests, contact our <support-link>support team</support-link>. For bug reports, open a <github-link>GitHub issue</github-link>.',
-	},
-	legalClaims: {
-		id: 'app.modal.install-to-play.report-legal-claims',
-		defaultMessage:
-			'For DMCA notices or other legal claims, see our <copyright-link>Copyright Policy</copyright-link>.',
-	},
-	contentYouAreReporting: {
-		id: 'app.modal.install-to-play.content-you-are-reporting',
-		defaultMessage: 'Instance you’re reporting',
-	},
-	reportReason: {
-		id: 'app.modal.install-to-play.report-reason',
-		defaultMessage: 'Which rule does this instance violate?',
-	},
-	maliciousReason: {
-		id: 'app.modal.install-to-play.report-reason.malicious',
-		defaultMessage: 'Malicious',
-	},
-	inappropriateReason: {
-		id: 'app.modal.install-to-play.report-reason.inappropriate',
-		defaultMessage: 'Inappropriate',
-	},
-	spamReason: {
-		id: 'app.modal.install-to-play.report-reason.spam',
-		defaultMessage: 'Spam',
-	},
-	additionalContext: {
-		id: 'app.modal.install-to-play.additional-context',
-		defaultMessage: 'Additional context',
-	},
-	additionalContextPlaceholder: {
-		id: 'app.modal.install-to-play.additional-context-placeholder',
-		defaultMessage: 'Include links and images if possible and relevant',
-	},
-	invalidImageType: {
-		id: 'app.modal.install-to-play.report-image-invalid-type',
-		defaultMessage: 'File is not an accepted image type',
-	},
-	imageTooLarge: {
-		id: 'app.modal.install-to-play.report-image-too-large',
-		defaultMessage: 'File exceeds the 1 MiB size limit',
-	},
-	deleteInstance: {
-		id: 'app.modal.install-to-play.delete-instance',
-		defaultMessage: 'Delete instance',
-	},
-	unknownFilesWarning: {
-		id: 'app.modal.install-to-play.unknown-files-warning',
-		defaultMessage: 'Unknown files warning',
-	},
-	unknownFilesDescription: {
-		id: 'app.modal.install-to-play.shared-instance-unknown-files-description',
-		defaultMessage:
-			'This shared instance contains files that aren’t published on Modrinth. We strongly recommend only installing files from sources you trust.',
-	},
-	unrecognizedFiles: {
-		id: 'app.modal.install-to-play.unrecognized-files',
-		defaultMessage: 'Unrecognized files',
-	},
-	reviewedFiles: {
-		id: 'app.modal.install-to-play.reviewed-files',
-		defaultMessage:
-			'A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack).',
-	},
-	installAnyway: {
-		id: 'app.modal.install-to-play.install-anyway',
-		defaultMessage: 'Install anyway',
-	},
-	dontInstall: {
-		id: 'app.modal.install-to-play.external-files-dont-install',
-		defaultMessage: "Don't install",
-	},
-	installButton: { id: 'app.modal.install-to-play.install-button', defaultMessage: 'Install' },
-})
-
-const externalFileColumns = computed<TableColumn<ExternalFileColumn>[]>(() => [
-	{
-		key: 'name',
-		label: formatMessage(messages.unrecognizedFiles),
-		cellClass: '!h-12',
-	},
-])
-
-defineExpose({ show, showReport, hide })
-</script>
@@ -1,60 +0,0 @@
-<template>
-	<div class="flex flex-col gap-2.5">
-		<div class="flex items-center justify-between">
-			<span class="font-semibold text-contrast">{{
-				heading ?? formatMessage(messages.sharedInstance)
-			}}</span>
-			<ButtonStyled type="transparent">
-				<button @click="emit('viewContents')">
-					<EyeIcon />
-					{{ formatMessage(messages.viewContents) }}
-				</button>
-			</ButtonStyled>
-		</div>
-		<div class="flex items-center gap-3 rounded-2xl bg-surface-2 p-3">
-			<Avatar
-				:src="preview.iconUrl"
-				:alt="preview.name"
-				size="56px"
-				no-shadow
-				class="!rounded-2xl"
-			/>
-			<div class="flex min-w-0 flex-col gap-0.5">
-				<span class="truncate font-semibold text-contrast">{{ preview.name }}</span>
-				<span class="truncate text-sm font-medium text-secondary">
-					{{ loaderDisplay }} {{ preview.gameVersion }}
-					<template v-if="preview.modCount">
-						· {{ formatMessage(messages.modCount, { count: preview.modCount }) }}
-					</template>
-				</span>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { EyeIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, defineMessages, formatLoader, useVIntl } from '@modrinth/ui'
-import { computed, toRefs } from 'vue'
-
-import type { SharedInstanceInstallPreview } from '@/helpers/install'
-
-const props = defineProps<{ preview: SharedInstanceInstallPreview; heading?: string }>()
-const { preview, heading } = toRefs(props)
-const emit = defineEmits<{ viewContents: [] }>()
-const { formatMessage } = useVIntl()
-const loaderDisplay = computed(() =>
-	preview.value.loader ? formatLoader(formatMessage, preview.value.loader) : '',
-)
-const messages = defineMessages({
-	sharedInstance: {
-		id: 'app.modal.install-to-play.shared-instance',
-		defaultMessage: 'Shared instance',
-	},
-	viewContents: { id: 'app.modal.install-to-play.view-contents', defaultMessage: 'View contents' },
-	modCount: {
-		id: 'app.modal.install-to-play.mod-count',
-		defaultMessage: '{count, plural, one {# mod} other {# mods}}',
-	},
-})
-</script>
@@ -1,135 +0,0 @@
-import type { Labrinth } from '@modrinth/api-client'
-import type { ContentItem } from '@modrinth/ui'
-
-import { get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
-import type { SharedInstanceInstallPreview } from '@/helpers/install'
-
-type VersionDependency = Labrinth.Versions.v2.Dependency & { version_id?: string }
-
-export function useSharedInstancePreviewContent() {
-	async function load(preview: SharedInstanceInstallPreview): Promise<ContentItem[]> {
-		return [
-			...preview.externalFiles.map(externalFileContentItem),
-			...(await modpackContentItems(preview)),
-			...(await contentItemsFromVersionIds(
-				preview.contentVersionIds.filter((id) => id !== preview.modpackVersionId),
-			)),
-		]
-	}
-
-	async function modpackContentItems(preview: SharedInstanceInstallPreview) {
-		if (!preview.modpackVersionId) return []
-		const version = await get_version(preview.modpackVersionId, 'must_revalidate')
-		return await contentItemsFromDependencies(version?.dependencies ?? [])
-	}
-
-	async function contentItemsFromDependencies(dependencies: Labrinth.Versions.v2.Dependency[]) {
-		const deps = dependencies as VersionDependency[]
-		const projectIds = unique(deps.map((dep) => dep.project_id).filter((id): id is string => !!id))
-		const versionIds = unique(deps.map((dep) => dep.version_id).filter((id): id is string => !!id))
-		const [projects, versions]: [Labrinth.Projects.v2.Project[], Labrinth.Versions.v2.Version[]] =
-			await Promise.all([
-				projectIds.length ? get_project_many(projectIds, 'must_revalidate') : [],
-				versionIds.length ? get_version_many(versionIds, 'must_revalidate') : [],
-			])
-		const projectMap = new Map(projects.map((project) => [project.id, project]))
-		const versionMap = new Map(versions.map((version) => [version.id, version]))
-
-		return deps.map((dependency): ContentItem => {
-			const project = dependency.project_id ? projectMap.get(dependency.project_id) : null
-			const version = dependency.version_id ? versionMap.get(dependency.version_id) : null
-			const fileName =
-				version?.files?.[0]?.filename ?? dependency.file_name ?? project?.title ?? 'Unknown'
-			return contentItem(
-				version?.id ?? project?.id ?? fileName,
-				fileName,
-				project,
-				version,
-				!project && !version,
-				dependency.project_id ?? fileName,
-				dependency.file_name ?? fileName,
-			)
-		})
-	}
-
-	async function contentItemsFromVersionIds(versionIds: string[]) {
-		const versions: Labrinth.Versions.v2.Version[] = versionIds.length
-			? await get_version_many(unique(versionIds), 'must_revalidate')
-			: []
-		const projectIds = unique(versions.map((version) => version.project_id).filter(Boolean))
-		const projects: Labrinth.Projects.v2.Project[] = projectIds.length
-			? await get_project_many(projectIds, 'must_revalidate')
-			: []
-		const projectMap = new Map(projects.map((project) => [project.id, project]))
-		return versions.map((version): ContentItem => {
-			const project = projectMap.get(version.project_id)
-			const fileName = version.files?.[0]?.filename ?? project?.title ?? version.name ?? 'Unknown'
-			return contentItem(
-				version.id,
-				fileName,
-				project,
-				version,
-				false,
-				version.project_id,
-				version.name,
-			)
-		})
-	}
-
-	return { load }
-}
-
-function contentItem(
-	id: string,
-	fileName: string,
-	project?: Labrinth.Projects.v2.Project | null,
-	version?: Labrinth.Versions.v2.Version | null,
-	external = false,
-	fallbackProjectId = id,
-	fallbackTitle = fileName,
-	projectType = project?.project_type ?? 'mod',
-): ContentItem {
-	return {
-		id,
-		file_name: fileName,
-		project_type: projectType,
-		has_update: false,
-		update_version_id: null,
-		external,
-		project: {
-			id: project?.id ?? fallbackProjectId,
-			slug: project?.slug ?? fallbackProjectId,
-			title: project?.title ?? fallbackTitle,
-			icon_url: project?.icon_url ?? undefined,
-		},
-		...(version
-			? {
-					version: {
-						id: version.id,
-						file_name: fileName,
-						version_number: version.version_number ?? undefined,
-						date_published: version.date_published ?? undefined,
-					},
-				}
-			: {}),
-	}
-}
-
-function externalFileContentItem(
-	file: SharedInstanceInstallPreview['externalFiles'][number],
-): ContentItem {
-	return contentItem(
-		`external:${file.fileType}:${file.fileName}`,
-		file.fileName,
-		null,
-		null,
-		true,
-		file.fileName,
-		file.fileName,
-		file.fileType,
-	)
-}
-
-function unique<T>(values: T[]) {
-	return Array.from(new Set(values))
-}
@@ -1,48 +0,0 @@
-<template>
-	<ModrinthAccountRequiredModal ref="accountRequiredModal" :request-auth="requestAuth" />
-	<SharedInstanceInstallModal ref="installModal" />
-	<SharedInstanceAlreadyInstalledModal
-		ref="alreadyInstalledModal"
-		@cancel="handleAlreadyInstalledCancel"
-		@go-to-instance="handleAlreadyInstalledGoToInstance"
-		@install-anyway="handleAlreadyInstalledInstallAnyway"
-	/>
-</template>
-
-<script setup lang="ts">
-import { injectAuth } from '@modrinth/ui'
-import { nextTick, ref } from 'vue'
-
-import ModrinthAccountRequiredModal from '@/components/ui/modal/ModrinthAccountRequiredModal.vue'
-import SharedInstanceInstallModal from '@/components/ui/shared-instances/shared-instance-install-modal/index.vue'
-import SharedInstanceAlreadyInstalledModal from '@/components/ui/shared-instances/SharedInstanceAlreadyInstalledModal.vue'
-import type { ModrinthAuthFlow } from '@/helpers/mr_auth'
-
-import type { SharedInstanceInviteHandler } from './shared-instance-invite-types'
-import { useSharedInstanceInviteHandler } from './use-shared-instance-invite-handler'
-
-const auth = injectAuth()
-const installModal = ref<InstanceType<typeof SharedInstanceInstallModal>>()
-const alreadyInstalledModal = ref<InstanceType<typeof SharedInstanceAlreadyInstalledModal>>()
-const accountRequiredModal = ref<InstanceType<typeof ModrinthAccountRequiredModal>>()
-const {
-	handleNotification,
-	installFromInviteId,
-	clearNotifications,
-	handleAlreadyInstalledCancel,
-	handleAlreadyInstalledGoToInstance,
-	handleAlreadyInstalledInstallAnyway,
-} = useSharedInstanceInviteHandler(installModal, alreadyInstalledModal, accountRequiredModal)
-
-async function requestAuth(flow: ModrinthAuthFlow) {
-	await auth.requestSignIn('', flow, { showModal: false })
-	await nextTick()
-	return !!auth.session_token.value
-}
-
-defineExpose<SharedInstanceInviteHandler>({
-	handleNotification,
-	installFromInviteId,
-	clearNotifications,
-})
-</script>
@@ -1,29 +0,0 @@
-import type {
-	AppNotification,
-	SharedInstanceInvite,
-	SharedInstanceInviteNotificationBody,
-} from './shared-instance-invite-types'
-
-function optionalString(value: unknown) {
-	return typeof value === 'string' ? value : null
-}
-
-export function parseSharedInstanceInviteNotification(
-	notification: AppNotification,
-): SharedInstanceInvite | null {
-	if (notification.body?.type !== 'shared_instance_invite') return null
-
-	const body = notification.body as SharedInstanceInviteNotificationBody
-	const sharedInstanceId = optionalString(body.shared_instance_id)
-	const sharedInstanceName = optionalString(body.shared_instance_name)
-	if (!sharedInstanceId || !sharedInstanceName) return null
-
-	return {
-		sharedInstanceId,
-		sharedInstanceName,
-		invitedById: optionalString(body.invited_by),
-		invitedByUsername: optionalString(body.invited_by_username),
-		invitedByAvatarUrl: optionalString(body.invited_by_avatar_url),
-		instanceIconUrl: optionalString(body.shared_instance_icon),
-	}
-}
@@ -1,30 +0,0 @@
-export type SharedInstanceInviteNotificationBody = {
-	type: 'shared_instance_invite'
-	shared_instance_id?: unknown
-	shared_instance_name?: unknown
-	invited_by?: unknown
-	invited_by_username?: unknown
-	invited_by_avatar_url?: unknown
-	shared_instance_icon?: unknown
-}
-
-export type AppNotification = {
-	id: string | number
-	read?: boolean
-	body?: { type?: unknown } & Record<string, unknown>
-}
-
-export type SharedInstanceInvite = {
-	sharedInstanceId: string
-	sharedInstanceName: string
-	invitedById: string | null
-	invitedByUsername: string | null
-	invitedByAvatarUrl: string | null
-	instanceIconUrl: string | null
-}
-
-export type SharedInstanceInviteHandler = {
-	handleNotification(notification: AppNotification): Promise<boolean>
-	installFromInviteId(inviteId: string): Promise<void>
-	clearNotifications(): void
-}
@@ -1,282 +0,0 @@
-import { ModrinthApiError } from '@modrinth/api-client'
-import {
-	injectAuth,
-	injectModrinthClient,
-	injectNotificationManager,
-	injectPopupNotificationManager,
-} from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { type Ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-
-import { config } from '@/config'
-import { get_user } from '@/helpers/cache'
-import { toError } from '@/helpers/errors'
-import {
-	install_accept_shared_instance_invite,
-	install_get_shared_instance_preview,
-	install_shared_instance,
-} from '@/helpers/install'
-import { list } from '@/helpers/instance'
-import { useTheming } from '@/store/state'
-
-import { parseSharedInstanceInviteNotification } from './shared-instance-invite-parser'
-import type { AppNotification, SharedInstanceInvite } from './shared-instance-invite-types'
-
-type InstallModal = {
-	show(
-		preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>,
-		install: () => Promise<void>,
-	): void
-}
-
-type AccountRequiredModal = {
-	show(event?: MouseEvent): Promise<boolean>
-}
-
-type AlreadyInstalledModal = {
-	show(instanceName: string): void
-}
-
-export function useSharedInstanceInviteHandler(
-	installModal: Ref<InstallModal | undefined>,
-	alreadyInstalledModal: Ref<AlreadyInstalledModal | undefined>,
-	accountRequiredModal: Ref<AccountRequiredModal | undefined>,
-) {
-	const auth = injectAuth()
-	const client = injectModrinthClient()
-	const { handleError } = injectNotificationManager()
-	const popupNotificationManager = injectPopupNotificationManager()
-	const queryClient = useQueryClient()
-	const router = useRouter()
-	const themeStore = useTheming()
-	const displayedNotifications = new Set<string | number>()
-	const displayedNotificationKeys = new Set<string>()
-	const popupNotificationIds = new Set<string | number>()
-	let notificationGeneration = 0
-	let pendingAlreadyInstalled:
-		| {
-				instanceId: string
-				preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>
-				install: () => Promise<void>
-				onGoToInstance?: () => void | Promise<void>
-		  }
-		| undefined
-
-	async function markNotificationRead(notification: AppNotification) {
-		try {
-			await client.labrinth.notifications_v2.markAsRead(String(notification.id))
-		} catch (error) {
-			if (error instanceof ModrinthApiError && error.statusCode === 404) return
-			throw error
-		}
-	}
-
-	async function resolveInvite(invite: SharedInstanceInvite) {
-		const [invitedBy, sharedInstance] = await Promise.all([
-			!invite.invitedByUsername && invite.invitedById
-				? get_user(invite.invitedById, 'bypass').catch(() => null)
-				: null,
-			client.sharedinstances.instances_v1.get(invite.sharedInstanceId).catch(() => null),
-		])
-
-		return {
-			...invite,
-			invitedByUsername: invite.invitedByUsername ?? invitedBy?.username ?? null,
-			invitedByAvatarUrl: invite.invitedByAvatarUrl ?? invitedBy?.avatar_url ?? null,
-			instanceIconUrl: sharedInstance ? sharedInstance.icon : invite.instanceIconUrl,
-		}
-	}
-
-	function showInstall(
-		preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>,
-		install: () => Promise<void>,
-	) {
-		if (!installModal.value) throw new Error('Shared instance install modal is not available.')
-		installModal.value.show(preview, install)
-	}
-
-	async function showInstallOrAlreadyInstalled(
-		sharedInstanceId: string,
-		preview: Awaited<ReturnType<typeof install_get_shared_instance_preview>>,
-		install: () => Promise<void>,
-		onGoToInstance?: () => void | Promise<void>,
-	) {
-		const existingInstance = (await list()).find(
-			(instance) => instance.shared_instance?.id === sharedInstanceId,
-		)
-
-		if (!existingInstance || themeStore.getFeatureFlag('skip_non_essential_warnings')) {
-			showInstall(preview, install)
-			return
-		}
-
-		if (!alreadyInstalledModal.value) {
-			throw new Error('Shared instance already installed modal is not available.')
-		}
-
-		pendingAlreadyInstalled = {
-			instanceId: existingInstance.id,
-			preview,
-			install,
-			onGoToInstance,
-		}
-		alreadyInstalledModal.value.show(existingInstance.name)
-	}
-
-	function handleAlreadyInstalledCancel() {
-		pendingAlreadyInstalled = undefined
-	}
-
-	async function handleAlreadyInstalledGoToInstance() {
-		const pending = pendingAlreadyInstalled
-		pendingAlreadyInstalled = undefined
-		if (!pending) return
-
-		if (pending.onGoToInstance) {
-			try {
-				await pending.onGoToInstance()
-			} catch (error) {
-				handleError(toError(error))
-			}
-		}
-		await router.push(`/instance/${encodeURIComponent(pending.instanceId)}/`)
-	}
-
-	function handleAlreadyInstalledInstallAnyway() {
-		const pending = pendingAlreadyInstalled
-		pendingAlreadyInstalled = undefined
-		if (!pending) return
-		showInstall(pending.preview, pending.install)
-	}
-
-	async function acceptNotification(notification: AppNotification, invite: SharedInstanceInvite) {
-		try {
-			const preview = await install_get_shared_instance_preview(
-				invite.sharedInstanceId,
-				invite.sharedInstanceName,
-			)
-			if (invite.instanceIconUrl) preview.iconUrl = invite.instanceIconUrl
-
-			await showInstallOrAlreadyInstalled(
-				invite.sharedInstanceId,
-				preview,
-				async () => {
-					await install_shared_instance(
-						invite.sharedInstanceId,
-						invite.sharedInstanceName,
-						invite.invitedById,
-						null,
-						null,
-						invite.instanceIconUrl,
-					)
-					await markNotificationRead(notification)
-					await queryClient.invalidateQueries({ queryKey: ['instances'] })
-				},
-				() => markNotificationRead(notification),
-			)
-		} catch (error) {
-			handleError(toError(error))
-		}
-	}
-
-	async function handleNotification(notification: AppNotification) {
-		const parsedInvite = parseSharedInstanceInviteNotification(notification)
-		if (!parsedInvite) return false
-		if (displayedNotifications.has(notification.id)) return true
-
-		const generation = notificationGeneration
-		displayedNotifications.add(notification.id)
-		const invite = await resolveInvite(parsedInvite)
-		if (generation !== notificationGeneration) return true
-
-		const notificationKey = JSON.stringify([
-			invite.invitedById ?? invite.invitedByUsername,
-			invite.sharedInstanceName,
-			invite.instanceIconUrl,
-		])
-		if (displayedNotificationKeys.has(notificationKey)) {
-			await markNotificationRead(notification).catch((error) => handleError(toError(error)))
-			return true
-		}
-
-		displayedNotificationKeys.add(notificationKey)
-		const popupNotification = popupNotificationManager.addPopupNotification({
-			title: invite.sharedInstanceName,
-			autoCloseMs: null,
-			toast: {
-				type: 'instance-invite',
-				actorName: invite.invitedByUsername,
-				actorAvatarUrl: invite.invitedByAvatarUrl ?? undefined,
-				entityName: invite.sharedInstanceName,
-				entityIconUrl: invite.instanceIconUrl ?? undefined,
-				onAccept: () => acceptNotification(notification, invite),
-				onDecline: () =>
-					markNotificationRead(notification).catch((error) => handleError(toError(error))),
-				onOpenActor: () => {
-					if (invite.invitedByUsername) {
-						openUrl(`${config.siteUrl}/user/${encodeURIComponent(invite.invitedByUsername)}`)
-					}
-				},
-			},
-		})
-		popupNotificationIds.add(popupNotification.id)
-		return true
-	}
-
-	function clearNotifications() {
-		notificationGeneration++
-		for (const id of popupNotificationIds) {
-			popupNotificationManager.removeNotification(id)
-		}
-		displayedNotifications.clear()
-		displayedNotificationKeys.clear()
-		popupNotificationIds.clear()
-		pendingAlreadyInstalled = undefined
-	}
-
-	async function requireAccount() {
-		if (!auth.isReady?.value) {
-			await new Promise<void>((resolve) => {
-				const stop = watch(auth.isReady!, (ready) => {
-					if (ready) {
-						stop()
-						resolve()
-					}
-				})
-			})
-		}
-		if (auth.session_token.value) return true
-		return (await accountRequiredModal.value?.show()) ?? false
-	}
-
-	async function installFromInviteId(inviteId: string) {
-		try {
-			if (!(await requireAccount())) return
-			const invite = await install_accept_shared_instance_invite(inviteId)
-			await showInstallOrAlreadyInstalled(invite.sharedInstanceId, invite.preview, async () => {
-				await install_shared_instance(
-					invite.sharedInstanceId,
-					invite.preview.name,
-					invite.managerId,
-					invite.serverManagerName,
-					invite.serverManagerIconUrl,
-					invite.instanceIconUrl,
-				)
-				await queryClient.invalidateQueries({ queryKey: ['instances'] })
-			})
-		} catch (error) {
-			handleError(toError(error))
-		}
-	}
-
-	return {
-		handleNotification,
-		installFromInviteId,
-		clearNotifications,
-		handleAlreadyInstalledCancel,
-		handleAlreadyInstalledGoToInstance,
-		handleAlreadyInstalledInstallAnyway,
-	}
-}
@@ -11,7 +11,6 @@
 				<SkinPreviewRenderer
 					:variant="variant"
 					:texture-src="previewSkin || ''"
-					:ears-texture-src="uploadedTextureUrl?.original ?? currentSkin?.texture"
 					:cape-src="selectedCapeTexture"
 					framing="modal"
 					:initial-rotation="Math.PI / 8"
@@ -27,10 +27,10 @@ import { useRouter } from 'vue-router'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project } from '@/helpers/cache'
 import { process_listener } from '@/helpers/events'
-import { kill, run } from '@/helpers/instance'
-import { get_by_instance_id } from '@/helpers/process'
+import { get_by_profile_path } from '@/helpers/process'
+import { kill, run } from '@/helpers/profile'
 import type { GameInstance } from '@/helpers/types'
-import { showInstanceInFolder } from '@/helpers/utils'
+import { showProfileInFolder } from '@/helpers/utils'
 import { handleSevereError } from '@/store/error'

 const { handleError } = injectNotificationManager()
@@ -52,13 +52,13 @@ const props = defineProps<{
 	last_played: Dayjs
 }>()

-const loadingModpack = ref(!!props.instance.link)
+const loadingModpack = ref(!!props.instance.linked_data)

 const modpack = ref()

-if (props.instance.link) {
+if (props.instance.linked_data) {
 	nextTick().then(async () => {
-		modpack.value = await get_project(props.instance.link?.project_id, 'must_revalidate')
+		modpack.value = await get_project(props.instance.linked_data?.project_id, 'must_revalidate')
 		loadingModpack.value = false
 	})
 }
@@ -80,10 +80,9 @@ const playing = ref(false)

 const play = async (event: MouseEvent) => {
 	event?.stopPropagation()
-	if (props.instance.quarantined) return
 	loading.value = true
-	await run(props.instance.id)
-		.catch((err) => handleSevereError(err, { instanceId: props.instance.id }))
+	await run(props.instance.path)
+		.catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: props.instance.loader,
@@ -98,7 +97,7 @@ const play = async (event: MouseEvent) => {
 const stop = async (event: MouseEvent) => {
 	event?.stopPropagation()
 	loading.value = true
-	await kill(props.instance.id).catch(handleError)
+	await kill(props.instance.path).catch(handleError)
 	trackEvent('InstanceStop', {
 		loader: props.instance.loader,
 		game_version: props.instance.game_version,
@@ -113,7 +112,7 @@ const unlistenProcesses = await process_listener(async () => {
 })

 const checkProcess = async () => {
-	const runningProcesses = await get_by_instance_id(props.instance.id).catch(handleError)
+	const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)

 	playing.value = runningProcesses.length > 0
 }
@@ -131,7 +130,7 @@ onUnmounted(() => {
 		<template #clickable>
 			<router-link
 				class="no-click-animation"
-				:to="`/instance/${encodeURIComponent(instance.id)}`"
+				:to="`/instance/${encodeURIComponent(instance.path)}`"
 			/>
 		</template>
 		<div
@@ -139,7 +138,7 @@ onUnmounted(() => {
 		>
 			<Avatar
 				:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
-				:tint-by="instance.id"
+				:tint-by="instance.path"
 				size="48px"
 			/>
 			<div class="flex flex-col col-span-2 justify-between h-full">
@@ -193,14 +192,8 @@ onUnmounted(() => {
 				</ButtonStyled>
 				<ButtonStyled v-else>
 					<button
-						v-tooltip="
-							instance.quarantined
-								? 'This instance has been locked'
-								: playing
-									? 'Instance is already open'
-									: null
-						"
-						:disabled="instance.quarantined || playing || loading"
+						v-tooltip="playing ? 'Instance is already open' : null"
+						:disabled="playing || loading"
 						@click="play"
 					>
 						<SpinnerIcon v-if="loading" class="animate-spin" />
@@ -213,12 +206,12 @@ onUnmounted(() => {
 						:options="[
 							{
 								id: 'open-instance',
-								shown: !!instance.id,
-								action: () => router.push(encodeURI(`/instance/${instance.id}`)),
+								shown: !!instance.path,
+								action: () => router.push(encodeURI(`/instance/${instance.path}`)),
 							},
 							{
 								id: 'open-folder',
-								action: () => showInstanceInFolder(instance.id),
+								action: () => showProfileInFolder(instance.path),
 							},
 						]"
 					>
@@ -10,13 +10,13 @@ import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import InstanceItem from '@/components/ui/world/InstanceItem.vue'
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { instance_listener, process_listener } from '@/helpers/events'
-import { kill, run } from '@/helpers/instance'
+import { process_listener, profile_listener } from '@/helpers/events'
 import { get_all } from '@/helpers/process'
+import { kill, run } from '@/helpers/profile'
 import { get_game_versions } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
 import {
-	get_instance_protocol_version,
+	get_profile_protocol_version,
 	get_recent_worlds,
 	getWorldIdentifier,
 	hasServerQuickPlaySupport,
@@ -27,7 +27,7 @@ import {
 	type ServerWorld,
 	start_join_server,
 	start_join_singleplayer_world,
-	type WorldWithInstance,
+	type WorldWithProfile,
 } from '@/helpers/worlds.ts'
 import { handleSevereError } from '@/store/error'
 import { useTheming } from '@/store/theme.ts'
@@ -66,7 +66,7 @@ type InstanceJumpBackInItem = BaseJumpBackInItem & {

 type WorldJumpBackInItem = BaseJumpBackInItem & {
 	type: 'world'
-	world: WorldWithInstance
+	world: WorldWithProfile
 }

 type JumpBackInItem = InstanceJumpBackInItem | WorldJumpBackInItem
@@ -100,7 +100,7 @@ async function populateJumpBackIn() {
 		const worlds = await get_recent_worlds(MAX_JUMP_BACK_IN, ['normal', 'favorite'])

 		worlds.forEach((world) => {
-			const instance = props.recentInstances.find((instance) => instance.id === world.instance_id)
+			const instance = props.recentInstances.find((instance) => instance.path === world.profile)

 			if (!instance || !world.last_played) {
 				return
@@ -115,23 +115,23 @@ async function populateJumpBackIn() {
 		})

 		const servers: {
-			instanceId: string
+			instancePath: string
 			address: string
 		}[] = worldItems
 			.filter((item) => item.world.type === 'server' && item.instance)
 			.map((item) => ({
-				instanceId: item.instance.id,
+				instancePath: item.instance.path,
 				address: (item.world as ServerWorld).address,
 			}))

 		// fetch protocol versions for all unique MC versions with server worlds
-		const uniqueServerInstances = new Set<string>(servers.map((x) => x.instanceId))
+		const uniqueServerInstances = new Set<string>(servers.map((x) => x.instancePath))
 		await Promise.all(
-			[...uniqueServerInstances].map((instanceId) =>
-				get_instance_protocol_version(instanceId)
-					.then((protoVer) => (protocolVersions.value[instanceId] = protoVer))
+			[...uniqueServerInstances].map((path) =>
+				get_profile_protocol_version(path)
+					.then((protoVer) => (protocolVersions.value[path] = protoVer))
 					.catch(() => {
-						console.error(`Failed to get instance protocol for: ${instanceId} `)
+						console.error(`Failed to get profile protocol for: ${path} `)
 					}),
 			),
 		)
@@ -145,14 +145,14 @@ async function populateJumpBackIn() {
 			}
 		})

-		servers.forEach(({ instanceId, address }) =>
-			refreshServerData(serverData.value[address], protocolVersions.value[instanceId], address),
+		servers.forEach(({ instancePath, address }) =>
+			refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address),
 		)
 	}

 	const instanceItems: InstanceJumpBackInItem[] = []
 	for (const instance of props.recentInstances) {
-		const worldItem = worldItems.find((item) => item.instance.id === instance.id)
+		const worldItem = worldItems.find((item) => item.instance.path === instance.path)
 		if ((worldItem && worldItem.last_played.isAfter(TWO_WEEKS_AGO)) || !instance.last_played) {
 			continue
 		}
@@ -171,15 +171,14 @@ async function populateJumpBackIn() {
 		.slice(0, MAX_JUMP_BACK_IN)
 }

-function refreshServer(address: string, instanceId: string) {
-	refreshServerData(serverData.value[address], protocolVersions.value[instanceId], address)
+function refreshServer(address: string, instancePath: string) {
+	refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address)
 }

-async function joinWorld(world: WorldWithInstance, instance?: GameInstance) {
-	if (instance?.quarantined) return
+async function joinWorld(world: WorldWithProfile, instance?: GameInstance) {
 	console.log(`Joining world ${getWorldIdentifier(world)}`)
 	if (world.type === 'server') {
-		await start_join_server(world.instance_id, world.address).catch(handleError)
+		await start_join_server(world.profile, world.address).catch(handleError)
 		if (instance) {
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
@@ -188,14 +187,13 @@ async function joinWorld(world: WorldWithInstance, instance?: GameInstance) {
 			})
 		}
 	} else if (world.type === 'singleplayer') {
-		await start_join_singleplayer_world(world.instance_id, world.path).catch(handleError)
+		await start_join_singleplayer_world(world.profile, world.path).catch(handleError)
 	}
 }

 async function playInstance(instance: GameInstance) {
-	if (instance.quarantined) return
-	await run(instance.id)
-		.catch((err) => handleSevereError(err, { instanceId: instance.id }))
+	await run(instance.path)
+		.catch((err) => handleSevereError(err, { profilePath: instance.path }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
@@ -212,14 +210,14 @@ async function stopInstance(path: string) {
 	})
 }

-const currentInstance = ref<string>()
+const currentProfile = ref<string>()
 const currentWorld = ref<string>()

 const unlistenProcesses = await process_listener(async () => {
 	await checkProcesses()
 })

-const unlistenInstances = await instance_listener(async () => {
+const unlistenProfiles = await profile_listener(async () => {
 	await populateJumpBackIn().catch(() => {
 		console.error('Failed to populate jump back in')
 	})
@@ -229,18 +227,18 @@ const runningInstances = ref<string[]>([])

 type ProcessMetadata = {
 	uuid: string
-	instance_id: string
+	profile_path: string
 	start_time: string
 }

 const checkProcesses = async () => {
 	const runningProcesses: ProcessMetadata[] = await get_all().catch(handleError)

-	const runningPaths = runningProcesses.map((x) => x.instance_id)
+	const runningPaths = runningProcesses.map((x) => x.profile_path)

 	const stoppedInstances = runningInstances.value.filter((x) => !runningPaths.includes(x))
-	if (currentInstance.value && stoppedInstances.includes(currentInstance.value)) {
-		currentInstance.value = undefined
+	if (currentProfile.value && stoppedInstances.includes(currentProfile.value)) {
+		currentProfile.value = undefined
 		currentWorld.value = undefined
 	}

@@ -254,7 +252,7 @@ onMounted(() => {

 onUnmounted(() => {
 	unlistenProcesses()
-	unlistenInstances()
+	unlistenProfiles()
 })
 </script>

@@ -280,14 +278,14 @@ onUnmounted(() => {
 		<div class="grid-when-huge flex flex-col w-full gap-2">
 			<template
 				v-for="item in jumpBackInItems"
-				:key="`${item.instance.id}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
+				:key="`${item.instance.path}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
 			>
 				<WorldItem
 					v-if="item.type === 'world'"
 					:world="item.world"
-					:playing-instance="runningInstances.includes(item.instance.id)"
+					:playing-instance="runningInstances.includes(item.instance.path)"
 					:playing-world="
-						currentInstance === item.instance.id && currentWorld === getWorldIdentifier(item.world)
+						currentProfile === item.instance.path && currentWorld === getWorldIdentifier(item.world)
 					"
 					:refreshing="
 						item.world.type === 'server'
@@ -302,41 +300,40 @@ onUnmounted(() => {
 						item.world.type === 'singleplayer' &&
 						hasWorldQuickPlaySupport(gameVersions, item.instance.game_version || '')
 					"
-					:quarantined="item.instance.quarantined"
 					:server-status="
 						item.world.type === 'server' ? serverData[item.world.address].status : undefined
 					"
 					:rendered-motd="
 						item.world.type === 'server' ? serverData[item.world.address].renderedMotd : undefined
 					"
-					:current-protocol="protocolVersions[item.instance.id]"
+					:current-protocol="protocolVersions[item.instance.path]"
 					:game-mode="
 						item.world.type === 'singleplayer' ? GAME_MODES[item.world.game_mode] : undefined
 					"
-					:instance-id="item.instance.id"
+					:instance-path="item.instance.path"
 					:instance-name="item.instance.name"
 					:instance-icon="item.instance.icon_path"
 					@refresh="
 						() =>
 							item.world.type === 'server'
-								? refreshServer(item.world.address, item.instance.id)
+								? refreshServer(item.world.address, item.instance.path)
 								: {}
 					"
 					@update="() => populateJumpBackIn()"
 					@play="
 						() => {
-							currentInstance = item.instance.id
+							currentProfile = item.instance.path
 							currentWorld = getWorldIdentifier(item.world)
 							joinWorld(item.world, item.instance)
 						}
 					"
 					@play-instance="
 						() => {
-							currentInstance = item.instance.id
+							currentProfile = item.instance.path
 							playInstance(item.instance)
 						}
 					"
-					@stop="() => stopInstance(item.instance.id)"
+					@stop="() => stopInstance(item.instance.path)"
 				/>
 				<InstanceItem v-else :instance="item.instance" :last_played="item.last_played" />
 			</template>
@@ -2,7 +2,6 @@
 import {
 	ClipboardCopyIcon,
 	EditIcon,
-	ExternalIcon,
 	EyeIcon,
 	FolderOpenIcon,
 	IssuesIcon,
@@ -24,7 +23,6 @@ import {
 	ButtonStyled,
 	commonMessages,
 	defineMessages,
-	injectNotificationManager,
 	OverflowMenu,
 	SmartClickable,
 	TagItem,
@@ -41,7 +39,7 @@ import type { Component } from 'vue'
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'

-import { copyToClipboard, createInstanceShortcut } from '@/helpers/utils'
+import { copyToClipboard } from '@/helpers/utils'
 import type {
 	ProtocolVersion,
 	ServerStatus,
@@ -62,7 +60,6 @@ const formatDateTime = useFormatDateTime({
 })

 const router = useRouter()
-const { addNotification } = injectNotificationManager()

 const emit = defineEmits<{
 	(e: 'play' | 'play-instance' | 'update' | 'stop' | 'refresh' | 'edit' | 'delete'): void
@@ -77,7 +74,6 @@ const props = withDefaults(
 		startingInstance?: boolean
 		supportsServerQuickPlay?: boolean
 		supportsWorldQuickPlay?: boolean
-		quarantined?: boolean
 		currentProtocol?: ProtocolVersion | null
 		highlighted?: boolean

@@ -95,10 +91,9 @@ const props = withDefaults(
 		managed?: boolean

 		// Instance
-		instanceId?: string
+		instancePath?: string
 		instanceName?: string
 		instanceIcon?: string
-		shortcutInstanceId?: string
 	}>(),
 	{
 		playingInstance: false,
@@ -106,7 +101,6 @@ const props = withDefaults(
 		startingInstance: false,
 		supportsServerQuickPlay: true,
 		supportsWorldQuickPlay: false,
-		quarantined: false,
 		currentProtocol: null,

 		refreshing: false,
@@ -116,10 +110,9 @@ const props = withDefaults(
 		gameMode: undefined,
 		managed: false,

-		instanceId: undefined,
+		instancePath: undefined,
 		instanceName: undefined,
 		instanceIcon: undefined,
-		shortcutInstanceId: undefined,
 	},
 )

@@ -138,33 +131,6 @@ const serverIncompatible = computed(

 const locked = computed(() => props.world.type === 'singleplayer' && props.world.locked)
 const managed = computed(() => props.managed)
-const shortcutInstanceId = computed(() => props.shortcutInstanceId ?? props.instanceId)
-
-async function createShortcut() {
-	if (!shortcutInstanceId.value || props.quarantined) return
-
-	try {
-		const shortcutPath = await createInstanceShortcut(
-			props.world.name,
-			shortcutInstanceId.value,
-			props.world.type === 'server'
-				? { server: (props.world as ServerWorld).address }
-				: { singleplayerWorld: (props.world as SingleplayerWorld).path },
-		)
-		if (!shortcutPath) return
-
-		addNotification({
-			type: 'success',
-			title: 'Shortcut created',
-		})
-	} catch (error) {
-		addNotification({
-			type: 'error',
-			title: 'Failed to create shortcut',
-			text: error instanceof Error ? error.message : '',
-		})
-	}
-}

 const messages = defineMessages({
 	hardcore: {
@@ -219,10 +185,6 @@ const messages = defineMessages({
 		id: 'instance.worlds.dont_show_on_home',
 		defaultMessage: `Don't show on Home`,
 	},
-	createShortcut: {
-		id: 'instance.worlds.create_shortcut',
-		defaultMessage: 'Create shortcut',
-	},
 	linkedServer: {
 		id: 'instance.worlds.linked_server',
 		defaultMessage: 'Managed by server project',
@@ -247,10 +209,10 @@ const messages = defineMessages({
 </script>
 <template>
 	<SmartClickable>
-		<template v-if="instanceId" #clickable>
+		<template v-if="instancePath" #clickable>
 			<router-link
 				class="no-click-animation"
-				:to="`/instance/${encodeURIComponent(instanceId)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
+				:to="`/instance/${encodeURIComponent(instancePath)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
 			/>
 		</template>
 		<div
@@ -362,16 +324,16 @@ const messages = defineMessages({
 						</template>
 						<template v-else> {{ formatMessage(messages.notPlayedYet) }} </template>
 					</div>
-					<template v-if="instanceId">
+					<template v-if="instancePath">
 						•
 						<router-link
 							class="flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
-							:to="`/instance/${instanceId}`"
+							:to="`/instance/${instancePath}`"
 						>
 							<Avatar
 								:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
 								size="16px"
-								:tint-by="instanceId"
+								:tint-by="instancePath"
 								class="shrink-0"
 							/>
 							<span class="truncate">{{ instanceName }}</span>
@@ -424,26 +386,23 @@ const messages = defineMessages({
 				<ButtonStyled v-else>
 					<button
 						v-tooltip="
-							quarantined
-								? 'This instance has been locked'
-								: world.type === 'server'
-									? !supportsServerQuickPlay
-										? formatMessage(messages.noServerQuickPlay)
-										: playingOtherWorld
-											? formatMessage(messages.gameAlreadyOpen)
-											: !serverStatus
-												? formatMessage(messages.noContact)
-												: serverIncompatible
-													? formatMessage(messages.incompatibleServer)
-													: null
-									: !supportsWorldQuickPlay
-										? formatMessage(messages.noSingleplayerQuickPlay)
-										: playingOtherWorld || locked
-											? formatMessage(messages.gameAlreadyOpen)
-											: null
+							world.type === 'server'
+								? !supportsServerQuickPlay
+									? formatMessage(messages.noServerQuickPlay)
+									: playingOtherWorld
+										? formatMessage(messages.gameAlreadyOpen)
+										: !serverStatus
+											? formatMessage(messages.noContact)
+											: serverIncompatible
+												? formatMessage(messages.incompatibleServer)
+												: null
+								: !supportsWorldQuickPlay
+									? formatMessage(messages.noSingleplayerQuickPlay)
+									: playingOtherWorld || locked
+										? formatMessage(messages.gameAlreadyOpen)
+										: null
 						"
 						:disabled="
-							quarantined ||
 							playingOtherWorld ||
 							startingInstance ||
 							(world.type == 'server' && !supportsServerQuickPlay) ||
@@ -461,14 +420,14 @@ const messages = defineMessages({
 						:options="[
 							{
 								id: 'play-instance',
-								shown: !!instanceId,
-								disabled: playingInstance || quarantined,
+								shown: !!instancePath,
+								disabled: playingInstance,
 								action: () => emit('play-instance'),
 							},
 							{
 								id: 'open-instance',
-								shown: !!instanceId,
-								action: () => router.push(`/instance/${encodeURIComponent(instanceId)}`),
+								shown: !!instancePath,
+								action: () => router.push(encodeURI(`/instance/${instancePath}`)),
 							},
 							{
 								id: 'refresh',
@@ -483,7 +442,7 @@ const messages = defineMessages({
 							{
 								id: 'edit',
 								action: () => emit('edit'),
-								shown: !instanceId,
+								shown: !instancePath,
 								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
@@ -498,14 +457,14 @@ const messages = defineMessages({
 							},
 							{
 								divider: true,
-								shown: !!instanceId,
+								shown: !!instancePath,
 							},
 							{
 								id: 'dont-show-on-home',
-								shown: !!instanceId,
+								shown: !!instancePath,
 								action: () => {
 									set_world_display_status(
-										instanceId,
+										instancePath,
 										world.type,
 										getWorldIdentifier(world),
 										'hidden',
@@ -514,21 +473,16 @@ const messages = defineMessages({
 									})
 								},
 							},
-							{
-								id: 'create-shortcut',
-								shown: !!shortcutInstanceId && !quarantined,
-								action: () => createShortcut(),
-							},
 							{
 								divider: true,
-								shown: !instanceId,
+								shown: !instancePath,
 							},
 							{
 								id: 'delete',
 								color: 'red',
 								hoverFilled: true,
 								action: () => emit('delete'),
-								shown: !instanceId,
+								shown: !instancePath,
 								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
@@ -563,10 +517,6 @@ const messages = defineMessages({
 							<UpdatedIcon aria-hidden="true" />
 							{{ formatMessage(commonMessages.refreshButton) }}
 						</template>
-						<template #create-shortcut>
-							<ExternalIcon aria-hidden="true" />
-							{{ formatMessage(messages.createShortcut) }}
-						</template>
 						<template #dont-show-on-home>
 							<XIcon aria-hidden="true" />
 							{{ formatMessage(messages.dontShowOnHome) }}
@@ -12,11 +12,7 @@ import { ref } from 'vue'

 import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
-import {
-	add_server_to_instance,
-	type ServerPackStatus,
-	type ServerWorld,
-} from '@/helpers/worlds.ts'
+import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'

 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -39,8 +35,8 @@ async function addServer(play: boolean) {
 	const serverName = name.value ? name.value : address.value
 	const resourcePackStatus = resourcePack.value
 	const index =
-		(await add_server_to_instance(
-			props.instance.id,
+		(await add_server_to_profile(
+			props.instance.path,
 			serverName,
 			address.value,
 			resourcePackStatus,
@@ -1,124 +0,0 @@
-<script setup lang="ts">
-import { TrashIcon, XIcon } from '@modrinth/assets'
-import {
-	Admonition,
-	ButtonStyled,
-	commonMessages,
-	defineMessages,
-	NewModal,
-	useVIntl,
-} from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
-import type { World } from '@/helpers/worlds.ts'
-
-const { formatMessage } = useVIntl()
-
-const props = defineProps<{
-	world: World | null
-}>()
-
-const emit = defineEmits<{
-	confirm: [world: World]
-}>()
-
-const messages = defineMessages({
-	removeServerTitle: {
-		id: 'app.instance.worlds.remove-server-modal.title',
-		defaultMessage: 'Remove server',
-	},
-	deleteWorldTitle: {
-		id: 'app.instance.worlds.delete-world-modal.title',
-		defaultMessage: 'Delete world',
-	},
-	removeServerWarningHeader: {
-		id: 'app.instance.worlds.remove-server-modal.warning-header',
-		defaultMessage: 'Removing {name}',
-	},
-	deleteWorldWarningHeader: {
-		id: 'app.instance.worlds.delete-world-modal.warning-header',
-		defaultMessage: 'Deleting {name}',
-	},
-	removeServerWarningBody: {
-		id: 'app.instance.worlds.remove-server-modal.warning-body',
-		defaultMessage:
-			'This server will be removed from your server list and from the in-game server list. You can add it again later if you know the address.',
-	},
-	deleteWorldWarningBody: {
-		id: 'app.instance.worlds.delete-world-modal.warning-body',
-		defaultMessage:
-			'This world will be permanently deleted from this instance. This action cannot be undone.',
-	},
-	removeServerButton: {
-		id: 'app.instance.worlds.remove-server-modal.remove-button',
-		defaultMessage: 'Remove server',
-	},
-	deleteWorldButton: {
-		id: 'app.instance.worlds.delete-world-modal.delete-button',
-		defaultMessage: 'Delete world',
-	},
-})
-
-const modal = ref<InstanceType<typeof NewModal>>()
-
-const isServer = computed(() => props.world?.type === 'server')
-const isSingleplayer = computed(() => props.world?.type === 'singleplayer')
-const titleMessage = computed(() =>
-	isServer.value ? messages.removeServerTitle : messages.deleteWorldTitle,
-)
-const actionMessage = computed(() =>
-	isServer.value ? messages.removeServerButton : messages.deleteWorldButton,
-)
-const warningHeaderMessage = computed(() =>
-	isServer.value ? messages.removeServerWarningHeader : messages.deleteWorldWarningHeader,
-)
-const warningBodyMessage = computed(() =>
-	isServer.value ? messages.removeServerWarningBody : messages.deleteWorldWarningBody,
-)
-
-function show() {
-	modal.value?.show()
-}
-
-function hide() {
-	modal.value?.hide()
-}
-
-function confirm() {
-	if (!props.world) return
-	emit('confirm', props.world)
-	hide()
-}
-
-defineExpose({ show, hide })
-</script>
-
-<template>
-	<NewModal ref="modal" :header="formatMessage(titleMessage)" fade="danger" max-width="500px">
-		<div class="flex flex-col gap-4">
-			<Admonition
-				type="critical"
-				:header="formatMessage(warningHeaderMessage, { name: world?.name })"
-			>
-				{{ formatMessage(warningBodyMessage) }}
-			</Admonition>
-		</div>
-
-		<template #actions>
-			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="!isServer && !isSingleplayer" @click="confirm">
-						<TrashIcon />
-						{{ formatMessage(actionMessage) }}
-					</button>
-				</ButtonStyled>
-			</div>
-		</template>
-	</NewModal>
-</template>
@@ -15,7 +15,7 @@ import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
 import {
 	type DisplayStatus,
-	edit_server_in_instance,
+	edit_server_in_profile,
 	type ServerPackStatus,
 	type ServerWorld,
 	set_world_display_status,
@@ -46,8 +46,8 @@ const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal
 async function saveServer() {
 	const serverName = name.value ? name.value : address.value
 	const resourcePackStatus = resourcePack.value
-	await edit_server_in_instance(
-		props.instance.id,
+	await edit_server_in_profile(
+		props.instance.path,
 		index.value,
 		serverName,
 		address.value,
@@ -56,7 +56,7 @@ async function saveServer() {

 	if (newDisplayStatus.value !== displayStatus.value) {
 		await set_world_display_status(
-			props.instance.id,
+			props.instance.path,
 			'server',
 			address.value,
 			newDisplayStatus.value,
@@ -40,14 +40,14 @@ const hideFromHome = ref(false)
 const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))

 async function saveWorld() {
-	await rename_world(props.instance.id, path.value, name.value).catch(handleError)
+	await rename_world(props.instance.path, path.value, name.value).catch(handleError)

 	if (removeIcon.value) {
-		await reset_world_icon(props.instance.id, path.value).catch(handleError)
+		await reset_world_icon(props.instance.path, path.value).catch(handleError)
 	}
 	if (newDisplayStatus.value !== displayStatus.value) {
 		await set_world_display_status(
-			props.instance.id,
+			props.instance.path,
 			'singleplayer',
 			path.value,
 			newDisplayStatus.value,
@@ -1,752 +0,0 @@
-import { CheckIcon, CopyIcon, UpdatedIcon } from '@modrinth/assets'
-import {
-	defineMessages,
-	type PopupNotificationButton,
-	type PopupNotificationProgressItem,
-	type PopupNotificationProgressType,
-	useVIntl,
-} from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { computed, ref } from 'vue'
-import type { Router } from 'vue-router'
-
-import { install_job_listener } from '@/helpers/events'
-import {
-	install_job_dismiss,
-	install_job_list,
-	install_job_retry,
-	install_job_support_details,
-	installJobInstanceId,
-	type InstallJobSnapshot,
-	type InstallJobStatus,
-	type InstallPhaseId,
-	type InstallProgress,
-} from '@/helpers/install'
-import { get_many as getInstances } from '@/helpers/instance'
-
-const messages = defineMessages({
-	installs: {
-		id: 'app.action-bar.installs',
-		defaultMessage: 'Installs',
-	},
-	retry: {
-		id: 'app.action-bar.install.retry',
-		defaultMessage: 'Retry',
-	},
-	copyDetails: {
-		id: 'app.action-bar.install.copy-details',
-		defaultMessage: 'Copy details',
-	},
-	copied: {
-		id: 'app.action-bar.install.copied-details',
-		defaultMessage: 'Copied',
-	},
-	dismiss: {
-		id: 'app.action-bar.install.dismiss',
-		defaultMessage: 'Dismiss',
-	},
-	openInstance: {
-		id: 'app.action-bar.install.open-instance',
-		defaultMessage: 'Open instance',
-	},
-	unknownInstance: {
-		id: 'app.action-bar.install.unknown-instance',
-		defaultMessage: 'Unknown instance',
-	},
-	updatingSharedContent: {
-		id: 'app.action-bar.install.updating-shared-content',
-		defaultMessage: 'Updating shared content',
-	},
-})
-
-const phaseMessages = defineMessages({
-	preparing_instance: {
-		id: 'app.install.phase.preparing_instance',
-		defaultMessage: 'Queued to install',
-	},
-	resolving_pack: {
-		id: 'app.install.phase.resolving_pack',
-		defaultMessage: 'Resolving content',
-	},
-	downloading_pack_file: {
-		id: 'app.install.phase.downloading_pack_file',
-		defaultMessage: 'Downloading pack file',
-	},
-	reading_pack_manifest: {
-		id: 'app.install.phase.reading_pack_manifest',
-		defaultMessage: 'Reading pack manifest',
-	},
-	downloading_content: {
-		id: 'app.install.phase.downloading_content',
-		defaultMessage: 'Downloading content',
-	},
-	extracting_overrides: {
-		id: 'app.install.phase.extracting_overrides',
-		defaultMessage: 'Extracting overrides',
-	},
-	resolving_minecraft: {
-		id: 'app.install.phase.resolving_minecraft',
-		defaultMessage: 'Resolving Minecraft',
-	},
-	resolving_loader: {
-		id: 'app.install.phase.resolving_loader',
-		defaultMessage: 'Resolving loader',
-	},
-	preparing_java: {
-		id: 'app.install.phase.preparing_java',
-		defaultMessage: 'Preparing Java',
-	},
-	downloading_minecraft: {
-		id: 'app.install.phase.downloading_minecraft',
-		defaultMessage: 'Downloading Minecraft',
-	},
-	running_loader_processors: {
-		id: 'app.install.phase.running_loader_processors',
-		defaultMessage: 'Running loader processors',
-	},
-	finalizing: {
-		id: 'app.install.phase.finalizing',
-		defaultMessage: 'Finalizing',
-	},
-	rolling_back: {
-		id: 'app.install.phase.rolling_back',
-		defaultMessage: 'Rolling back',
-	},
-})
-
-const javaStepMessages = defineMessages({
-	resolving: {
-		id: 'app.install.phase.preparing_java.resolving',
-		defaultMessage: 'Preparing Java {version}',
-	},
-	fetching_metadata: {
-		id: 'app.install.phase.preparing_java.fetching-metadata',
-		defaultMessage: 'Fetching Java {version}',
-	},
-	downloading: {
-		id: 'app.install.phase.preparing_java.downloading',
-		defaultMessage: 'Downloading Java {version}',
-	},
-	extracting: {
-		id: 'app.install.phase.preparing_java.extracting',
-		defaultMessage: 'Extracting Java {version}',
-	},
-	validating: {
-		id: 'app.install.phase.preparing_java.validating',
-		defaultMessage: 'Validating Java {version}',
-	},
-})
-
-const failureSummaryMessages = defineMessages({
-	canceled: {
-		id: 'app.action-bar.install.summary.canceled',
-		defaultMessage: 'Canceled',
-	},
-	appClosed: {
-		id: 'app.action-bar.install.summary.app-closing',
-		defaultMessage: 'Canceled due to app closing',
-	},
-	downloadFailed: {
-		id: 'app.action-bar.install.summary.download-failed',
-		defaultMessage: "Download couldn't finish",
-	},
-	modrinthUnreachable: {
-		id: 'app.action-bar.install.summary.modrinth-unreachable',
-		defaultMessage: "Couldn't reach Modrinth",
-	},
-	packDownloadFailed: {
-		id: 'app.action-bar.install.summary.pack-download-failed',
-		defaultMessage: "Couldn't download pack",
-	},
-	badModpackFile: {
-		id: 'app.action-bar.install.summary.bad-modpack-file',
-		defaultMessage: "Couldn't read modpack",
-	},
-	invalidModpack: {
-		id: 'app.action-bar.install.summary.invalid-modpack',
-		defaultMessage: 'Modpack data invalid',
-	},
-	contentDownloadFailed: {
-		id: 'app.action-bar.install.summary.content-download-failed',
-		defaultMessage: "Couldn't download files",
-	},
-	corruptDownload: {
-		id: 'app.action-bar.install.summary.corrupt-download',
-		defaultMessage: 'Downloaded file is corrupt',
-	},
-	invalidModpackFiles: {
-		id: 'app.action-bar.install.summary.invalid-modpack-files',
-		defaultMessage: 'Modpack files have invalid metadata',
-	},
-	noWritePermission: {
-		id: 'app.action-bar.install.summary.no-write-permission',
-		defaultMessage: 'No permission to write',
-	},
-	couldNotSaveFiles: {
-		id: 'app.action-bar.install.summary.could-not-save-files',
-		defaultMessage: "Couldn't save files",
-	},
-	invalidFilePath: {
-		id: 'app.action-bar.install.summary.invalid-file-path',
-		defaultMessage: 'File path is invalid',
-	},
-	instanceNotFound: {
-		id: 'app.action-bar.install.summary.instance-not-found',
-		defaultMessage: "Instance couldn't be found",
-	},
-	cleanupIncomplete: {
-		id: 'app.action-bar.install.summary.cleanup-incomplete',
-		defaultMessage: "Cleanup didn't finish",
-	},
-	javaSetupFailed: {
-		id: 'app.action-bar.install.summary.java-setup-failed',
-		defaultMessage: "Java setup couldn't finish",
-	},
-	minecraftSetupFailed: {
-		id: 'app.action-bar.install.summary.minecraft-setup-failed',
-		defaultMessage: 'Minecraft setup failed',
-	},
-	loaderSetupFailed: {
-		id: 'app.action-bar.install.summary.loader-setup-failed',
-		defaultMessage: 'Loader setup failed',
-	},
-	localDataError: {
-		id: 'app.action-bar.install.summary.local-data-error',
-		defaultMessage: "Couldn't update local data",
-	},
-	unexpectedError: {
-		id: 'app.action-bar.install.summary.unexpected-error',
-		defaultMessage: 'Something went wrong',
-	},
-})
-
-const visibleJobStatuses = new Set<InstallJobStatus>(['queued', 'running', 'failed', 'interrupted'])
-const copyDetailsStallMs = 30_000
-
-interface ProgressSnapshot {
-	signature: string
-	changedAt: number
-	timeout: number | null
-}
-
-function getDisplayIconUrl(icon: string | null | undefined): string | null {
-	if (!icon) return null
-	if (/^(https?:|data:|blob:|asset:|tauri:)/.test(icon)) return icon
-	return convertFileSrc(icon)
-}
-
-export async function useInstallJobNotifications(opts: {
-	router: Router
-	handleError: (err: unknown) => void
-	onChange: () => void
-}) {
-	const { formatMessage } = useVIntl()
-	const jobs = ref<InstallJobSnapshot[]>([])
-	const iconUrls = ref<Record<string, string | null>>({})
-	const instanceNames = ref<Record<string, string>>({})
-	const copiedJobIds = ref<Set<string>>(new Set())
-	const jobOrder = new Map<string, number>()
-	let refreshRequest = 0
-	let metadataRequest = 0
-	let nextJobOrder = 0
-	const copiedResetTimeouts = new Map<string, number>()
-	const progressSnapshots = new Map<string, ProgressSnapshot>()
-
-	function getTitle(job: InstallJobSnapshot): string {
-		if (job.display?.title) return job.display.title
-		if (job.details.type === 'instance') return job.details.name
-		if (job.details.type === 'modpack' && job.details.title) return job.details.title
-		const instanceId = installJobInstanceId(job)
-		return (
-			(instanceId ? instanceNames.value[instanceId] : null) ??
-			formatMessage(messages.unknownInstance)
-		)
-	}
-
-	function getText(job: InstallJobSnapshot): string {
-		if (job.status === 'failed' || job.status === 'interrupted') {
-			return getFailureSummary(job)
-		}
-		if (job.phase === 'preparing_java' && job.details.type === 'java') {
-			return formatMessage(javaStepMessages[job.details.step], {
-				version: job.details.major_version,
-			})
-		}
-		if (job.kind === 'update_shared_instance' && job.phase === 'downloading_content') {
-			return formatMessage(messages.updatingSharedContent)
-		}
-		return formatMessage(phaseMessages[job.phase])
-	}
-
-	function getFailureSummary(job: InstallJobSnapshot): string {
-		const code = job.error?.code
-		const phase = job.error?.phase ?? job.phase
-
-		if (code === 'app_closed' || (job.status === 'interrupted' && code === 'interrupted')) {
-			return formatMessage(failureSummaryMessages.appClosed)
-		}
-		if (code === 'canceled') {
-			return formatMessage(failureSummaryMessages.canceled)
-		}
-		if (job.rollback_error || code === 'rollback_error') {
-			return formatMessage(failureSummaryMessages.cleanupIncomplete)
-		}
-		if (hasPermissionError(job)) {
-			return formatMessage(failureSummaryMessages.noWritePermission)
-		}
-
-		switch (code) {
-			case 'network_error':
-				return formatMessage(
-					phase === 'downloading_pack_file'
-						? failureSummaryMessages.packDownloadFailed
-						: failureSummaryMessages.downloadFailed,
-				)
-			case 'api_error':
-				return formatMessage(failureSummaryMessages.modrinthUnreachable)
-			case 'pack_error':
-				return formatMessage(
-					phase === 'downloading_pack_file'
-						? failureSummaryMessages.packDownloadFailed
-						: failureSummaryMessages.invalidModpack,
-				)
-			case 'archive_error':
-				return formatMessage(failureSummaryMessages.badModpackFile)
-			case 'parse_error':
-				return formatMessage(failureSummaryMessages.invalidModpack)
-			case 'content_error':
-				return formatMessage(failureSummaryMessages.invalidModpackFiles)
-			case 'hash_error':
-				return formatMessage(failureSummaryMessages.corruptDownload)
-			case 'filesystem_error':
-				return formatMessage(failureSummaryMessages.couldNotSaveFiles)
-			case 'path_error':
-				return formatMessage(failureSummaryMessages.invalidFilePath)
-			case 'instance_error':
-				return formatMessage(failureSummaryMessages.instanceNotFound)
-			case 'java_error':
-				return formatMessage(failureSummaryMessages.javaSetupFailed)
-			case 'loader_error':
-			case 'processor_error':
-				return formatMessage(failureSummaryMessages.loaderSetupFailed)
-			case 'database_error':
-				return formatMessage(failureSummaryMessages.localDataError)
-			case 'launcher_error':
-			case 'metadata_error':
-				return getFailureSummaryForPhase(phase)
-			default:
-				return getFailureSummaryForPhase(phase)
-		}
-	}
-
-	function getFailureSummaryForPhase(phase: InstallPhaseId): string {
-		switch (phase) {
-			case 'downloading_pack_file':
-				return formatMessage(failureSummaryMessages.packDownloadFailed)
-			case 'resolving_pack':
-			case 'reading_pack_manifest':
-				return formatMessage(failureSummaryMessages.invalidModpack)
-			case 'downloading_content':
-				return formatMessage(failureSummaryMessages.contentDownloadFailed)
-			case 'extracting_overrides':
-				return formatMessage(failureSummaryMessages.couldNotSaveFiles)
-			case 'resolving_minecraft':
-			case 'downloading_minecraft':
-				return formatMessage(failureSummaryMessages.minecraftSetupFailed)
-			case 'resolving_loader':
-			case 'running_loader_processors':
-				return formatMessage(failureSummaryMessages.loaderSetupFailed)
-			case 'preparing_java':
-				return formatMessage(failureSummaryMessages.javaSetupFailed)
-			case 'preparing_instance':
-				return formatMessage(failureSummaryMessages.instanceNotFound)
-			case 'rolling_back':
-				return formatMessage(failureSummaryMessages.cleanupIncomplete)
-			default:
-				return formatMessage(failureSummaryMessages.unexpectedError)
-		}
-	}
-
-	function hasPermissionError(job: InstallJobSnapshot): boolean {
-		const message = job.error?.message.toLowerCase() ?? ''
-		return (
-			message.includes('permission denied') ||
-			message.includes('access is denied') ||
-			message.includes('operation not permitted')
-		)
-	}
-
-	function getProgressType(job: InstallJobSnapshot): PopupNotificationProgressType | undefined {
-		if (!getEffectiveProgress(job)) return undefined
-		if (
-			job.phase === 'preparing_java' &&
-			job.details.type === 'java' &&
-			job.details.step === 'downloading'
-		) {
-			return 'bytes'
-		}
-		if (job.phase === 'downloading_content') {
-			return job.progress?.secondary ? 'bytes' : 'count'
-		}
-		if (
-			job.phase === 'downloading_pack_file' ||
-			job.phase === 'extracting_overrides' ||
-			job.phase === 'downloading_minecraft'
-		) {
-			return 'bytes'
-		}
-		if (job.phase === 'running_loader_processors') {
-			return 'count'
-		}
-		return 'percentage'
-	}
-
-	function getEffectiveProgress(job: InstallJobSnapshot): InstallProgress | null | undefined {
-		if (job.phase === 'downloading_content' && job.progress?.secondary) {
-			return job.progress.secondary
-		}
-
-		return job.progress
-	}
-
-	function getProgress(job: InstallJobSnapshot): number {
-		if (job.status === 'succeeded') return 1
-		if (job.status === 'failed' || job.status === 'interrupted') return 0
-		const progress = getEffectiveProgress(job)
-		if (!progress || progress.total <= 0) return 0
-		return Math.max(0, Math.min(1, progress.current / progress.total))
-	}
-
-	function isTerminalJob(job: InstallJobSnapshot): boolean {
-		return job.status === 'failed' || job.status === 'interrupted'
-	}
-
-	function canShowStalledProgressDetails(job: InstallJobSnapshot): boolean {
-		return (
-			job.status === 'running' &&
-			job.phase !== 'preparing_instance' &&
-			job.phase !== 'finalizing' &&
-			job.phase !== 'rolling_back'
-		)
-	}
-
-	function getJobSortRank(job: InstallJobSnapshot): number {
-		if (isTerminalJob(job)) return 0
-		if (job.status === 'queued' || job.phase === 'preparing_instance') return 2
-		return 1
-	}
-
-	function progressSignature(job: InstallJobSnapshot): string {
-		const progress = job.progress
-		const secondary = progress?.secondary
-		return [
-			job.status,
-			job.phase,
-			JSON.stringify(job.details),
-			progress?.current ?? '',
-			progress?.total ?? '',
-			secondary?.current ?? '',
-			secondary?.total ?? '',
-		].join(':')
-	}
-
-	function clearCopied(jobId: string) {
-		if (!copiedJobIds.value.has(jobId)) {
-			return
-		}
-
-		const timeout = copiedResetTimeouts.get(jobId)
-		if (timeout != null) {
-			window.clearTimeout(timeout)
-			copiedResetTimeouts.delete(jobId)
-		}
-
-		const nextCopiedJobIds = new Set(copiedJobIds.value)
-		nextCopiedJobIds.delete(jobId)
-		copiedJobIds.value = nextCopiedJobIds
-	}
-
-	function clearProgressSnapshot(jobId: string) {
-		const snapshot = progressSnapshots.get(jobId)
-		if (snapshot?.timeout != null) {
-			window.clearTimeout(snapshot.timeout)
-		}
-		progressSnapshots.delete(jobId)
-	}
-
-	function scheduleStaleProgressRefresh(jobId: string) {
-		const snapshot = progressSnapshots.get(jobId)
-		if (!snapshot) {
-			return
-		}
-
-		snapshot.timeout = window.setTimeout(() => {
-			const snapshot = progressSnapshots.get(jobId)
-			if (!snapshot) {
-				return
-			}
-
-			snapshot.timeout = null
-			opts.onChange()
-		}, copyDetailsStallMs)
-	}
-
-	function syncProgressSnapshots(nextJobs: InstallJobSnapshot[]) {
-		const trackedJobIds = new Set<string>()
-		const now = Date.now()
-
-		for (const job of nextJobs) {
-			if (!canShowStalledProgressDetails(job)) {
-				continue
-			}
-
-			trackedJobIds.add(job.job_id)
-			const signature = progressSignature(job)
-			const snapshot = progressSnapshots.get(job.job_id)
-			if (snapshot?.signature === signature) {
-				continue
-			}
-
-			clearProgressSnapshot(job.job_id)
-			clearCopied(job.job_id)
-			progressSnapshots.set(job.job_id, {
-				signature,
-				changedAt: now,
-				timeout: null,
-			})
-			scheduleStaleProgressRefresh(job.job_id)
-		}
-
-		for (const jobId of progressSnapshots.keys()) {
-			if (!trackedJobIds.has(jobId)) {
-				clearProgressSnapshot(jobId)
-			}
-		}
-	}
-
-	function hasStalledProgress(job: InstallJobSnapshot): boolean {
-		const snapshot = progressSnapshots.get(job.job_id)
-		return !!snapshot && Date.now() - snapshot.changedAt >= copyDetailsStallMs
-	}
-
-	function shouldShowCopyDetails(job: InstallJobSnapshot): boolean {
-		return isTerminalJob(job) || (canShowStalledProgressDetails(job) && hasStalledProgress(job))
-	}
-
-	function isCopied(job: InstallJobSnapshot): boolean {
-		return copiedJobIds.value.has(job.job_id)
-	}
-
-	function setCopied(job: InstallJobSnapshot) {
-		copiedJobIds.value = new Set([...copiedJobIds.value, job.job_id])
-		const existingTimeout = copiedResetTimeouts.get(job.job_id)
-		if (existingTimeout != null) {
-			window.clearTimeout(existingTimeout)
-		}
-		copiedResetTimeouts.set(
-			job.job_id,
-			window.setTimeout(() => {
-				copiedResetTimeouts.delete(job.job_id)
-				if (!copiedJobIds.value.has(job.job_id)) {
-					return
-				}
-				const nextCopiedJobIds = new Set(copiedJobIds.value)
-				nextCopiedJobIds.delete(job.job_id)
-				copiedJobIds.value = nextCopiedJobIds
-				opts.onChange()
-			}, 1_000),
-		)
-		opts.onChange()
-	}
-
-	async function copyJobDetails(job: InstallJobSnapshot) {
-		const details = await install_job_support_details(job.job_id).catch((error) => {
-			opts.handleError(error)
-			return null
-		})
-		if (!details) {
-			return
-		}
-		try {
-			await navigator.clipboard.writeText(details)
-			setCopied(job)
-		} catch (error) {
-			opts.handleError(error)
-		}
-	}
-
-	function getButtons(job: InstallJobSnapshot): PopupNotificationButton[] {
-		const buttons: PopupNotificationButton[] = []
-
-		if (isTerminalJob(job)) {
-			buttons.push({
-				label: formatMessage(messages.retry),
-				icon: UpdatedIcon,
-				color: 'brand',
-				keepOpen: true,
-				action: async () => {
-					await install_job_retry(job.job_id).catch(opts.handleError)
-					await refresh()
-				},
-			})
-		}
-
-		if (shouldShowCopyDetails(job)) {
-			const copied = isCopied(job)
-			buttons.push({
-				label: formatMessage(copied ? messages.copied : messages.copyDetails),
-				icon: copied ? CheckIcon : CopyIcon,
-				color: 'standard',
-				keepOpen: true,
-				action: async () => {
-					await copyJobDetails(job)
-				},
-			})
-		}
-
-		return buttons
-	}
-
-	function setJobs(nextJobs: InstallJobSnapshot[]) {
-		for (const job of nextJobs) {
-			if (!jobOrder.has(job.job_id)) {
-				jobOrder.set(job.job_id, nextJobOrder++)
-			}
-		}
-
-		const visibleJobs = nextJobs.filter((job) => visibleJobStatuses.has(job.status))
-		syncProgressSnapshots(visibleJobs)
-
-		jobs.value = visibleJobs.sort(
-			(a, b) =>
-				getJobSortRank(a) - getJobSortRank(b) ||
-				a.created.localeCompare(b.created) ||
-				(jobOrder.get(a.job_id) ?? 0) - (jobOrder.get(b.job_id) ?? 0),
-		)
-	}
-
-	const progressItems = computed<PopupNotificationProgressItem[]>(() =>
-		jobs.value.map((job) => {
-			const progress = getEffectiveProgress(job)
-
-			return {
-				id: job.job_id,
-				title: getTitle(job),
-				text: getText(job),
-				iconUrl: iconUrls.value[job.job_id] ?? null,
-				progress: getProgress(job),
-				waiting: !job.progress && ['queued', 'running'].includes(job.status),
-				showProgress: !isTerminalJob(job),
-				wrapText: isTerminalJob(job),
-				progressType: isTerminalJob(job) ? undefined : getProgressType(job),
-				progressCurrent: isTerminalJob(job) ? undefined : progress?.current,
-				progressTotal: isTerminalJob(job) ? undefined : progress?.total,
-				buttons: getButtons(job),
-				onDismiss: isTerminalJob(job)
-					? async () => {
-							await install_job_dismiss(job.job_id).catch(opts.handleError)
-							await refresh()
-						}
-					: undefined,
-			}
-		}),
-	)
-
-	const buttons = computed<PopupNotificationButton[] | undefined>(() => undefined)
-
-	async function refreshMetadata(notify = true) {
-		const request = ++metadataRequest
-		const sourceJobs = jobs.value
-		const instanceIds = Array.from(
-			new Set(
-				sourceJobs
-					.map((job) => installJobInstanceId(job))
-					.filter((instanceId): instanceId is string => !!instanceId),
-			),
-		)
-		const instances = instanceIds.length
-			? await getInstances(instanceIds).catch((error) => {
-					opts.handleError(error)
-					return []
-				})
-			: []
-
-		if (request !== metadataRequest) {
-			return
-		}
-
-		const instanceIconUrls = new Map(
-			instances.map((instance) => [instance.id, getDisplayIconUrl(instance.icon_path)]),
-		)
-		instanceNames.value = Object.fromEntries(
-			instances.map((instance) => [instance.id, instance.name]),
-		)
-		iconUrls.value = Object.fromEntries(
-			sourceJobs.map((job) => [
-				job.job_id,
-				getDisplayIconUrl(job.display?.icon) ??
-					instanceIconUrls.get(installJobInstanceId(job) ?? '') ??
-					null,
-			]),
-		)
-
-		if (notify) {
-			opts.onChange()
-		}
-	}
-
-	async function refresh(notify = true) {
-		const request = ++refreshRequest
-		const nextJobs = await install_job_list(false).catch((error) => {
-			opts.handleError(error)
-			return []
-		})
-
-		if (request !== refreshRequest) {
-			return
-		}
-
-		setJobs(nextJobs)
-		await refreshMetadata(false)
-
-		if (request !== refreshRequest) {
-			return
-		}
-
-		if (notify) {
-			opts.onChange()
-		}
-	}
-
-	function applyJobUpdate(job: InstallJobSnapshot) {
-		refreshRequest += 1
-		const existingJob = jobs.value.find((item) => item.job_id === job.job_id)
-		if (existingJob && existingJob.modified.localeCompare(job.modified) > 0) {
-			return
-		}
-
-		setJobs([...jobs.value.filter((item) => item.job_id !== job.job_id), job])
-		opts.onChange()
-		void refreshMetadata()
-	}
-
-	await refresh(false)
-	const unlisten = await install_job_listener((job: InstallJobSnapshot) => applyJobUpdate(job))
-
-	return {
-		active: computed(() => jobs.value.length > 0),
-		title: computed(() => formatMessage(messages.installs)),
-		progressItems,
-		buttons,
-		refresh,
-		dispose: () => {
-			for (const timeout of copiedResetTimeouts.values()) {
-				window.clearTimeout(timeout)
-			}
-			for (const jobId of progressSnapshots.keys()) {
-				clearProgressSnapshot(jobId)
-			}
-			unlisten()
-		},
-	}
-}
@@ -2,24 +2,19 @@ import type { Labrinth } from '@modrinth/api-client'
 import { CheckIcon, PlayIcon, PlusIcon, StopCircleIcon } from '@modrinth/assets'
 import type { CardAction } from '@modrinth/ui'
 import { commonMessages, defineMessages, useDebugLogger, useVIntl } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import type { ComputedRef, Ref } from 'vue'
 import { onUnmounted, ref, shallowRef } from 'vue'
 import type { Router } from 'vue-router'

-import {
-	fetchCachedServerStatus,
-	getFreshCachedServerStatus,
-} from '@/composables/instances/use-server-status-query'
 import { process_listener } from '@/helpers/events'
-import { kill, list as listInstances } from '@/helpers/instance'
-import { get_by_instance_id } from '@/helpers/process'
+import { get_by_profile_path } from '@/helpers/process'
+import { kill, list as listInstances } from '@/helpers/profile.js'
 import type { GameInstance } from '@/helpers/types'
-import { add_server_to_instance, getServerAddress } from '@/helpers/worlds'
+import { add_server_to_profile, getServerLatency } from '@/helpers/worlds'
+import { getServerAddress } from '@/store/install.js'

 interface BrowseServerInstance {
-	id: string
 	name: string
 	path: string
 }
@@ -27,14 +22,14 @@ interface BrowseServerInstance {
 interface ContextMenuHandle {
 	showMenu: (
 		event: MouseEvent,
-		result: Labrinth.Search.v3.ResultSearchProject,
+		result: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
 		options: { name: string }[],
 	) => void
 }

 interface ContextMenuOptionClick {
 	option: 'open_link' | 'copy_link'
-	item: Labrinth.Search.v3.ResultSearchProject
+	item: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject
 }

 export interface UseAppServerBrowseOptions {
@@ -70,13 +65,14 @@ const messages = defineMessages({

 export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 	const { formatMessage } = useVIntl()
-	const queryClient = useQueryClient()
 	const debugLog = useDebugLogger('BrowseServer')
 	const serverPings = shallowRef<Record<string, number | undefined>>({})
+	const serverPingCache = new Map<string, number | undefined>()
+	const pendingServerPings = new Map<string, Promise<number | undefined>>()
 	const runningServerProjects = ref<Record<string, string>>({})
 	const lastServerHits = shallowRef<Labrinth.Search.v3.ResultSearchProject[]>([])
 	const contextMenuRef = ref<ContextMenuHandle | null>(null)
-	let serverPingsActive = true
+	let serverPingCacheActive = true
 	let unlistenProcesses: (() => void) | null = null

 	async function checkServerRunningStates(hits: Labrinth.Search.v3.ResultSearchProject[]) {
@@ -87,11 +83,13 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		})
 		const newRunning: Record<string, string> = {}
 		for (const hit of hits) {
-			const inst = packs.find((pack: GameInstance) => pack.link?.project_id === hit.project_id)
+			const inst = packs.find(
+				(pack: GameInstance) => pack.linked_data?.project_id === hit.project_id,
+			)
 			if (inst) {
-				const processes = await get_by_instance_id(inst.id).catch(() => [])
+				const processes = await get_by_profile_path(inst.path).catch(() => [])
 				if (Array.isArray(processes) && processes.length > 0) {
-					newRunning[hit.project_id] = inst.id
+					newRunning[hit.project_id] = inst.path
 				}
 			}
 		}
@@ -101,9 +99,9 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {

 	async function handleStopServerProject(projectId: string) {
 		debugLog('handleStopServerProject', projectId)
-		const instanceId = runningServerProjects.value[projectId]
-		if (!instanceId) return
-		await kill(instanceId).catch(() => {})
+		const instancePath = runningServerProjects.value[projectId]
+		if (!instancePath) return
+		await kill(instancePath).catch(() => {})
 		const { [projectId]: _, ...rest } = runningServerProjects.value
 		runningServerProjects.value = rest
 	}
@@ -120,10 +118,9 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		if (!address) return

 		if (options.instance.value) {
-			const instanceId = options.instance.value.id
 			try {
-				await add_server_to_instance(
-					instanceId,
+				await add_server_to_profile(
+					options.instance.value.path,
 					project.name,
 					address,
 					'prompt',
@@ -131,7 +128,6 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 					project.minecraft_java_server?.content?.kind,
 				)
 				options.newlyInstalled.value.push(project.project_id)
-				await queryClient.invalidateQueries({ queryKey: ['worlds', instanceId] })
 			} catch (error) {
 				options.handleError(error)
 			}
@@ -149,26 +145,37 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		})
 		const nextPings = { ...serverPings.value }
 		for (const { hit, address } of pingsToFetch) {
-			const cachedStatus = getFreshCachedServerStatus(queryClient, address)
-			if (cachedStatus) {
-				nextPings[hit.project_id] = cachedStatus.ping
+			if (serverPingCache.has(address)) {
+				nextPings[hit.project_id] = serverPingCache.get(address)
 			}
 		}
 		serverPings.value = nextPings

 		await Promise.all(
 			pingsToFetch.map(async ({ hit, address }) => {
-				if (getFreshCachedServerStatus(queryClient, address)) return
+				if (serverPingCache.has(address)) return

-				try {
-					const status = await fetchCachedServerStatus(queryClient, address)
-					if (!serverPingsActive) return
-					serverPings.value = { ...serverPings.value, [hit.project_id]: status.ping }
-				} catch (error) {
-					console.error(`Failed to ping server ${address}:`, error)
-					if (!serverPingsActive) return
-					serverPings.value = { ...serverPings.value, [hit.project_id]: undefined }
+				let pending = pendingServerPings.get(address)
+				if (!pending) {
+					pending = getServerLatency(address)
+						.then((latency) => {
+							if (serverPingCacheActive) serverPingCache.set(address, latency)
+							return latency
+						})
+						.catch((error) => {
+							console.error(`Failed to ping server ${address}:`, error)
+							if (serverPingCacheActive) serverPingCache.set(address, undefined)
+							return undefined
+						})
+						.finally(() => {
+							pendingServerPings.delete(address)
+						})
+					pendingServerPings.set(address, pending)
 				}
+
+				const latency = await pending
+				if (!serverPingCacheActive) return
+				serverPings.value = { ...serverPings.value, [hit.project_id]: latency }
 			}),
 		)
 	}
@@ -263,7 +270,10 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		return actions
 	}

-	function handleRightClick(event: MouseEvent, result: Labrinth.Search.v3.ResultSearchProject) {
+	function handleRightClick(
+		event: MouseEvent,
+		result: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
+	) {
 		contextMenuRef.value?.showMenu(event, result, [{ name: 'open_link' }, { name: 'copy_link' }])
 	}

@@ -279,11 +289,11 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		}
 	}

-	process_listener((event: { event: string; instance_id: string }) => {
+	process_listener((event: { event: string; profile_path_id: string }) => {
 		debugLog('process event', event)
 		if (event.event === 'finished') {
 			const projectId = Object.entries(runningServerProjects.value).find(
-				([, path]) => path === event.instance_id,
+				([, path]) => path === event.profile_path_id,
 			)?.[0]
 			if (projectId) {
 				const { [projectId]: _, ...rest } = runningServerProjects.value
@@ -297,8 +307,10 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		.catch(options.handleError)

 	onUnmounted(() => {
-		serverPingsActive = false
+		serverPingCacheActive = false
 		unlistenProcesses?.()
+		serverPingCache.clear()
+		pendingServerPings.clear()
 	})

 	return {
@@ -312,7 +324,9 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 	}
 }

-function getProjectUrl(item: Labrinth.Search.v3.ResultSearchProject) {
-	const projectType = item.project_types?.[0]
+function getProjectUrl(
+	item: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
+) {
+	const projectType = 'project_types' in item ? item.project_types?.[0] : item.project_type
 	return `https://modrinth.com/${projectType ?? 'project'}/${item.slug ?? item.project_id}`
 }
@@ -1,124 +0,0 @@
-import { type ContentActionWarning, type ContentItem, defineMessages, useVIntl } from '@modrinth/ui'
-import { computed, type Ref } from 'vue'
-
-import type { GameInstance } from '@/helpers/types'
-
-const managedSourceKinds = new Set(['shared_instance', 'modrinth_modpack', 'imported_modpack'])
-
-export function useManagedContentPolicy(instance: Ref<GameInstance>) {
-	const { formatMessage } = useVIntl()
-	const isManagedModpack = computed(() => instance.value.shared_instance?.role === 'member')
-	const isQuarantined = computed(() => instance.value.quarantined)
-	const canUnpublish = computed(() => instance.value.shared_instance?.role === 'owner')
-	const canUnlink = computed(() => instance.value.shared_instance?.role === 'member')
-	const managedModpackWarning = computed(() => ({
-		admonitionHeader: formatMessage(messages.warningHeader),
-		changeVersionBody: formatMessage(messages.changeVersionBody),
-		unlinkBody: formatMessage(messages.unlinkBody),
-	}))
-
-	function isManagedContent(item: ContentItem) {
-		return (
-			isQuarantined.value ||
-			(isManagedModpack.value && !!item.source_kind && managedSourceKinds.has(item.source_kind))
-		)
-	}
-
-	function canMutateContent(item: ContentItem) {
-		return !isManagedContent(item)
-	}
-
-	function canUpdateContent(item: ContentItem) {
-		return (
-			canMutateContent(item) && !!item.file_path && !!item.has_update && !!item.update_version_id
-		)
-	}
-
-	function deleteWarning(items: ContentItem[]): ContentActionWarning | null {
-		if (!items.some(isManagedContent)) return null
-		return {
-			admonitionHeader: formatMessage(messages.warningHeader),
-			admonitionBody: formatMessage(
-				items.length === 1 ? messages.deleteSingleBody : messages.deleteBulkBody,
-			),
-			actionLabel: formatMessage(
-				items.length === 1 ? messages.deleteButton : messages.deleteManyButton,
-				{ count: items.length },
-			),
-		}
-	}
-
-	function disableWarning(items: ContentItem[]): ContentActionWarning | null {
-		if (!items.some(isManagedContent)) return null
-		return {
-			admonitionHeader: formatMessage(messages.warningHeader),
-			admonitionBody: formatMessage(
-				items.length === 1 ? messages.disableSingleBody : messages.disableBulkBody,
-			),
-			actionLabel: formatMessage(
-				items.length === 1 ? messages.disableButton : messages.disableManyButton,
-				{ count: items.length },
-			),
-		}
-	}
-
-	return {
-		isManagedModpack,
-		isQuarantined,
-		canUnpublish,
-		canUnlink,
-		managedModpackWarning,
-		isManagedContent,
-		canMutateContent,
-		canUpdateContent,
-		deleteWarning,
-		disableWarning,
-	}
-}
-
-const messages = defineMessages({
-	warningHeader: {
-		id: 'content.shared-instance.warning-header',
-		defaultMessage: 'This is part of the shared instance',
-	},
-	changeVersionBody: {
-		id: 'content.shared-instance.change-version-body',
-		defaultMessage:
-			'Changing the version only changes your local copy. Future shared instance updates may restore or change it again.',
-	},
-	unlinkBody: {
-		id: 'content.shared-instance.unlink-body',
-		defaultMessage:
-			'Unlinking only changes your local copy. Future shared instance updates may restore or change it again.',
-	},
-	deleteSingleBody: {
-		id: 'content.shared-instance.delete-single-body',
-		defaultMessage:
-			'Deleting it only changes your local copy. Future shared instance updates may restore or change it again.',
-	},
-	deleteBulkBody: {
-		id: 'content.shared-instance.delete-bulk-body',
-		defaultMessage:
-			'Some selected projects are part of the shared instance. Deleting them only changes your local copy, and future shared instance updates may restore or change them again.',
-	},
-	deleteButton: { id: 'content.shared-instance.delete-button', defaultMessage: 'Delete anyway' },
-	deleteManyButton: {
-		id: 'content.shared-instance.delete-many-button',
-		defaultMessage: 'Delete {count, number} projects anyway',
-	},
-	disableSingleBody: {
-		id: 'content.shared-instance.disable-single-body',
-		defaultMessage:
-			'Disabling it only changes your local copy. Future shared instance updates may re-enable, restore, or change it again.',
-	},
-	disableBulkBody: {
-		id: 'content.shared-instance.disable-bulk-body',
-		defaultMessage:
-			'Some selected projects are part of the shared instance. Disabling them only changes your local copy, and future shared instance updates may re-enable, restore, or change them again.',
-	},
-	disableButton: { id: 'content.shared-instance.disable-button', defaultMessage: 'Disable anyway' },
-	disableManyButton: {
-		id: 'content.shared-instance.disable-many-button',
-		defaultMessage: 'Disable {count, number} projects anyway',
-	},
-})
@@ -1,50 +0,0 @@
-import type { QueryClient } from '@tanstack/vue-query'
-
-import {
-	get_server_status,
-	normalizeServerAddress,
-	type ProtocolVersion,
-	type ServerStatus,
-} from '@/helpers/worlds'
-
-export const SERVER_STATUS_CACHE_MS = 10 * 60 * 1000
-
-function getProtocolVersionKey(protocolVersion: ProtocolVersion | null) {
-	if (!protocolVersion) return 'default'
-	return `${protocolVersion.version}:${protocolVersion.legacy ? 'legacy' : 'modern'}`
-}
-
-export function getServerStatusQueryKey(
-	address: string,
-	protocolVersion: ProtocolVersion | null = null,
-) {
-	return [
-		'minecraft-server-status',
-		normalizeServerAddress(address) || address.trim().toLowerCase(),
-		getProtocolVersionKey(protocolVersion),
-	] as const
-}
-
-export function getFreshCachedServerStatus(
-	queryClient: QueryClient,
-	address: string,
-	protocolVersion: ProtocolVersion | null = null,
-) {
-	const queryKey = getServerStatusQueryKey(address, protocolVersion)
-	const updatedAt = queryClient.getQueryState(queryKey)?.dataUpdatedAt ?? 0
-	if (!updatedAt || Date.now() - updatedAt >= SERVER_STATUS_CACHE_MS) return undefined
-	return queryClient.getQueryData<ServerStatus>(queryKey)
-}
-
-export async function fetchCachedServerStatus(
-	queryClient: QueryClient,
-	address: string,
-	protocolVersion: ProtocolVersion | null = null,
-) {
-	return await queryClient.fetchQuery({
-		queryKey: getServerStatusQueryKey(address, protocolVersion),
-		queryFn: () => get_server_status(address, protocolVersion),
-		staleTime: SERVER_STATUS_CACHE_MS,
-		gcTime: SERVER_STATUS_CACHE_MS,
-	})
-}
@@ -1,148 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
-import { computed, type MaybeRefOrGetter, onUnmounted, toValue } from 'vue'
-
-import { toError } from '@/helpers/errors'
-import { friend_listener } from '@/helpers/events.js'
-import {
-	acceptCachedFriend,
-	add_friend,
-	createPendingFriend,
-	type FriendCacheUser,
-	friendsQueryKey,
-	type FriendWithUserData,
-	getFriendsWithUserData,
-	getFriendUserId,
-	matchesFriend,
-	remove_friend,
-	removeCachedFriend,
-	upsertCachedFriend,
-} from '@/helpers/friends'
-import type { ModrinthCredentials } from '@/helpers/mr_auth'
-
-type FriendsMutationContext = {
-	queryKey: ReturnType<typeof friendsQueryKey>
-	previousFriends?: FriendWithUserData[]
-}
-
-type AddFriendMutationVariables = {
-	userId: string
-	user: FriendCacheUser
-	acceptExisting: boolean
-}
-
-type RemoveFriendMutationVariables = {
-	userId: string
-	user: FriendWithUserData
-}
-
-export function useFriends(options: {
-	currentUserId: MaybeRefOrGetter<string | null | undefined>
-	getCredentials: () => ModrinthCredentials | null | Promise<ModrinthCredentials | null>
-	enabled?: MaybeRefOrGetter<boolean>
-	onError?: (error: Error) => void
-}) {
-	const queryClient = useQueryClient()
-	const queryKey = computed(() => friendsQueryKey(toValue(options.currentUserId)))
-	const query = useQuery({
-		queryKey,
-		queryFn: async () => getFriendsWithUserData(await options.getCredentials()),
-		enabled: () => !!toValue(options.currentUserId) && toValue(options.enabled ?? true),
-		staleTime: 30_000,
-	})
-	const friends = computed(() => query.data.value ?? [])
-
-	function restore(context?: FriendsMutationContext) {
-		if (!context) return
-		if (context.previousFriends === undefined) {
-			queryClient.removeQueries({ queryKey: context.queryKey, exact: true })
-			return
-		}
-		queryClient.setQueryData(context.queryKey, context.previousFriends)
-	}
-
-	const addMutation = useMutation({
-		mutationFn: ({ userId }: AddFriendMutationVariables) => add_friend(userId),
-		onMutate: async ({ user, acceptExisting }): Promise<FriendsMutationContext> => {
-			const activeQueryKey = queryKey.value
-			await queryClient.cancelQueries({ queryKey: activeQueryKey })
-			const previousFriends = queryClient.getQueryData<FriendWithUserData[]>(activeQueryKey)
-			const currentUserId = toValue(options.currentUserId)
-			queryClient.setQueryData<FriendWithUserData[]>(activeQueryKey, (cachedFriends = []) =>
-				acceptExisting
-					? acceptCachedFriend(cachedFriends, user.id, user.username, currentUserId)
-					: upsertCachedFriend(
-							cachedFriends,
-							createPendingFriend(user, currentUserId),
-							currentUserId,
-						),
-			)
-			return { queryKey: activeQueryKey, previousFriends }
-		},
-		onError: (error, _variables, context) => {
-			restore(context)
-			options.onError?.(toError(error))
-		},
-		onSettled: (_data, _error, _variables, context) => {
-			void queryClient.invalidateQueries({ queryKey: context?.queryKey ?? queryKey.value })
-		},
-	})
-
-	const removeMutation = useMutation({
-		mutationFn: ({ userId }: RemoveFriendMutationVariables) => remove_friend(userId),
-		onMutate: async ({ user, userId }): Promise<FriendsMutationContext> => {
-			const activeQueryKey = queryKey.value
-			await queryClient.cancelQueries({ queryKey: activeQueryKey })
-			const previousFriends = queryClient.getQueryData<FriendWithUserData[]>(activeQueryKey)
-			queryClient.setQueryData<FriendWithUserData[]>(activeQueryKey, (cachedFriends = []) =>
-				removeCachedFriend(cachedFriends, userId, user.username, toValue(options.currentUserId)),
-			)
-			return { queryKey: activeQueryKey, previousFriends }
-		},
-		onError: (error, _variables, context) => {
-			restore(context)
-			options.onError?.(toError(error))
-		},
-		onSettled: (_data, _error, _variables, context) => {
-			void queryClient.invalidateQueries({ queryKey: context?.queryKey ?? queryKey.value })
-		},
-	})
-
-	function requestFriend(user: FriendCacheUser, acceptExisting = false) {
-		addMutation.mutate({ userId: user.id, user, acceptExisting })
-	}
-
-	function acceptFriend(friend: FriendWithUserData) {
-		const userId = getFriendUserId(friend, toValue(options.currentUserId))
-		requestFriend({ id: userId, username: friend.username, avatarUrl: friend.avatar }, true)
-	}
-
-	function removeFriend(friend: FriendWithUserData) {
-		const userId = getFriendUserId(friend, toValue(options.currentUserId))
-		removeMutation.mutate({ userId, user: friend })
-	}
-
-	function findFriend(id: string, username: string) {
-		return friends.value.find((friend) =>
-			matchesFriend(friend, id, username, toValue(options.currentUserId)),
-		)
-	}
-
-	let unlisten: (() => void) | undefined
-	void friend_listener(() => {
-		void queryClient.invalidateQueries({ queryKey: queryKey.value })
-	}).then((listener) => {
-		unlisten = listener
-	})
-	onUnmounted(() => unlisten?.())
-
-	return {
-		query,
-		queryKey,
-		friends,
-		loading: computed(() => !!toValue(options.currentUserId) && query.isLoading.value),
-		requestFriend,
-		acceptFriend,
-		removeFriend,
-		findFriend,
-	}
-}
@@ -22,8 +22,8 @@ interface InstanceConsoleEntry {

 const instances = new Map<string, InstanceConsoleEntry>()

-function getOrCreate(instanceId: string): InstanceConsoleEntry {
-	let entry = instances.get(instanceId)
+function getOrCreate(profilePathId: string): InstanceConsoleEntry {
+	let entry = instances.get(profilePathId)
 	if (entry) return entry

 	entry = {
@@ -32,25 +32,25 @@ function getOrCreate(instanceId: string): InstanceConsoleEntry {
 		historicalCache: new Map(),
 		logList: null,
 	}
-	instances.set(instanceId, entry)
+	instances.set(profilePathId, entry)
 	return entry
 }

-async function hydrate(instanceId: string): Promise<void> {
-	const entry = getOrCreate(instanceId)
+async function hydrate(profilePathId: string): Promise<void> {
+	const entry = getOrCreate(profilePathId)
 	if (entry.liveConsole.output.value.length > 0) return

-	const buffer = await get_live_log_buffer(instanceId)
+	const buffer = await get_live_log_buffer(profilePathId)
 	if (buffer) {
 		entry.liveConsole.addLegacyLog(buffer)
 	}
 }

-async function getHistoricalLogs(instanceId: string): Promise<LogEntry[]> {
-	const entry = getOrCreate(instanceId)
+async function getHistoricalLogs(profilePathId: string, instancePath: string): Promise<LogEntry[]> {
+	const entry = getOrCreate(profilePathId)
 	if (entry.logList) return entry.logList

-	const logs: LogEntry[] = await get_logs(instanceId, true)
+	const logs: LogEntry[] = await get_logs(instancePath, true)
 	entry.logList = logs

 	for (const log of logs) {
@@ -62,38 +62,38 @@ async function getHistoricalLogs(instanceId: string): Promise<LogEntry[]> {
 	return logs
 }

-function getHistoricalContent(instanceId: string, filename: string): string | undefined {
-	return instances.get(instanceId)?.historicalCache.get(filename)
+function getHistoricalContent(profilePathId: string, filename: string): string | undefined {
+	return instances.get(profilePathId)?.historicalCache.get(filename)
 }

-function invalidate(instanceId: string): void {
-	const entry = instances.get(instanceId)
+function invalidate(profilePathId: string): void {
+	const entry = instances.get(profilePathId)
 	if (!entry) return
 	entry.historicalCache.clear()
 	entry.logList = null
 }

-async function clearLive(instanceId: string): Promise<void> {
-	const entry = getOrCreate(instanceId)
+async function clearLive(profilePathId: string): Promise<void> {
+	const entry = getOrCreate(profilePathId)
 	entry.liveConsole.clear()
-	await clear_log_buffer(instanceId).catch(() => {})
+	await clear_log_buffer(profilePathId).catch(() => {})
 }

-async function destroy(instanceId: string): Promise<void> {
-	instances.delete(instanceId)
-	await clear_log_buffer(instanceId).catch(() => {})
+async function destroy(profilePathId: string): Promise<void> {
+	instances.delete(profilePathId)
+	await clear_log_buffer(profilePathId).catch(() => {})
 }

-export function useInstanceConsole(instanceId: string) {
-	const entry = getOrCreate(instanceId)
+export function useInstanceConsole(profilePathId: string) {
+	const entry = getOrCreate(profilePathId)
 	return {
 		liveConsole: entry.liveConsole,
 		historicalConsole: entry.historicalConsole,
-		hydrate: () => hydrate(instanceId),
-		getHistoricalLogs: () => getHistoricalLogs(instanceId),
-		getHistoricalContent: (filename: string) => getHistoricalContent(instanceId, filename),
-		invalidate: () => invalidate(instanceId),
-		clearLive: () => clearLive(instanceId),
-		destroy: () => destroy(instanceId),
+		hydrate: () => hydrate(profilePathId),
+		getHistoricalLogs: (instancePath: string) => getHistoricalLogs(profilePathId, instancePath),
+		getHistoricalContent: (filename: string) => getHistoricalContent(profilePathId, filename),
+		invalidate: () => invalidate(profilePathId),
+		clearLive: () => clearLive(profilePathId),
+		destroy: () => destroy(profilePathId),
 	}
 }
@@ -1,17 +0,0 @@
-import { useQuery } from '@tanstack/vue-query'
-import { computed, type Ref } from 'vue'
-
-import { get_user } from '@/helpers/cache.js'
-
-export function useUserQuery(userId: Ref<string | null | undefined>) {
-	return useQuery({
-		queryKey: computed(() => ['user', userId.value]),
-		queryFn: async ({ queryKey }) => {
-			const id = queryKey[1]
-			if (typeof id !== 'string') return null
-			return await get_user(id, 'bypass').catch(() => null)
-		},
-		enabled: () => !!userId.value,
-		staleTime: 30_000,
-	})
-}
@@ -7,9 +7,6 @@ const labrinthBaseUrl = trimTrailingSlash(
 const archonBaseUrl = trimTrailingSlash(
 	import.meta.env.MODRINTH_ARCHON_BASE_URL || 'https://archon.modrinth.com',
 )
-const sharedInstancesBaseUrl = trimTrailingSlash(
-	import.meta.env.SHARED_INSTANCES_API_BASE_URL || 'https://shared-instances.modrinth.com',
-)

 export const config = {
 	siteUrl,
@@ -18,5 +15,4 @@ export const config = {
 		'pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b',
 	labrinthBaseUrl,
 	archonBaseUrl,
-	sharedInstancesBaseUrl,
 }
@@ -1,5 +1,4 @@
 import { invoke } from '@tauri-apps/api/core'
-import { listen } from '@tauri-apps/api/event'

 export async function init_ads_window(overrideShown = false) {
 	return await invoke('plugin:ads|init_ads_window', {
@@ -16,22 +15,6 @@ export async function hide_ads_window(reset) {
 	return await invoke('plugin:ads|hide_ads_window', { reset })
 }

-export async function should_show_ads_consent_popup() {
-	return await invoke('plugin:ads|should_show_ads_consent_popup')
-}
-
-export async function perform_ads_consent_action(action) {
-	return await invoke('plugin:ads|perform_ads_consent_action', { action })
-}
-
-export async function open_ads_consent_preferences() {
-	return await invoke('plugin:ads|open_ads_consent_preferences')
-}
-
-export async function ads_consent_listener(callback) {
-	return await listen('ads-consent-required', (event) => callback(event.payload))
-}
-
 export async function record_ads_click() {
 	return await invoke('plugin:ads|record_ads_click')
 }
@@ -1,6 +1,6 @@
 /**
 * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
 *  and deserialized into a usable JS object.
 */
 import { invoke } from '@tauri-apps/api/core'
@@ -1,11 +0,0 @@
-export function toError(error: unknown) {
-	if (error instanceof Error) return error
-	if (typeof error === 'string') return new Error(error)
-	if (error && typeof error === 'object') {
-		const record = error as Record<string, unknown>
-		const message = record.message ?? record.error
-		if (typeof message === 'string') return new Error(message)
-		return new Error(JSON.stringify(error))
-	}
-	return new Error(String(error))
-}
@@ -31,8 +31,8 @@ import { listen } from '@tauri-apps/api/event'
          pack_name: name of the pack
          pack_id, optional, the id of the modpack
          pack_version, optional, the version of the modpack
-          instance_name: name of the instance
-          instance_id: unique identification of the instance
+          profile_name: name of the profile
+          profile_uuid: unique identification of the profile

        }
        loader_uuid: unique identification of the loading bar
@@ -57,32 +57,18 @@ export async function process_listener(callback) {
 	return await listen('process', (event) => callback(event.payload))
 }

-/// Payload for the 'instance' event
+/// Payload for the 'profile' event
 /*
-    InstancePayload {
-        instance_id: unique identification of the instance
+    ProfilePayload {
+        uuid: unique identification of the process in the state (currently identified by path, but that will change)
+        name: name of the profile
+        profile_path: relative path toprofile_listener profile (used for path identification)
+        path: path to profile (used for opening the profile in the OS file explorer)
        event: event type ("Created", "Added", "Edited", "Removed")
    }
 */
-export async function instance_listener(callback) {
-	return await listen('instance', (event) => callback(event.payload))
-}
-
-/// Payload for the 'instance_bulk_update_progress' event
-/*
-    InstanceBulkUpdateProgress {
-        instanceId: string
-        stage: "resolving_versions" | "downloading" | "finishing"
-        current: number
-        total: number
-    }
-*/
-export async function instance_bulk_update_progress_listener(callback) {
-	return await listen('instance_bulk_update_progress', (event) => callback(event.payload))
-}
-
-export async function install_job_listener(callback) {
-	return await listen('install_job', (event) => callback(event.payload))
+export async function profile_listener(callback) {
+	return await listen('profile', (event) => callback(event.payload))
 }

 /// Payload for the 'command' event
@@ -119,7 +105,7 @@ export async function notification_listener(callback) {
 /// Payload for the 'log' event
 /*
    LogPayload {
-        instance_id: string,
+        profile_path_id: string,
        type: "log4j" | "legacy",
        // log4j fields (when type === "log4j"):
        timestamp_millis?: number,
@@ -6,11 +6,9 @@ import dayjs from 'dayjs'
 import { get_user_many } from '@/helpers/cache'
 import type { ModrinthCredentials } from '@/helpers/mr_auth'

-export const friendsQueryKey = (userId?: string | null) => ['friends', userId ?? null] as const
-
 export type UserStatus = {
 	user_id: string
-	instance_name: string | null
+	profile_name: string | null
 	last_update: string
 }

@@ -48,111 +46,6 @@ export type FriendWithUserData = {
 	online: boolean
 	avatar: string
 }
-
-export type FriendCacheUser = {
-	id: string
-	username: string
-	avatarUrl?: string | null
-}
-
-export async function getFriendsWithUserData(
-	credentials: ModrinthCredentials | null,
-): Promise<FriendWithUserData[]> {
-	if (!credentials) return []
-
-	const friendsList = await friends()
-	return await transformFriends(friendsList, credentials)
-}
-
-export function createPendingFriend(
-	user: FriendCacheUser,
-	currentUserId?: string | null,
-): FriendWithUserData {
-	return {
-		id: user.id,
-		friend_id: currentUserId ?? null,
-		status: null,
-		last_updated: null,
-		created: dayjs(),
-		username: user.username,
-		accepted: false,
-		online: false,
-		avatar: user.avatarUrl ?? '',
-	}
-}
-
-export function getFriendUserId(
-	friend: Pick<FriendWithUserData, 'id' | 'friend_id'>,
-	currentUserId?: string | null,
-) {
-	return friend.id === currentUserId && friend.friend_id ? friend.friend_id : friend.id
-}
-
-export function matchesFriend(
-	friend: FriendWithUserData,
-	id: string,
-	username: string,
-	currentUserId?: string | null,
-) {
-	const friendId = getFriendUserId(friend, currentUserId)
-	return (
-		normalizeFriendKey(friendId) === normalizeFriendKey(id) ||
-		normalizeFriendKey(friend.username) === normalizeFriendKey(username)
-	)
-}
-
-export function upsertCachedFriend(
-	friends: FriendWithUserData[],
-	friend: FriendWithUserData,
-	currentUserId?: string | null,
-) {
-	const existingFriend = friends.find((cachedFriend) =>
-		matchesFriend(cachedFriend, friend.id, friend.username, currentUserId),
-	)
-
-	if (!existingFriend) return [friend, ...friends]
-
-	return friends.map((cachedFriend) =>
-		matchesFriend(cachedFriend, friend.id, friend.username, currentUserId)
-			? {
-					...cachedFriend,
-					...friend,
-					id: cachedFriend.id,
-					friend_id: cachedFriend.friend_id,
-				}
-			: cachedFriend,
-	)
-}
-
-export function acceptCachedFriend(
-	friends: FriendWithUserData[],
-	id: string,
-	username: string,
-	currentUserId?: string | null,
-) {
-	return friends.map((friend) =>
-		matchesFriend(friend, id, username, currentUserId)
-			? {
-					...friend,
-					accepted: true,
-				}
-			: friend,
-	)
-}
-
-export function removeCachedFriend(
-	friends: FriendWithUserData[],
-	id: string,
-	username: string,
-	currentUserId?: string | null,
-) {
-	return friends.filter((friend) => !matchesFriend(friend, id, username, currentUserId))
-}
-
-export function normalizeFriendKey(value: string) {
-	return value.trim().toLowerCase()
-}
-
 export async function transformFriends(
 	friends: UserFriend[],
 	credentials: ModrinthCredentials | null,
@@ -1,11 +1,11 @@
 /**
 * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
 *  and deserialized into a usable JS object.
 */
 import { invoke } from '@tauri-apps/api/core'

-import { install_import_instance } from './install'
+import { create } from './profile'

 /*
  API for importing instances from other launchers
@@ -32,8 +32,19 @@ export async function get_importable_instances(launcherType, basePath) {
 }

 /// Import an instance from a launcher type and base path
+/// eg: import_instance("profile-name-to-go-to", "MultiMC", "C:/MultiMC", "Instance 1")
 export async function import_instance(launcherType, basePath, instanceFolder) {
-	return await install_import_instance(launcherType, basePath, instanceFolder)
+	// create a basic, empty instance (most properties will be filled in by the import process)
+	// We do NOT watch the fs for changes to avoid duplicate events during installation
+	// fs watching will be enabled once the instance is imported
+	const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)
+
+	return await invoke('plugin:import|import_instance', {
+		profilePath,
+		launcherType,
+		basePath,
+		instanceFolder,
+	})
 }

 /// Checks if this instance is valid for importing, given a certain launcher type
@@ -1,444 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-
-import { install_job_listener } from './events'
-import type { InstanceLink, InstanceLoader } from './types'
-
-export interface PackLocationVersionId {
-	type: 'fromVersionId'
-	project_id: string
-	version_id: string
-	title: string
-	icon_url?: string | null
-}
-
-export interface PackLocationFile {
-	type: 'fromFile'
-	path: string
-}
-
-export type CreatePackLocation = PackLocationVersionId | PackLocationFile
-
-export interface InstallModpackPreview {
-	name: string
-	gameVersion: string
-	modloader: InstanceLoader
-	loaderVersion: string | null
-	icon?: string | null
-	iconUrl?: string | null
-	link?: InstanceLink | null
-	unknownFile: boolean
-	externalFilesInModpack: string[]
-}
-
-export interface InstallCreateInstanceRequest {
-	name: string
-	gameVersion: string
-	loader: InstanceLoader
-	loaderVersion: string | null
-	iconPath: string | null
-	link?: InstanceLink | null
-}
-
-export interface InstallPostInstallEdit {
-	name?: string | null
-	iconPath?: string | null
-	link?: InstanceLink | null
-}
-
-export interface SharedInstanceInstallPreview {
-	sharedInstanceId: string
-	version: number
-	name: string
-	iconUrl?: string | null
-	gameVersion: string
-	loader: InstanceLoader
-	modCount: number
-	externalFileCount: number
-	modpackVersionId?: string | null
-	contentVersionIds: string[]
-	externalFiles: SharedInstanceExternalFilePreview[]
-}
-
-export interface SharedInstanceInviteInstallPreview {
-	sharedInstanceId: string
-	managerId?: string | null
-	serverManagerName?: string | null
-	serverManagerIconUrl?: string | null
-	instanceIconUrl?: string | null
-	preview: SharedInstanceInstallPreview
-}
-
-export interface SharedInstanceExternalFilePreview {
-	fileName: string
-	fileType: string
-}
-
-export interface SharedInstanceUpdatePreview {
-	sharedInstanceId: string
-	currentVersion?: number | null
-	latestVersion: number
-	updateAvailable: boolean
-	diffs: SharedInstanceUpdateDiff[]
-}
-
-export interface SharedInstanceUpdateDiff {
-	type:
-		| 'added'
-		| 'removed'
-		| 'updated'
-		| 'modpack_linked'
-		| 'modpack_updated'
-		| 'modpack_unlinked'
-		| 'game_version_updated'
-		| 'loader_updated'
-		| 'config_files_updated'
-	projectId?: string | null
-	projectName?: string | null
-	fileName?: string | null
-	currentVersionName?: string | null
-	newVersionName?: string | null
-	configFileCount?: number | null
-	disabled?: boolean
-}
-
-export const SHARED_INSTANCE_UNAVAILABLE_ERROR_CODE = 'shared_instance_unavailable'
-
-export type SharedInstanceUnavailableReason = 'deleted' | 'access_revoked' | 'quarantined'
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return typeof value === 'object' && value !== null
-}
-
-export function isSharedInstanceUnavailableError(error: unknown) {
-	return getSharedInstanceUnavailableReason(error) !== null
-}
-
-export function getSharedInstanceUnavailableReason(
-	error: unknown,
-): SharedInstanceUnavailableReason | null {
-	if (!isRecord(error) || error.code !== SHARED_INSTANCE_UNAVAILABLE_ERROR_CODE) return null
-	return error.reason === 'deleted' ||
-		error.reason === 'access_revoked' ||
-		error.reason === 'quarantined'
-		? error.reason
-		: null
-}
-
-export function getErrorMessage(error: unknown): string {
-	if (typeof error === 'string') return error
-	if (error instanceof Error) return error.message || 'Unknown error'
-	if (isRecord(error) && typeof error.message === 'string') return error.message
-	return 'Unknown error'
-}
-
-export type InstallJobStatus =
-	| 'queued'
-	| 'running'
-	| 'succeeded'
-	| 'failed'
-	| 'interrupted'
-	| 'canceled'
-
-export type InstallPhaseId =
-	| 'preparing_instance'
-	| 'resolving_pack'
-	| 'downloading_pack_file'
-	| 'reading_pack_manifest'
-	| 'downloading_content'
-	| 'extracting_overrides'
-	| 'resolving_minecraft'
-	| 'resolving_loader'
-	| 'preparing_java'
-	| 'downloading_minecraft'
-	| 'running_loader_processors'
-	| 'finalizing'
-	| 'rolling_back'
-
-export interface InstallProgress {
-	current: number
-	total: number
-	secondary?: InstallProgressSecondary | null
-}
-
-export interface InstallProgressSecondary {
-	current: number
-	total: number
-}
-
-export type InstallJavaStep =
-	| 'resolving'
-	| 'fetching_metadata'
-	| 'downloading'
-	| 'extracting'
-	| 'validating'
-
-export interface InstallErrorView {
-	code: string
-	phase?: InstallPhaseId | null
-	message: string
-	reason?: SharedInstanceUnavailableReason | null
-	api?: {
-		error: string
-		status?: number | null
-		method?: string | null
-		url?: string | null
-		route?: string | null
-	} | null
-	context?: {
-		operation: string
-		source_path?: string | null
-		target_path?: string | null
-		file_path?: string | null
-		entry_path?: string | null
-		urls?: string[]
-		expected_hash?: string | null
-		expected_size?: number | null
-		project_id?: string | null
-		version_id?: string | null
-		minecraft_version?: string | null
-		loader?: string | null
-		java_version?: number | null
-		os?: string | null
-		arch?: string | null
-	} | null
-}
-
-export interface InstallJobSnapshot {
-	job_id: string
-	instance_id?: string | null
-	kind:
-		| 'create_instance'
-		| 'create_modpack_instance'
-		| 'create_shared_instance'
-		| 'update_shared_instance'
-		| 'import_instance'
-		| 'duplicate_instance'
-		| 'install_existing_instance'
-		| 'install_pack_to_existing_instance'
-	status: InstallJobStatus
-	target:
-		| { type: 'new_instance'; instance_id?: string | null }
-		| { type: 'existing_instance'; instance_id: string }
-	phase: InstallPhaseId
-	progress?: InstallProgress | null
-	details:
-		| { type: 'empty' }
-		| { type: 'instance'; name: string }
-		| { type: 'minecraft'; game_version: string; loader: InstanceLoader }
-		| { type: 'java'; major_version: number; step: InstallJavaStep }
-		| {
-				type: 'modpack'
-				project_id?: string | null
-				version_id?: string | null
-				title?: string | null
-		  }
-		| { type: 'import'; launcher_type: string; instance_folder: string }
-	display?: { title: string; icon?: string | null } | null
-	error?: InstallErrorView | null
-	rollback_error?: InstallErrorView | null
-	created: string
-	modified: string
-	finished?: string | null
-}
-
-export async function install_get_modpack_preview(location: CreatePackLocation) {
-	return await invoke<InstallModpackPreview>('plugin:install|install_get_modpack_preview', {
-		location,
-	})
-}
-
-export async function install_create_instance(request: InstallCreateInstanceRequest) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_create_instance', { request })
-}
-
-export async function install_create_modpack_instance(
-	location: CreatePackLocation,
-	postInstallEdit?: InstallPostInstallEdit | null,
-) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_create_modpack_instance', {
-		location,
-		postInstallEdit,
-	})
-}
-
-export async function install_get_shared_instance_preview(sharedInstanceId: string, name: string) {
-	return await invoke<SharedInstanceInstallPreview>(
-		'plugin:install|install_get_shared_instance_preview',
-		{
-			sharedInstanceId,
-			name,
-		},
-	)
-}
-
-export async function install_accept_shared_instance_invite(inviteId: string) {
-	return await invoke<SharedInstanceInviteInstallPreview>(
-		'plugin:install|install_accept_shared_instance_invite',
-		{
-			inviteId,
-		},
-	)
-}
-
-export async function install_get_shared_instance_update_preview(instanceId: string) {
-	return await invoke<SharedInstanceUpdatePreview | null>(
-		'plugin:install|install_get_shared_instance_update_preview',
-		{
-			instanceId,
-		},
-	)
-}
-
-export async function install_shared_instance(
-	sharedInstanceId: string,
-	name: string,
-	managerId?: string | null,
-	serverManagerName?: string | null,
-	serverManagerIconUrl?: string | null,
-	instanceIconUrl?: string | null,
-) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_shared_instance', {
-		sharedInstanceId,
-		name,
-		managerId,
-		serverManagerName,
-		serverManagerIconUrl,
-		instanceIconUrl,
-	})
-}
-
-export async function install_update_shared_instance(instanceId: string) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_update_shared_instance', {
-		instanceId,
-	})
-}
-
-export async function install_import_instance(
-	launcherType: string,
-	basePath: string,
-	instanceFolder: string,
-) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_import_instance', {
-		launcherType,
-		basePath,
-		instanceFolder,
-	})
-}
-
-export async function install_duplicate_instance(sourceInstanceId: string) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_duplicate_instance', {
-		sourceInstanceId,
-	})
-}
-
-export async function install_existing_instance(instanceId: string, force: boolean) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_existing_instance', {
-		instanceId,
-		force,
-	})
-}
-
-export async function install_pack_to_existing_instance(
-	instanceId: string,
-	location: CreatePackLocation,
-	postInstallEdit?: InstallPostInstallEdit | null,
-) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_pack_to_existing_instance', {
-		instanceId,
-		location,
-		postInstallEdit,
-	})
-}
-
-export async function install_job_list(includeFinished: boolean) {
-	return await invoke<InstallJobSnapshot[]>('plugin:install|install_job_list', { includeFinished })
-}
-
-export async function install_job_get(jobId: string) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_job_get', { jobId })
-}
-
-export async function install_job_retry(jobId: string) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_job_retry', { jobId })
-}
-
-export async function install_job_cancel(jobId: string) {
-	return await invoke<InstallJobSnapshot>('plugin:install|install_job_cancel', { jobId })
-}
-
-export async function install_job_dismiss(jobId: string) {
-	return await invoke<void>('plugin:install|install_job_dismiss', { jobId })
-}
-
-export async function install_job_support_details(jobId: string) {
-	return await invoke<string>('plugin:install|install_job_support_details', { jobId })
-}
-
-export function installJobInstanceId(job: InstallJobSnapshot): string | null {
-	return job.instance_id ?? job.target.instance_id ?? null
-}
-
-export function isInstallJobFinished(status: InstallJobStatus) {
-	return (
-		status === 'succeeded' ||
-		status === 'failed' ||
-		status === 'interrupted' ||
-		status === 'canceled'
-	)
-}
-
-function settleInstallJob(job: InstallJobSnapshot) {
-	if (job.status === 'succeeded') return job
-
-	if (job.error) throw job.error
-	throw new Error(`Install job ${job.job_id} ${job.status}`)
-}
-
-export async function wait_for_install_job(jobId: string) {
-	const current = await install_job_get(jobId)
-	if (isInstallJobFinished(current.status)) return settleInstallJob(current)
-
-	return await new Promise<InstallJobSnapshot>((resolve, reject) => {
-		let finished = false
-		let unlisten: (() => void) | null = null
-
-		const cleanup = () => {
-			if (unlisten) {
-				unlisten()
-				unlisten = null
-			}
-		}
-
-		const resolveJob = (job: InstallJobSnapshot) => {
-			if (finished || job.job_id !== jobId || !isInstallJobFinished(job.status)) return
-
-			finished = true
-			cleanup()
-
-			try {
-				resolve(settleInstallJob(job))
-			} catch (err) {
-				reject(err)
-			}
-		}
-
-		const rejectWait = (err: unknown) => {
-			if (finished) return
-			finished = true
-			cleanup()
-			reject(err)
-		}
-
-		install_job_listener(resolveJob)
-			.then((listener) => {
-				if (finished) {
-					listener()
-					return
-				}
-
-				unlisten = listener
-				install_job_get(jobId).then(resolveJob).catch(rejectWait)
-			})
-			.catch(rejectWait)
-	})
-}
@@ -10,7 +10,7 @@ import {
 	get_content_items,
 	get_linked_modpack_info,
 	type LinkedModpackInfo,
-} from '@/helpers/instance'
+} from '@/helpers/profile'
 import { get_categories } from '@/helpers/tags.js'
 import type { CacheBehaviour } from '@/helpers/types'

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
François-X. T.	fb91d5599c	chore: prettier	2026-06-17 18:00:52 -04:00
François-X. T.	815d4db8c2	chore: fix export	2026-06-17 15:48:18 -04:00
François-X. T.	a7014a6467	fix(frontend): wss assumptions	2026-06-16 18:14:38 -04:00
François-X. T.	5dbba00eb2	fix(frontend): dont assume wss for panel pingtest as well	2026-06-16 17:51:47 -04:00