Added confirm for checking discussion threads

Signed-off-by: Jakob <minenash@protonmail.com>
fixed tag in web bug report
2024-08-28 01:17:31 -04:00 · 2024-08-28 01:12:55 -04:00
1245 changed files with 26741 additions and 142287 deletions
--- a/.github/ISSUE_TEMPLATE/1-app-bug.yml
+++ b/.github/ISSUE_TEMPLATE/1-app-bug.yml
@@ -56,4 +56,4 @@ body:
      label: Additional context
      description: Add any other context about the problem here.
    validations:
-      required: false
+      required: false
--- a/.github/ISSUE_TEMPLATE/3-api-bug.yml
+++ b/.github/ISSUE_TEMPLATE/3-api-bug.yml
@@ -1,6 +1,6 @@
 name: 🛠️ API issue (api.modrinth.com)
 description: Report an issue regarding the Modrinth API.
-labels: [bug, backend]
+labels: [bug, api]
 body:
  - type: checkboxes
    attributes:
@@ -38,4 +38,4 @@ body:
      label: Additional context
      description: Add any other context about the problem here.
    validations:
-      required: false
+      required: false
--- a/.github/ISSUE_TEMPLATE/4-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/4-feature-request.yml
@@ -9,6 +9,8 @@ body:
      options:
        - label: I checked the [existing issues](https://github.com/modrinth/code/issues) for duplicate feature requests
          required: true
+        - label: I checked the [existing discussions](https://github.com/orgs/modrinth/discussions) for duplicate feature requests
+          required: true
        - label: I have checked that this feature request is not on our [roadmap](https://roadmap.modrinth.com)
          required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -11,4 +11,4 @@ contact_links:
    url: https://roadmap.modrinth.com
  - name: 📚 Documentation
    about: Useful documentation about Modrinth's API
-    url: https://docs.modrinth.com
+    url: https://docs.modrinth.com
--- a/.github/workflows/theseus-release.yml
+++ b/.github/workflows/theseus-release.yml
@@ -44,28 +44,7 @@ jobs:
      - name: Setup rust cache
        uses: actions/cache@v4
        with:
-          path: |
-            target/**
-            !target/*/release/bundle/*/*.dmg
-            !target/*/release/bundle/*/*.app.tar.gz
-            !target/*/release/bundle/*/*.app.tar.gz.sig
-            !target/release/bundle/*/*.dmg
-            !target/release/bundle/*/*.app.tar.gz
-            !target/release/bundle/*/*.app.tar.gz.sig
-
-            !target/release/bundle/*/*.AppImage
-            !target/release/bundle/*/*.AppImage.tar.gz
-            !target/release/bundle/*/*.AppImage.tar.gz.sig
-            !target/release/bundle/*/*.deb
-            !target/release/bundle/*/*.rpm
-
-            !target/release/bundle/msi/*.msi
-            !target/release/bundle/msi/*.msi.zip
-            !target/release/bundle/msi/*.msi.zip.sig
-
-            !target/release/bundle/nsis/*.exe
-            !target/release/bundle/nsis/*.nsis.zip
-            !target/release/bundle/nsis/*.nsis.zip.sig
+          path: target/**
          key: ${{ runner.os }}-rust-target-${{ hashFiles('**/Cargo.lock') }}
          restore-keys: |
            ${{ runner.os }}-rust-target-
@@ -99,7 +78,7 @@ jobs:
        if: startsWith(matrix.platform, 'ubuntu')
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev pkg-config libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev sqlite3

      - name: Install frontend dependencies
        run: pnpm install
@@ -145,11 +124,8 @@ jobs:
            target/release/bundle/*/*.AppImage.tar.gz.sig
            target/release/bundle/*/*.deb
            target/release/bundle/*/*.rpm
+            
+            target/release/bundle/*/*.msi
+            target/release/bundle/*/*.msi.zip
+            target/release/bundle/*/*.msi.zip.sig

-            target/release/bundle/msi/*.msi
-            target/release/bundle/msi/*.msi.zip
-            target/release/bundle/msi/*.msi.zip.sig
-
-            target/release/bundle/nsis/*.exe
-            target/release/bundle/nsis/*.nsis.zip
-            target/release/bundle/nsis/*.nsis.zip.sig
--- a/.github/workflows/turbo-ci.yml
+++ b/.github/workflows/turbo-ci.yml
@@ -2,11 +2,11 @@ name: CI

 on:
  push:
-    branches: ['main']
+    branches: ["main"]
  pull_request:
    types: [opened, synchronize]
  merge_group:
-    types: [checks_requested]
+    types: [ checks_requested ]

 jobs:
  build:
@@ -62,19 +62,9 @@ jobs:

      - name: Build
        run: pnpm build
-        env:
-          SQLX_OFFLINE: true

      - name: Lint
        run: pnpm lint
-        env:
-          SQLX_OFFLINE: true
-
-      - name: Start docker compose
-        run: docker compose up -d

      - name: Test
        run: pnpm test
-        env:
-          SQLX_OFFLINE: true
-          DATABASE_URL: postgresql://labrinth:labrinth@localhost/postgres
--- a/.github/workflows/daedalus-docker.yml
+++ b/.github/workflows/daedalus-docker.yml
@@ -1,42 +0,0 @@
-name: daedalus-docker-build
-
-on:
-  push:
-    branches:
-      - '**'
-    paths:
-      - .github/workflows/daedalus-docker.yml
-      - 'apps/daedalus_client/**'
-  pull_request:
-    types: [opened, synchronize]
-    paths:
-      - .github/workflows/daedalus-docker.yml
-      - 'apps/daedalus_client/**'
-  merge_group:
-    types: [checks_requested]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Fetch docker metadata
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/modrinth/daedalus
-      - name: Login to GitHub Images
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: ./apps/daedalus_client/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
--- a/.github/workflows/daedalus-run.yml
+++ b/.github/workflows/daedalus-run.yml
@@ -1,51 +0,0 @@
-name: Run Meta
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'
-  workflow_dispatch:
-
-jobs:
-  run-docker:
-    if: github.repository_owner == 'modrinth'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Docker image from GHCR
-        run: docker pull ghcr.io/modrinth/daedalus:main
-
-      - name: Run Docker container
-        env:
-          BASE_URL: ${{ secrets.BASE_URL }}
-          S3_ACCESS_TOKEN: ${{ secrets.S3_ACCESS_TOKEN }}
-          S3_SECRET: ${{ secrets.S3_SECRET }}
-          S3_URL: ${{ secrets.S3_URL }}
-          S3_REGION: ${{ secrets.S3_REGION }}
-          S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }}
-          CLOUDFLARE_INTEGRATION: ${{ secrets.CLOUDFLARE_INTEGRATION }}
-          CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
-          CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-        run: |
-          docker run \
-            --name daedalus \
-            -e RUST_LOG=warn,daedalus_client=trace \
-            -e BASE_URL=$BASE_URL \
-            -e S3_ACCESS_TOKEN=$S3_ACCESS_TOKEN \
-            -e S3_SECRET=$S3_SECRET \
-            -e S3_URL=$S3_URL \
-            -e S3_REGION=$S3_REGION \
-            -e S3_BUCKET_NAME=$S3_BUCKET_NAME \
-            -e CLOUDFLARE_INTEGRATION=$CLOUDFLARE_INTEGRATION \
-            -e CLOUDFLARE_TOKEN=$CLOUDFLARE_TOKEN \
-            -e CLOUDFLARE_ZONE_ID=$CLOUDFLARE_ZONE_ID \
-            ghcr.io/modrinth/daedalus:main
--- a/.github/workflows/frontend-pages.yml
+++ b/.github/workflows/frontend-pages.yml
@@ -1,9 +1,6 @@
-name: Clear pages cache
+name: Deploy frontend

-on:
-  push:
-    branches:
-      - prod
+on: push

 jobs:
  wait:
@@ -19,6 +16,7 @@ jobs:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: '9ddae624c98677d68d93df6e524a6061'
          project: 'frontend'
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
          commitHash: ${{ steps.push-changes.outputs.commit-hash }}
      - name: Purge cache
        if: github.ref == 'refs/heads/prod'
--- a/.github/workflows/labrinth-docker.yml
+++ b/.github/workflows/labrinth-docker.yml
@@ -1,45 +0,0 @@
-name: docker-build
-
-on:
-  push:
-    branches:
-      - '**'
-    paths:
-      - .github/workflows/labrinth-docker.yml
-      - 'apps/labrinth/**'
-  pull_request:
-    types: [opened, synchronize]
-    paths:
-      - .github/workflows/labrinth-docker.yml
-      - 'apps/labrinth/**'
-  merge_group:
-    types: [checks_requested]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./apps/labrinth
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Fetch docker metadata
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/modrinth/labrinth
-      - name: Login to GitHub Images
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: ./apps/labrinth
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
--- a/.gitignore
+++ b/.gitignore
@@ -55,9 +55,3 @@ generated

 # app testing dir
 app-playground-data/*
-
-# soley because i need the PORT to be 3002 due to WSL stuff
-.env
-apps/frontend/.env
-
-.astro
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
--- a/.idea/code.iml
+++ b/.idea/code.iml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/apps/daedalus_client/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/daedalus/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/app-playground/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/app/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/labrinth/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/labrinth/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/app-lib/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/discord.xml
+++ b/.idea/discord.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="PROJECT_FILES" />
-    <option name="description" value="" />
-  </component>
-</project>
--- a/.idea/libraries/KotlinJavaRuntime.xml
+++ b/.idea/libraries/KotlinJavaRuntime.xml
@@ -1,26 +0,0 @@
-<component name="libraryTable">
-  <library name="KotlinJavaRuntime" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/code.iml" filepath="$PROJECT_DIR$/.idea/code.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,12 @@
 {
  "prettier.endOfLine": "lf",
  "editor.formatOnSave": true,
-  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
  "editor.codeActionsOnSave": {
    "source.fixAll.eslint": "explicit"
  }
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,10 +3,7 @@ resolver = '2'
 members = [
  './packages/app-lib',
 	'./apps/app-playground',
-  './apps/app',
-  './apps/labrinth',
-    './apps/daedalus_client',
-    './packages/daedalus',
+  './apps/app'
 ]

 # Optimize for speed and reduce size on release builds
@@ -19,6 +16,3 @@ strip = true # Remove debug symbols

 [profile.dev.package.sqlx-macros]
 opt-level = 3
-
-[patch.crates-io]
-wry = { git = "https://github.com/modrinth/wry", rev ="e88d4a1" }
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ This repository contains two primary packages. For detailed development informat

 ## Contributing

-We welcome contributions! Before submitting any contributions, please read our [contributing guidelines](https://docs.modrinth.com/contributing/getting-started/).
+We welcome contributions! Before submitting any contributions, please read our [contributing guidelines](https://support.modrinth.com/en/articles/8802215-contributing-to-modrinth).

 If you plan to fork this repository for your own purposes, please review our [copying guidelines](COPYING.md).

--- a/apps/app-frontend/.eslintrc.cjs
+++ b/apps/app-frontend/.eslintrc.cjs
@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['custom/vue'],
+}
--- a/apps/app-frontend/eslint.config.mjs
+++ b/apps/app-frontend/eslint.config.mjs
@@ -1,22 +0,0 @@
-import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
-import { fixupPluginRules } from '@eslint/compat'
-import turboPlugin from 'eslint-plugin-turbo'
-
-export default createConfigForNuxt().append([
-  {
-    name: 'turbo',
-    plugins: {
-      turbo: fixupPluginRules(turboPlugin),
-    },
-    rules: {
-      'turbo/no-undeclared-env-vars': 'error',
-    },
-  },
-  {
-    name: 'modrinth',
-    rules: {
-      'vue/html-self-closing': 'off',
-      'vue/multi-word-component-names': 'off',
-    },
-  },
-])
--- a/apps/app-frontend/index.html
+++ b/apps/app-frontend/index.html
@@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Modrinth App</title>

    <link rel="stylesheet" href="/src/assets/stylesheets/global.scss" />
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -1,57 +1,48 @@
 {
  "name": "@modrinth/app-frontend",
  "private": true,
-  "version": "0.9.1",
+  "version": "0.8.3-1",
  "type": "module",
  "scripts": {
    "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "tsc:check": "vue-tsc --noEmit",
+    "build": "vite build",
    "lint": "eslint . && prettier --check .",
-    "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace"
+    "fix": "eslint . --fix && prettier --write ."
  },
  "dependencies": {
    "@modrinth/assets": "workspace:*",
    "@modrinth/ui": "workspace:*",
    "@modrinth/utils": "workspace:*",
-    "@sentry/vue": "^8.27.0",
-    "@tauri-apps/api": "^2.1.1",
-    "@tauri-apps/plugin-dialog": "^2.2.0",
-    "@tauri-apps/plugin-os": "^2.2.0",
-    "@tauri-apps/plugin-opener": "^2.2.1",
-    "@tauri-apps/plugin-updater": "^2.3.0",
-    "@tauri-apps/plugin-window-state": "^2.2.0",
+    "@tauri-apps/api": "^2.0.0-rc.3",
+    "@tauri-apps/plugin-dialog": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-os": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-window-state": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
    "@vintl/vintl": "^4.4.1",
    "dayjs": "^1.11.10",
    "floating-vue": "^5.2.2",
    "ofetch": "^1.3.4",
    "pinia": "^2.1.7",
-    "posthog-js": "^1.158.2",
    "vite-svg-loader": "^5.1.0",
-    "vue": "^3.5.13",
+    "vue": "^3.4.21",
    "vue-multiselect": "3.0.0",
    "vue-router": "4.3.0",
-    "vue-virtual-scroller": "v2.0.0-beta.8"
+    "vue-virtual-scroller": "v2.0.0-beta.8",
+    "posthog-js": "^1.158.2",
+    "@sentry/vue": "^8.27.0"
  },
  "devDependencies": {
-    "@eslint/compat": "^1.1.1",
-    "@formatjs/cli": "^6.2.12",
-    "@nuxt/eslint-config": "^0.5.6",
+    "@tauri-apps/cli": "^2.0.0-rc",
    "@vitejs/plugin-vue": "^5.0.4",
    "autoprefixer": "^10.4.19",
-    "eslint": "^9.9.1",
+    "eslint": "^8.57.0",
    "eslint-config-custom": "workspace:*",
-    "eslint-plugin-turbo": "^2.1.1",
    "postcss": "^8.4.39",
    "prettier": "^3.2.5",
    "sass": "^1.74.1",
    "tailwindcss": "^3.4.4",
    "tsconfig": "workspace:*",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.6",
-    "vue-tsc": "^2.1.6"
+    "vite": "^5.2.8"
  },
-  "packageManager": "pnpm@9.4.0",
-  "web-types": "../../web-types.json"
+  "packageManager": "pnpm@9.4.0"
 }
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1,26 +1,9 @@
 <script setup>
-import { computed, ref, onMounted, watch, onUnmounted } from 'vue'
-import { RouterView, useRouter, useRoute } from 'vue-router'
-import {
-  ArrowBigUpDashIcon,
-  LogInIcon,
-  HomeIcon,
-  LibraryIcon,
-  PlusIcon,
-  SettingsIcon,
-  XIcon,
-  DownloadIcon,
-  CompassIcon,
-  MinimizeIcon,
-  MaximizeIcon,
-  RestoreIcon,
-  LogOutIcon,
-  RightArrowIcon,
-  LeftArrowIcon,
-} from '@modrinth/assets'
-import { Avatar, Button, ButtonStyled, Notifications, OverflowMenu } from '@modrinth/ui'
+import { computed, ref, onMounted } from 'vue'
+import { RouterView, RouterLink, useRouter, useRoute } from 'vue-router'
+import { HomeIcon, SearchIcon, LibraryIcon, PlusIcon, SettingsIcon, XIcon } from '@modrinth/assets'
+import { Button, Notifications } from '@modrinth/ui'
 import { useLoading, useTheming } from '@/store/state'
-import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { get } from '@/helpers/settings'
@@ -28,11 +11,12 @@ import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
 import ErrorModal from '@/components/ui/ErrorModal.vue'
-import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
+import ModrinthLoadingIndicator from '@/components/modrinth-loading-indicator'
 import { handleError, useNotifications } from '@/store/notifications.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
+import { MinimizeIcon, MaximizeIcon } from '@/assets/icons'
 import { type } from '@tauri-apps/plugin-os'
-import { isDev, getOS, restartApp } from '@/helpers/utils.js'
+import { isDev, getOS } from '@/helpers/utils.js'
 import { initAnalytics, debugAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { getVersion } from '@tauri-apps/api/app'
@@ -45,26 +29,11 @@ import IncompatibilityWarningModal from '@/components/ui/install_flow/Incompatib
 import InstallConfirmModal from '@/components/ui/install_flow/InstallConfirmModal.vue'
 import { useInstall } from '@/store/install.js'
 import { invoke } from '@tauri-apps/api/core'
+import { open } from '@tauri-apps/plugin-shell'
 import { get_opening_command, initialize_state } from '@/helpers/state'
-import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
-import { renderString } from '@modrinth/utils'
-import { useFetch } from '@/helpers/fetch.js'
-import { check } from '@tauri-apps/plugin-updater'
-import NavButton from '@/components/ui/NavButton.vue'
-import { get as getCreds, logout, login } from '@/helpers/mr_auth.js'
-import { get_user } from '@/helpers/cache.js'
-import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue'
-import dayjs from 'dayjs'
-import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
-import { hide_ads_window, init_ads_window } from '@/helpers/ads.js'
-import FriendsList from '@/components/ui/friends/FriendsList.vue'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'

 const themeStore = useTheming()

-const news = ref([])
-
 const urlModal = ref(null)

 const offline = ref(!navigator.onLine)
@@ -82,20 +51,8 @@ const os = ref('')

 const stateInitialized = ref(false)

-const criticalErrorMessage = ref()
-
-const isMaximized = ref(false)
-
 onMounted(async () => {
  await useCheckDisableMouseover()
-
-  document.querySelector('body').addEventListener('click', handleClick)
-  document.querySelector('body').addEventListener('auxclick', handleAuxClick)
-})
-
-onUnmounted(() => {
-  document.querySelector('body').removeEventListener('click', handleClick)
-  document.querySelector('body').removeEventListener('auxclick', handleAuxClick)
 })

 async function setupApp() {
@@ -108,13 +65,10 @@ async function setupApp() {
    advanced_rendering,
    onboarded,
    default_page,
-    toggle_sidebar,
-    developer_mode,
-    feature_flags,
  } = await get()

-  if (default_page === 'Library') {
-    await router.push('/library')
+  if (default_page && default_page !== 'Home') {
+    await router.push({ name: default_page })
  }

  os.value = await getOS()
@@ -128,15 +82,6 @@ async function setupApp() {
  themeStore.setThemeState(theme)
  themeStore.collapsedNavigation = collapsed_navigation
  themeStore.advancedRendering = advanced_rendering
-  themeStore.toggleSidebar = toggle_sidebar
-  themeStore.devMode = developer_mode
-  themeStore.featureFlags = feature_flags
-
-  isMaximized.value = await getCurrentWindow().isMaximized()
-
-  await getCurrentWindow().onResized(async () => {
-    isMaximized.value = await getCurrentWindow().isMaximized()
-  })

  initAnalytics()
  if (!telemetry) {
@@ -162,25 +107,7 @@ async function setupApp() {
    }),
  )

-  useFetch(
-    `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
-    'criticalAnnouncements',
-    true,
-  ).then((res) => {
-    if (res && res.header && res.body) {
-      criticalErrorMessage.value = res
-    }
-  })
-
-  useFetch(`https://modrinth.com/blog/news.json`, 'news', true).then((res) => {
-    if (res && res.articles) {
-      news.value = res.articles
-    }
-  })
-
  get_opening_command().then(handleCommand)
-  checkUpdates()
-  fetchCredentials()
 }

 const stateFailed = ref(false)
@@ -199,7 +126,6 @@ initialize_state()
  })

 const handleClose = async () => {
-  await saveWindowState(StateFlags.ALL)
  await getCurrentWindow().close()
 }

@@ -208,6 +134,7 @@ router.afterEach((to, from, failure) => {
  trackEvent('PageView', { path: to.path, fromPath: from.path, failed: failure })
 })
 const route = useRoute()
+const isOnBrowse = computed(() => route.path.startsWith('/browse'))

 const loading = useLoading()
 loading.setEnabled(false)
@@ -223,58 +150,6 @@ const modInstallModal = ref()
 const installConfirmModal = ref()
 const incompatibilityWarningModal = ref()

-const credentials = ref()
-
-async function fetchCredentials() {
-  const creds = await getCreds().catch(handleError)
-  if (creds && creds.user_id) {
-    creds.user = await get_user(creds.user_id).catch(handleError)
-  }
-  credentials.value = creds
-}
-
-async function signIn() {
-  await login().catch(handleError)
-  await fetchCredentials()
-}
-
-async function logOut() {
-  await logout().catch(handleError)
-  await fetchCredentials()
-}
-
-const MIDAS_BITFLAG = 1 << 0
-const hasPlus = computed(
-  () =>
-    credentials.value &&
-    credentials.value.user &&
-    (credentials.value.user.badges & MIDAS_BITFLAG) === MIDAS_BITFLAG,
-)
-
-const sidebarToggled = ref(true)
-
-themeStore.$subscribe(() => {
-  sidebarToggled.value = !themeStore.toggleSidebar
-})
-
-const forceSidebar = computed(
-  () => route.path.startsWith('/browse') || route.path.startsWith('/project'),
-)
-const sidebarVisible = computed(() => sidebarToggled.value || forceSidebar.value)
-const showAd = computed(() => !(!sidebarVisible.value || hasPlus.value))
-
-watch(
-  showAd,
-  () => {
-    if (!showAd.value) {
-      hide_ads_window(true)
-    } else {
-      init_ads_window(true)
-    }
-  },
-  { immediate: true },
-)
-
 onMounted(() => {
  invoke('show_window')

@@ -287,6 +162,40 @@ onMounted(() => {
  install.setModInstallModal(modInstallModal)
 })

+document.querySelector('body').addEventListener('click', function (e) {
+  let target = e.target
+  while (target != null) {
+    if (target.matches('a')) {
+      if (
+        target.href &&
+        ['http://', 'https://', 'mailto:', 'tel:'].some((v) => target.href.startsWith(v)) &&
+        !target.classList.contains('router-link-active') &&
+        !target.href.startsWith('http://localhost') &&
+        !target.href.startsWith('https://tauri.localhost')
+      ) {
+        open(target.href)
+      }
+      e.preventDefault()
+      break
+    }
+    target = target.parentElement
+  }
+})
+
+document.querySelector('body').addEventListener('auxclick', function (e) {
+  // disables middle click -> new tab
+  if (e.button === 1) {
+    e.preventDefault()
+    // instead do a left click
+    const event = new MouseEvent('click', {
+      view: window,
+      bubbles: true,
+      cancelable: true,
+    })
+    e.target.dispatchEvent(event)
+  }
+})
+
 const accounts = ref(null)

 command_listener(handleCommand)
@@ -306,173 +215,65 @@ async function handleCommand(e) {
    urlModal.value.show(e)
  }
 }
-
-const updateAvailable = ref(false)
-async function checkUpdates() {
-  const update = await check()
-  updateAvailable.value = !!update
-
-  setTimeout(
-    () => {
-      checkUpdates()
-    },
-    5 * 1000 * 60,
-  )
-}
-
-function handleClick(e) {
-  let target = e.target
-  while (target != null) {
-    if (target.matches('a')) {
-      if (
-        target.href &&
-        ['http://', 'https://', 'mailto:', 'tel:'].some((v) => target.href.startsWith(v)) &&
-        !target.classList.contains('router-link-active') &&
-        !target.href.startsWith('http://localhost') &&
-        !target.href.startsWith('https://tauri.localhost') &&
-        !target.href.startsWith('http://tauri.localhost')
-      ) {
-        openUrl(target.href)
-      }
-      e.preventDefault()
-      break
-    }
-    target = target.parentElement
-  }
-}
-
-function handleAuxClick(e) {
-  // disables middle click -> new tab
-  if (e.button === 1) {
-    e.preventDefault()
-    // instead do a left click
-    const event = new MouseEvent('click', {
-      view: window,
-      bubbles: true,
-      cancelable: true,
-    })
-    e.target.dispatchEvent(event)
-  }
-}
 </script>

 <template>
  <SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
-  <div id="teleports"></div>
-  <div v-if="stateInitialized" class="app-grid-layout relative">
-    <Suspense>
-      <AppSettingsModal ref="settingsModal" />
-    </Suspense>
-    <Suspense>
-      <InstanceCreationModal ref="installationModal" />
-    </Suspense>
-    <div
-      class="app-grid-navbar bg-bg-raised flex flex-col p-[0.5rem] pt-0 gap-[0.5rem] w-[--left-bar-width]"
-    >
-      <NavButton v-tooltip.right="'Home'" to="/">
-        <HomeIcon />
-      </NavButton>
-      <NavButton
-        v-tooltip.right="'Discover content'"
-        to="/browse/modpack"
-        :is-primary="() => route.path.startsWith('/browse') && !route.query.i"
-        :is-subpage="(route) => route.path.startsWith('/project') && !route.query.i"
-      >
-        <CompassIcon />
-      </NavButton>
-      <NavButton
-        v-tooltip.right="'Library'"
-        to="/library"
-        :is-subpage="
-          () =>
-            route.path.startsWith('/instance') ||
-            ((route.path.startsWith('/browse') || route.path.startsWith('/project')) &&
-              route.query.i)
-        "
-      >
-        <LibraryIcon />
-      </NavButton>
-      <div class="h-px w-6 mx-auto my-2 bg-button-bg"></div>
-      <suspense>
-        <QuickInstanceSwitcher />
-      </suspense>
-      <NavButton
-        v-tooltip.right="'Create new instance'"
-        :to="() => $refs.installationModal.show()"
-        :disabled="offline"
-      >
-        <PlusIcon />
-      </NavButton>
-      <div class="flex flex-grow"></div>
-      <NavButton v-if="updateAvailable" v-tooltip.right="'Install update'" :to="() => restartApp()">
-        <DownloadIcon />
-      </NavButton>
-      <NavButton v-tooltip.right="'Settings'" :to="() => $refs.settingsModal.show()">
-        <SettingsIcon />
-      </NavButton>
-      <ButtonStyled v-if="credentials" type="transparent" circular>
-        <OverflowMenu
-          :options="[
-            {
-              id: 'sign-out',
-              action: () => logOut(),
-              color: 'danger',
-            },
-          ]"
-          direction="left"
-        >
-          <Avatar
-            :src="credentials.user.avatar_url"
-            :alt="credentials.user.username"
-            size="32px"
-            circle
-          />
-          <template #sign-out> <LogOutIcon /> Sign out </template>
-        </OverflowMenu>
-      </ButtonStyled>
-      <NavButton v-else v-tooltip.right="'Sign in'" :to="() => signIn()">
-        <LogInIcon />
-        <template #label>Sign in</template>
-      </NavButton>
-    </div>
-    <div data-tauri-drag-region class="app-grid-statusbar bg-bg-raised h-[--top-bar-height] flex">
-      <div data-tauri-drag-region class="flex p-3">
-        <ModrinthAppLogo class="h-full w-auto text-contrast pointer-events-none" />
-        <div class="flex items-center gap-1 ml-3">
-          <button
-            class="cursor-pointer p-0 m-0 border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
-            @click="router.back()"
+  <div v-if="stateInitialized" class="app-container">
+    <div class="nav-container">
+      <div class="nav-section">
+        <suspense>
+          <AccountsCard ref="accounts" mode="small" />
+        </suspense>
+        <div class="pages-list">
+          <RouterLink v-tooltip="'Home'" to="/" class="btn icon-only collapsed-button">
+            <HomeIcon />
+          </RouterLink>
+          <RouterLink
+            v-tooltip="'Browse'"
+            to="/browse/modpack"
+            class="btn icon-only collapsed-button"
+            :class="{
+              'router-link-active': isOnBrowse,
+            }"
          >
-            <LeftArrowIcon />
-          </button>
-          <button
-            class="cursor-pointer p-0 m-0 border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
-            @click="router.forward()"
-          >
-            <RightArrowIcon />
-          </button>
-        </div>
-        <Breadcrumbs class="pt-[2px]" />
-      </div>
-      <section class="flex ml-auto items-center">
-        <ButtonStyled
-          v-if="!forceSidebar && themeStore.toggleSidebar"
-          :type="sidebarToggled ? 'standard' : 'transparent'"
-          circular
-        >
-          <button
-            class="mr-3 transition-transform"
-            :class="{ 'rotate-180': !sidebarToggled }"
-            @click="sidebarToggled = !sidebarToggled"
-          >
-            <RightArrowIcon />
-          </button>
-        </ButtonStyled>
-        <div class="flex mr-3">
+            <SearchIcon />
+          </RouterLink>
+          <RouterLink v-tooltip="'Library'" to="/library" class="btn icon-only collapsed-button">
+            <LibraryIcon />
+          </RouterLink>
          <Suspense>
-            <RunningAppBar />
+            <InstanceCreationModal ref="installationModal" />
          </Suspense>
        </div>
+      </div>
+      <div class="settings pages-list">
+        <Button
+          v-tooltip="'Create profile'"
+          class="sleek-primary collapsed-button"
+          icon-only
+          :disabled="offline"
+          @click="() => $refs.installationModal.show()"
+        >
+          <PlusIcon />
+        </Button>
+        <RouterLink v-tooltip="'Settings'" to="/settings" class="btn icon-only collapsed-button">
+          <SettingsIcon />
+        </RouterLink>
+      </div>
+    </div>
+    <div class="view">
+      <div class="appbar-row">
+        <div data-tauri-drag-region class="appbar">
+          <section class="navigation-controls">
+            <Breadcrumbs data-tauri-drag-region />
+          </section>
+          <section class="mod-stats">
+            <Suspense>
+              <RunningAppBar />
+            </Suspense>
+          </section>
+        </div>
        <section v-if="!nativeDecorations" class="window-controls">
          <Button class="titlebar-button" icon-only @click="() => getCurrentWindow().minimize()">
            <MinimizeIcon />
@@ -482,125 +283,30 @@ function handleAuxClick(e) {
            icon-only
            @click="() => getCurrentWindow().toggleMaximize()"
          >
-            <RestoreIcon v-if="isMaximized" />
-            <MaximizeIcon v-else />
+            <MaximizeIcon />
          </Button>
          <Button class="titlebar-button close" icon-only @click="handleClose">
            <XIcon />
          </Button>
        </section>
-      </section>
-    </div>
-  </div>
-  <div
-    v-if="stateInitialized"
-    class="app-contents experimental-styles-within"
-    :class="{ 'sidebar-enabled': sidebarVisible }"
-  >
-    <div class="app-viewport flex-grow router-view">
-      <div
-        class="loading-indicator-container h-8 fixed z-50"
-        :style="{
-          top: 'calc(var(--top-bar-height))',
-          left: 'calc(var(--left-bar-width))',
-          width: 'calc(100% - var(--left-bar-width) - var(--right-bar-width))',
-        }"
-      >
-        <ModrinthLoadingIndicator />
      </div>
-      <div
-        v-if="themeStore.featureFlags.page_path"
-        class="absolute bottom-0 left-0 m-2 bg-tooltip-bg text-tooltip-text font-semibold rounded-full px-2 py-1 text-xs z-50"
-      >
-        {{ route.fullPath }}
-      </div>
-      <div
-        id="background-teleport-target"
-        class="absolute h-full -z-10 rounded-tl-[--radius-xl] overflow-hidden"
-        :style="{
-          width: 'calc(100% - var(--right-bar-width))',
-        }"
-      ></div>
-      <RouterView v-slot="{ Component }">
-        <template v-if="Component">
-          <Suspense @pending="loading.startLoading()" @resolve="loading.stopLoading()">
-            <component :is="Component"></component>
-          </Suspense>
-        </template>
-      </RouterView>
-    </div>
-    <div
-      class="app-sidebar mt-px shrink-0 flex flex-col border-0 border-l-[1px] border-[--brand-gradient-border] border-solid overflow-auto"
-      :class="{ 'has-plus': hasPlus }"
-    >
-      <div
-        class="app-sidebar-scrollable flex-grow shrink overflow-y-auto relative"
-        :class="{ 'pb-12': !hasPlus }"
-      >
-        <div id="sidebar-teleport-target" class="sidebar-teleport-content"></div>
-        <div class="sidebar-default-content" :class="{ 'sidebar-enabled': sidebarVisible }">
-          <div class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid">
-            <h3 class="text-lg m-0">Playing as</h3>
-            <suspense>
-              <AccountsCard ref="accounts" mode="small" />
-            </suspense>
-          </div>
-          <div class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid">
-            <suspense>
-              <FriendsList :credentials="credentials" :sign-in="() => signIn()" />
-            </suspense>
-          </div>
-          <div v-if="news && news.length > 0" class="pt-4 flex flex-col">
-            <h3 class="px-4 text-lg m-0">News</h3>
-            <template v-for="(item, index) in news" :key="`news-${index}`">
-              <a
-                :class="`flex flex-col outline-offset-[-4px] hover:bg-[--brand-gradient-border] focus:bg-[--brand-gradient-border] px-4 transition-colors ${index === 0 ? 'pt-2 pb-4' : 'py-4'}`"
-                :href="item.link"
-                target="_blank"
-                rel="external"
-              >
-                <img
-                  :src="item.thumbnail"
-                  alt="News thumbnail"
-                  aria-hidden="true"
-                  class="w-full aspect-[3/1] object-cover rounded-2xl border-[1px] border-solid border-[--brand-gradient-border]"
-                />
-                <h4 class="mt-2 mb-0 text-sm leading-none text-contrast font-semibold">
-                  {{ item.title }}
-                </h4>
-                <p class="my-1 text-sm text-secondary leading-tight">{{ item.summary }}</p>
-                <p class="text-right text-sm text-secondary opacity-60 leading-tight m-0">
-                  {{ dayjs(item.date).fromNow() }}
-                </p>
-              </a>
-              <hr
-                v-if="index !== news.length - 1"
-                class="h-px my-[-2px] mx-4 border-0 m-0 bg-[--brand-gradient-border]"
-              />
-            </template>
-          </div>
-        </div>
-      </div>
-      <template v-if="showAd">
-        <a
-          href="https://modrinth.plus?app"
-          class="absolute bottom-[250px] w-full flex justify-center items-center gap-1 px-4 py-3 text-purple font-medium hover:underline z-10"
-          target="_blank"
-        >
-          <ArrowBigUpDashIcon class="text-2xl" /> Upgrade to Modrinth+
-        </a>
-        <PromotionWrapper />
-      </template>
-    </div>
-    <div class="view">
-      <div v-if="criticalErrorMessage" class="critical-error-banner" data-tauri-drag-region>
-        <h1>{{ criticalErrorMessage.header }}</h1>
-        <div class="markdown-body" v-html="renderString(criticalErrorMessage.body ?? '')"></div>
+      <div class="router-view">
+        <ModrinthLoadingIndicator
+          offset-height="var(--appbar-height)"
+          offset-width="var(--sidebar-width)"
+        />
+        <RouterView v-slot="{ Component }">
+          <template v-if="Component">
+            <Suspense @pending="loading.startLoading()" @resolve="loading.stopLoading()">
+              <component :is="Component"></component>
+            </Suspense>
+          </template>
+        </RouterView>
      </div>
    </div>
  </div>
  <URLConfirmModal ref="urlModal" />
-  <Notifications ref="notificationsWrapper" sidebar />
+  <Notifications ref="notificationsWrapper" />
  <ErrorModal ref="errorModal" />
  <ModInstallModal ref="modInstallModal" />
  <IncompatibilityWarningModal ref="incompatibilityWarningModal" />
@@ -608,6 +314,21 @@ function handleAuxClick(e) {
 </template>

 <style lang="scss" scoped>
+.sleek-primary {
+  background-color: var(--color-brand-highlight);
+  transition: all ease-in-out 0.1s;
+}
+
+.navigation-controls {
+  flex-grow: 1;
+  width: min-content;
+}
+
+.appbar-row {
+  display: flex;
+  flex-direction: row;
+}
+
 .window-controls {
  z-index: 20;
  display: none;
@@ -620,188 +341,158 @@ function handleAuxClick(e) {
    justify-content: center;
    cursor: pointer;
    transition: all ease-in-out 0.1s;
-    background-color: transparent;
+    background-color: var(--color-raised-bg);
    color: var(--color-base);
-    height: 100%;
-    width: 3rem;
-    position: relative;
-    box-shadow: none;
-
-    &:last-child {
-      padding-right: 0.75rem;
-      width: 3.75rem;
-    }
-
-    svg {
-      width: 1.25rem;
-      height: 1.25rem;
-    }
-
-    &::before {
-      content: '';
-      border-radius: 999999px;
-      width: 3rem;
-      height: 3rem;
-      aspect-ratio: 1 / 1;
-      margin-block: auto;
-      position: absolute;
-      background-color: transparent;
-      scale: 0.9;
-      transition: all ease-in-out 0.2s;
-      z-index: -1;
-    }
+    border-radius: 0;
+    height: 3.25rem;

    &.close {
      &:hover,
      &:active {
+        background-color: var(--color-red);
        color: var(--color-accent-contrast);
-
-        &::before {
-          background-color: var(--color-red);
-        }
      }
    }

    &:hover,
    &:active {
+      background-color: var(--color-button-bg);
      color: var(--color-contrast);
-
-      &::before {
-        background-color: var(--color-button-bg);
-        scale: 1;
-      }
    }
  }
 }

-.app-grid-layout,
-.app-contents {
-  --top-bar-height: 3rem;
-  --left-bar-width: 4rem;
-  --right-bar-width: 300px;
-}
+.app-container {
+  --appbar-height: 3.25rem;
+  --sidebar-width: 4.5rem;

-.app-grid-layout {
-  display: grid;
-  grid-template: 'status status' 'nav dummy';
-  grid-template-columns: auto 1fr;
-  grid-template-rows: auto 1fr;
-  position: relative;
-  //z-index: 0;
-  background-color: var(--color-raised-bg);
  height: 100vh;
-}
+  display: flex;
+  flex-direction: row;
+  overflow: hidden;

-.app-grid-navbar {
-  grid-area: nav;
-}
+  .view {
+    width: calc(100% - var(--sidebar-width));
+    background-color: var(--color-raised-bg);

-.app-grid-statusbar {
-  grid-area: status;
-}
+    .appbar {
+      display: flex;
+      align-items: center;
+      flex-grow: 1;
+      background: var(--color-raised-bg);
+      text-align: center;
+      padding: var(--gap-md);
+      height: 3.25rem;
+      gap: var(--gap-sm);
+      //no select
+      user-select: none;
+      -webkit-user-select: none;
+    }

-.app-contents {
-  position: absolute;
-  z-index: 1;
-  left: var(--left-bar-width);
-  top: var(--top-bar-height);
-  right: 0;
-  bottom: 0;
-  height: calc(100vh - var(--top-bar-height));
-  background-color: var(--color-bg);
-  border-top-left-radius: var(--radius-xl);
-
-  display: grid;
-  grid-template-columns: 1fr 0px;
-  // transition: grid-template-columns 0.4s ease-in-out;
-
-  &.sidebar-enabled {
-    grid-template-columns: 1fr 300px;
+    .router-view {
+      width: 100%;
+      height: calc(100% - 3.125rem);
+      overflow: auto;
+      overflow-x: hidden;
+      background-color: var(--color-bg);
+      border-top-left-radius: var(--radius-xl);
+    }
  }
 }

-.loading-indicator-container {
-  border-top-left-radius: var(--radius-xl);
-  overflow: hidden;
-}
-
-.app-sidebar {
-  overflow: visible;
-  width: 300px;
-  position: relative;
-  height: calc(100vh - var(--top-bar-height));
-  background: var(--brand-gradient-bg);
-
-  --color-button-bg: var(--brand-gradient-button);
-  --color-button-bg-hover: var(--brand-gradient-border);
-  --color-divider: var(--brand-gradient-border);
-  --color-divider-dark: var(--brand-gradient-border);
-}
-
-.app-sidebar::after {
-  content: '';
-  position: absolute;
-  bottom: 250px;
-  left: 0;
-  right: 0;
-  height: 5rem;
-  background: var(--brand-gradient-fade-out-color);
-  pointer-events: none;
-}
-
-.app-sidebar.has-plus::after {
-  display: none;
-}
-
-.app-sidebar::before {
-  content: '';
-  box-shadow: -15px 0 15px -15px rgba(0, 0, 0, 0.2) inset;
-  top: 0;
-  bottom: 0;
-  left: -2rem;
-  width: 2rem;
-  position: absolute;
-  pointer-events: none;
-}
-
-.app-viewport {
-  flex-grow: 1;
+.nav-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
  height: 100%;
-  overflow: auto;
-  overflow-x: hidden;
+  background-color: var(--color-raised-bg);
+  box-shadow: var(--shadow-inset-sm), var(--shadow-floating);
+  padding: var(--gap-md);
 }

-.app-contents::before {
-  z-index: 1;
-  content: '';
-  position: fixed;
-  left: var(--left-bar-width);
-  top: var(--top-bar-height);
-  right: calc(-1 * var(--left-bar-width));
-  bottom: calc(-1 * var(--left-bar-width));
-  border-radius: var(--radius-xl);
-  box-shadow:
-    1px 1px 15px rgba(0, 0, 0, 0.2) inset,
-    inset 1px 1px 1px rgba(255, 255, 255, 0.23);
-  pointer-events: none;
+.pages-list {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  width: 100%;
+  gap: 0.5rem;
+
+  a {
+    display: flex;
+    align-items: center;
+    word-spacing: 3px;
+    background: inherit;
+    transition: all ease-in-out 0.1s;
+    color: var(--color-base);
+    box-shadow: none;
+
+    &.router-link-active {
+      color: var(--color-contrast);
+      background: var(--color-button-bg);
+      box-shadow: var(--shadow-floating);
+    }
+
+    &:hover {
+      background-color: var(--color-button-bg);
+      color: var(--color-contrast);
+      box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+      text-decoration: none;
+    }
+  }
+
+  &.primary {
+    color: var(--color-accent-contrast);
+    background-color: var(--color-brand);
+  }
 }

-.sidebar-teleport-content {
-  display: contents;
+.collapsed-button {
+  height: 3rem !important;
+  width: 3rem !important;
+  padding: 0.75rem;
+  border-radius: var(--radius-md);
+  box-shadow: none;
+
+  svg {
+    width: 1.5rem !important;
+    height: 1.5rem !important;
+    max-width: 1.5rem !important;
+    max-height: 1.5rem !important;
+  }
 }

-.sidebar-default-content {
-  display: none;
+.nav-section {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  gap: 1rem;
 }

-.sidebar-teleport-content:empty + .sidebar-default-content.sidebar-enabled {
-  display: contents;
+.button-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: var(--gap-md);
+
+  .transparent {
+    padding: var(--gap-sm) 0;
+  }
 }
 </style>
 <style>
 .mac {
-  .app-grid-statusbar {
-    padding-left: 5rem;
+  .nav-container {
+    padding-top: calc(var(--gap-md) + 1.75rem);
+  }
+
+  .account-card,
+  .card-section {
+    top: calc(var(--gap-md) + 1.75rem);
  }
 }

@@ -823,4 +514,3 @@ function handleAuxClick(e) {
  }
 }
 </style>
-<style src="vue-multiselect/dist/vue-multiselect.css"></style>
--- a/apps/app-frontend/src/assets/icons/index.js
+++ b/apps/app-frontend/src/assets/icons/index.js
@@ -1,9 +1,14 @@
+export { default as ServerIcon } from './server.svg'
+export { default as MinimizeIcon } from './minimize.svg'
+export { default as MaximizeIcon } from './maximize.svg'
 export { default as SwapIcon } from './arrow-left-right.svg'
 export { default as ToggleIcon } from './toggle.svg'
 export { default as PackageIcon } from './package.svg'
 export { default as VersionIcon } from './milestone.svg'
+export { default as MoreIcon } from './more.svg'
 export { default as TextInputIcon } from './text-cursor-input.svg'
 export { default as AddProjectImage } from './add-project.svg'
 export { default as NewInstanceImage } from './new-instance.svg'
 export { default as MenuIcon } from './menu.svg'
+export { default as BugIcon } from './bug.svg'
 export { default as ChatIcon } from './messages-square.svg'
--- a/apps/app-frontend/src/assets/icons/maximize.svg
+++ b/apps/app-frontend/src/assets/icons/maximize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-minus"><path d="M5 12h14"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-scaling"><path d="M21 3 9 15"/><path d="M12 3H3v18h18v-9"/><path d="M16 3h5v5"/><path d="M14 15H9v-5"/></svg>
--- a/apps/app-frontend/src/assets/icons/minimize.svg
+++ b/apps/app-frontend/src/assets/icons/minimize.svg
--- a/apps/app-frontend/src/assets/modrinth_app.svg
+++ b/apps/app-frontend/src/assets/modrinth_app.svg
--- a/apps/app-frontend/src/assets/modrinth_servers.svg
+++ b/apps/app-frontend/src/assets/modrinth_servers.svg
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:serif="http://www.serif.com/" version="1.1" viewBox="0 0 1793 199">
-  <g>
-    <g id="Layer_1">
-      <g id="green" fill="var(--color-brand)">
-        <path d="M1184.1,166.6c-8,0-15.6-1-22.9-3.1s-13.1-4.6-17.4-7.6l8.5-16.9c4.3,2.7,9.4,5,15.3,6.8,5.9,1.8,11.9,2.7,17.8,2.7s12.1-.9,15.2-2.8c3.1-1.9,4.7-4.5,4.7-7.7s-1.1-4.6-3.2-6c-2.1-1.4-4.9-2.4-8.4-3.1-3.4-.7-7.3-1.4-11.5-2-4.2-.6-8.4-1.4-12.6-2.4-4.2-1-8-2.5-11.5-4.5-3.4-2-6.2-4.6-8.4-7.9-2.1-3.3-3.2-7.7-3.2-13.2s1.7-11.3,5.2-15.8c3.4-4.5,8.3-7.9,14.5-10.3,6.2-2.4,13.6-3.7,22.2-3.7s12.9.7,19.4,2.1c6.5,1.4,11.9,3.4,16.2,6.1l-8.5,16.9c-4.5-2.7-9.1-4.6-13.6-5.6-4.6-1-9.1-1.5-13.6-1.5-6.8,0-11.8,1-15,3-3.3,2-4.9,4.6-4.9,7.7s1.1,5,3.2,6.4c2.1,1.4,4.9,2.6,8.4,3.4,3.4.8,7.3,1.5,11.5,2,4.2.5,8.4,1.3,12.6,2.4,4.2,1.1,8,2.5,11.5,4.4,3.5,1.8,6.3,4.4,8.5,7.7,2.1,3.3,3.2,7.7,3.2,13s-1.8,11.1-5.3,15.5c-3.5,4.4-8.5,7.8-14.9,10.2-6.4,2.4-14.1,3.7-23,3.7Z"/>
-        <path d="M1291.1,166.6c-10.6,0-19.8-2.1-27.7-6.3-7.9-4.2-14-10-18.3-17.4-4.3-7.4-6.5-15.7-6.5-25.1s2.1-17.9,6.3-25.2c4.2-7.3,10-13,17.5-17.2,7.4-4.2,15.9-6.2,25.4-6.2s17.5,2,24.8,6.1c7.2,4,12.9,9.7,17.1,17.1,4.2,7.4,6.2,16,6.2,26s0,2,0,3.2c0,1.2-.2,2.3-.3,3.4h-79.3v-14.8h67.5l-8.7,4.6c.1-5.5-1-10.3-3.4-14.4-2.4-4.2-5.6-7.4-9.7-9.8-4.1-2.4-8.8-3.6-14.2-3.6s-10.2,1.2-14.3,3.6c-4.1,2.4-7.3,5.7-9.6,9.9-2.3,4.2-3.5,9.2-3.5,14.9v3.6c0,5.7,1.3,10.7,3.9,15.1,2.6,4.4,6.3,7.8,11,10.2,4.7,2.4,10.2,3.6,16.4,3.6s10.2-.8,14.4-2.5c4.3-1.7,8.1-4.3,11.4-7.8l11.9,13.7c-4.3,5-9.6,8.8-16.1,11.5-6.5,2.7-13.9,4-22.2,4Z"/>
-        <path d="M1357.2,165.3v-95.1h21.2v26.2l-2.5-7.7c2.8-6.4,7.3-11.3,13.4-14.6,6.1-3.3,13.7-5,22.9-5v21.2c-1-.2-1.8-.4-2.7-.4-.8,0-1.7,0-2.5,0-8.4,0-15.1,2.5-20.1,7.4-5,4.9-7.5,12.3-7.5,22v46.1h-22.3Z"/>
-        <path d="M1460,165.3l-40.8-95.1h23.2l35.1,83.9h-11.4l36.3-83.9h21.4l-40.8,95.1h-23Z"/>
-        <path d="M1579.6,166.6c-10.6,0-19.8-2.1-27.7-6.3-7.9-4.2-14-10-18.3-17.4-4.3-7.4-6.5-15.7-6.5-25.1s2.1-17.9,6.3-25.2c4.2-7.3,10-13,17.5-17.2,7.4-4.2,15.9-6.2,25.4-6.2s17.5,2,24.8,6.1c7.2,4,12.9,9.7,17.1,17.1,4.2,7.4,6.2,16,6.2,26s0,2,0,3.2c0,1.2-.2,2.3-.3,3.4h-79.3v-14.8h67.5l-8.7,4.6c.1-5.5-1-10.3-3.4-14.4-2.4-4.2-5.6-7.4-9.7-9.8-4.1-2.4-8.8-3.6-14.2-3.6s-10.2,1.2-14.3,3.6c-4.1,2.4-7.3,5.7-9.6,9.9-2.3,4.2-3.5,9.2-3.5,14.9v3.6c0,5.7,1.3,10.7,3.9,15.1,2.6,4.4,6.3,7.8,11,10.2,4.7,2.4,10.2,3.6,16.4,3.6s10.2-.8,14.4-2.5c4.3-1.7,8.1-4.3,11.4-7.8l11.9,13.7c-4.3,5-9.6,8.8-16.1,11.5-6.5,2.7-13.9,4-22.2,4Z"/>
-        <path d="M1645.7,165.3v-95.1h21.2v26.2l-2.5-7.7c2.8-6.4,7.3-11.3,13.4-14.6,6.1-3.3,13.7-5,22.9-5v21.2c-1-.2-1.8-.4-2.7-.4-.8,0-1.7,0-2.5,0-8.4,0-15.1,2.5-20.1,7.4-5,4.9-7.5,12.3-7.5,22v46.1h-22.3Z"/>
-        <path d="M1749.9,166.6c-8,0-15.6-1-22.9-3.1s-13.1-4.6-17.4-7.6l8.5-16.9c4.3,2.7,9.4,5,15.3,6.8,5.9,1.8,11.9,2.7,17.8,2.7s12.1-.9,15.2-2.8c3.1-1.9,4.7-4.5,4.7-7.7s-1.1-4.6-3.2-6c-2.1-1.4-4.9-2.4-8.4-3.1-3.4-.7-7.3-1.4-11.5-2-4.2-.6-8.4-1.4-12.6-2.4-4.2-1-8-2.5-11.5-4.5-3.4-2-6.2-4.6-8.4-7.9-2.1-3.3-3.2-7.7-3.2-13.2s1.7-11.3,5.2-15.8c3.4-4.5,8.3-7.9,14.5-10.3,6.2-2.4,13.6-3.7,22.2-3.7s12.9.7,19.4,2.1c6.5,1.4,11.9,3.4,16.2,6.1l-8.5,16.9c-4.5-2.7-9.1-4.6-13.6-5.6-4.6-1-9.1-1.5-13.6-1.5-6.8,0-11.8,1-15,3-3.3,2-4.9,4.6-4.9,7.7s1.1,5,3.2,6.4c2.1,1.4,4.9,2.6,8.4,3.4,3.4.8,7.3,1.5,11.5,2,4.2.5,8.4,1.3,12.6,2.4,4.2,1.1,8,2.5,11.5,4.4,3.5,1.8,6.3,4.4,8.5,7.7,2.1,3.3,3.2,7.7,3.2,13s-1.8,11.1-5.3,15.5c-3.5,4.4-8.5,7.8-14.9,10.2-6.4,2.4-14.1,3.7-23,3.7Z"/>
-        <g>
-          <path d="M9.8,143l63.4-38.1-5.8-15.3,18.1-18.6,22.9-4.9,6.6,8.2-10.6,10.7-9.2,2.9-6.6,6.8,3.2,9,6.5,6.9,9.2-2.5,6.6-7.2,14.3-4.5,4.3,9.6-14.8,18.1-24.8,7.8-11.1-12.4-63.6,38.2c-3-3.9-6.5-9.4-8.8-14.7ZM192.8,65.4l-50.4,13.6c2.8,7.4,3.7,11.7,4.5,16.5l50.3-13.6c-.8-5.4-2.2-10.8-4.4-16.5Z" fill-rule="evenodd"/>
-          <path d="M17.3,106.5c3.6,42.1,38.9,75.2,82,75.2s60.7-18.9,74-46.3l16.4,5.7c-15.8,34.1-50.3,57.9-90.4,57.9S3.6,158.2,0,106.5h17.3ZM.3,89.4C5.3,39.2,47.8,0,99.3,0s99.5,44.6,99.5,99.5-1.1,17.4-3.3,25.5l-16.3-5.7c1.6-6.5,2.4-13.1,2.4-19.8,0-45.4-36.9-82.3-82.3-82.3S22.6,48.7,17.6,89.4H.3Z" fill-rule="evenodd"/>
-          <path d="M99,51.6c-26.4,0-47.9,21.5-47.9,48s21.5,48,48,48,2.7,0,4-.2l4.8,16.8c-2.9.4-5.8.6-8.8.6-36,0-65.2-29.2-65.2-65.2S63.1,34.4,99,34.4s1.8,0,2.7,0l-2.7,17.1ZM118.6,37.4c26.4,8.3,45.6,33,45.6,62.2s-16.4,50.2-39.8,60l-4.8-16.7c16.2-7.7,27.4-24.2,27.4-43.3s-13-38.1-31.1-44.9l2.7-17.2Z" fill-rule="evenodd"/>
-        </g>
-      </g>
-      <g id="black" fill="currentColor">
-        <path d="M354.8,69.2c12,0,21.7,3.4,28.6,10.4,7,7.2,10.6,17.5,10.6,31.5v54.8h-22.4v-51.9c0-8.4-1.8-14.7-5.5-19-3.8-4.1-8.9-6.3-15.9-6.3s-13.6,2.5-18.1,7.3c-4.5,5-6.8,12.2-6.8,21.3v48.5h-22.4v-51.9c0-8.4-1.8-14.7-5.5-19-3.8-4.1-8.9-6.3-15.9-6.3s-13.6,2.5-18.1,7.3c-4.5,4.8-6.8,12-6.8,21.3v48.5h-22.4v-95.6h21.3v12.2c3.6-4.3,8.1-7.5,13.4-9.8,5.4-2.3,11.3-3.4,17.9-3.4s13.6,1.3,19.2,3.9c5.5,2.9,9.8,6.8,13.1,12,3.9-5,8.9-8.9,15.2-11.8,6.3-2.7,13.1-4.1,20.6-4.1ZM466,167.2c-9.7,0-18.4-2.1-26.1-6.3-7.6-4-13.8-10.1-18.1-17.5-4.5-7.3-6.6-15.7-6.6-25.2s2.1-17.9,6.6-25.2c4.3-7.4,10.6-13.4,18.1-17.4,7.7-4.1,16.5-6.3,26.1-6.3s18.6,2.1,26.3,6.3c7.7,4.1,13.8,10,18.3,17.4,4.3,7.3,6.4,15.7,6.4,25.2s-2.1,17.9-6.4,25.2c-4.5,7.5-10.6,13.4-18.3,17.5-7.7,4.1-16.5,6.3-26.3,6.3h0ZM466,148c8.2,0,15-2.7,20.4-8.2,5.4-5.5,8.1-12.7,8.1-21.7s-2.7-16.1-8.1-21.7c-5.4-5.5-12.2-8.2-20.4-8.2s-15,2.7-20.2,8.2c-5.4,5.5-8.1,12.7-8.1,21.7s2.7,16.1,8.1,21.7c5.2,5.5,12,8.2,20.2,8.2ZM631.5,33.1v132.8h-21.5v-12.3c-3.7,4.4-8.3,7.9-13.6,10.2-5.5,2.3-11.5,3.4-18.1,3.4s-17.4-2-24.7-6.1c-7.3-4.1-13.2-9.8-17.4-17.4-4.1-7.3-6.3-15.9-6.3-25.6s2.1-18.3,6.3-25.6c4.1-7.3,10-13.1,17.4-17.2,7.3-4.1,15.6-6.1,24.7-6.1s12.2,1.1,17.4,3.2c5.2,2.1,9.8,5.4,13.4,9.7v-49h22.4ZM581.1,148c5.4,0,10.2-1.3,14.5-3.8,4.3-2.3,7.7-5.9,10.2-10.4,2.5-4.5,3.8-9.8,3.8-15.7s-1.3-11.3-3.8-15.7c-2.5-4.5-5.9-8.1-10.2-10.6-4.3-2.3-9.1-3.6-14.5-3.6s-10.2,1.3-14.5,3.6c-4.3,2.5-7.7,6.1-10.2,10.6-2.5,4.5-3.8,9.8-3.8,15.7s1.3,11.3,3.8,15.7c2.5,4.5,5.9,8.1,10.2,10.4,4.3,2.5,9.1,3.8,14.5,3.8ZM681.6,84.3c6.4-10,17.7-15,34-15v21.3c-1.7-.3-3.4-.5-5.2-.5-8.8,0-15.6,2.5-20.4,7.5-4.8,5.2-7.3,12.5-7.3,22v46.4h-22.4v-95.6h21.3v14h0ZM734.1,70.3h22.4v95.6h-22.4v-95.6ZM745.4,54.6c-4.1,0-7.5-1.3-10.2-3.9-2.7-2.4-4.2-5.9-4.1-9.5,0-3.8,1.4-7,4.1-9.7,2.7-2.5,6.1-3.8,10.2-3.8s7.5,1.3,10.2,3.6c2.7,2.5,4.1,5.5,4.1,9.3s-1.3,7.2-3.9,9.8c-2.7,2.7-6.3,4.1-10.4,4.1ZM839.5,69.2c12,0,21.7,3.6,29,10.6,7.3,7,10.9,17.5,10.9,31.3v54.8h-22.4v-51.9c0-8.4-2-14.7-5.9-19-3.9-4.1-9.5-6.3-16.8-6.3s-14.7,2.5-19.5,7.3c-4.8,5-7.2,12.2-7.2,21.5v48.3h-22.4v-95.6h21.3v12.3c3.8-4.5,8.4-7.7,14-10,5.5-2.3,12-3.4,19-3.4ZM964.8,160.7c-2.8,2.2-6,3.9-9.5,4.8-3.9,1.1-7.9,1.6-12,1.6-10.6,0-18.6-2.7-24.3-8.2-5.7-5.5-8.6-13.4-8.6-24v-46h-15.7v-17.9h15.7v-21.8h22.4v21.8h25.6v17.9h-25.6v45.5c0,4.7,1.1,8.2,3.4,10.6,2.3,2.5,5.5,3.8,9.8,3.8s9.1-1.3,12.5-3.9l6.3,15.9ZM1036.9,69.2c12,0,21.7,3.6,29,10.6,7.3,7,10.9,17.5,10.9,31.3v54.8h-22.4v-51.9c0-8.4-2-14.7-5.9-19-3.9-4.1-9.5-6.3-16.8-6.3s-14.7,2.5-19.5,7.3c-4.8,5-7.2,12.2-7.2,21.5v48.3h-22.4V33.1h22.4v48.3c3.8-3.9,8.2-7,13.8-9.1,5.4-2,11.5-3,18.1-3Z"/>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/apps/app-frontend/src/assets/sad-modrinth-bot.webp
+++ b/apps/app-frontend/src/assets/sad-modrinth-bot.webp
--- a/apps/app-frontend/src/assets/stylesheets/global.scss
+++ b/apps/app-frontend/src/assets/stylesheets/global.scss
@@ -80,25 +80,19 @@ input {

 /* Chrome, Edge, and Safari */
 *::-webkit-scrollbar {
-  width: 16px;
-  border: 3px solid transparent;
-  opacity: 0.5;
-  transition: opacity 0.2s ease-in-out;
-}
-
-*::-webkit-scrollbar:hover {
-  opacity: 1;
+  width: var(--gap-md);
+  border: 3px solid var(--color-scrollbar);
 }

 *::-webkit-scrollbar-track {
-  background: transparent;
+  background: var(--color-bg);
+  border: 3px solid var(--color-bg);
 }

 *::-webkit-scrollbar-thumb {
  background-color: var(--color-scrollbar);
  border-radius: var(--radius-lg);
-  border: 5px solid transparent;
-  background-clip: content-box;
+  border: 3px solid var(--color-bg);
 }

 .highlighted {
@@ -117,8 +111,4 @@ img {
  -ms-user-select: none;
 }

-.card-shadow {
-  box-shadow: var(--shadow-card);
-}
-
@import '@modrinth/assets/omorphia.scss';
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -12,13 +12,13 @@ import {
  SearchIcon,
  XIcon,
 } from '@modrinth/assets'
-import { Button, DropdownSelect } from '@modrinth/ui'
+import { ConfirmModal, Button, Card, DropdownSelect } from '@modrinth/ui'
 import { formatCategoryHeader } from '@modrinth/utils'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import dayjs from 'dayjs'
+import { useTheming } from '@/store/theme.js'
 import { duplicate, remove } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'

 const props = defineProps({
  instances: {
@@ -35,6 +35,7 @@ const props = defineProps({
 const instanceOptions = ref(null)
 const instanceComponents = ref(null)

+const themeStore = useTheming()
 const currentDeleteInstance = ref(null)
 const confirmModal = ref(null)

@@ -120,11 +121,12 @@ const handleOptionsClick = async (args) => {
 }

 const search = ref('')
-const group = ref('Group')
+const group = ref('Category')
+const filters = ref('All profiles')
 const sortBy = ref('Name')

 const filteredResults = computed(() => {
-  const instances = props.instances.filter((instance) => {
+  let instances = props.instances.filter((instance) => {
    return instance.name.toLowerCase().includes(search.value.toLowerCase())
  })

@@ -158,6 +160,16 @@ const filteredResults = computed(() => {
    })
  }

+  if (filters.value === 'Custom instances') {
+    instances = instances.filter((instance) => {
+      return !instance.linked_data
+    })
+  } else if (filters.value === 'Downloaded modpacks') {
+    instances = instances.filter((instance) => {
+      return instance.linked_data
+    })
+  }
+
  const instanceMap = new Map()

  if (group.value === 'Loader') {
@@ -177,7 +189,7 @@ const filteredResults = computed(() => {

      instanceMap.get(instance.game_version).push(instance)
    })
-  } else if (group.value === 'Group') {
+  } else if (group.value === 'Category') {
    instances.forEach((instance) => {
      if (instance.groups.length === 0) {
        instance.groups.push('None')
@@ -218,37 +230,54 @@ const filteredResults = computed(() => {
 })
 </script>
 <template>
-  <div class="flex gap-2">
-    <div class="iconified-input flex-1">
+  <ConfirmModal
+    ref="confirmModal"
+    title="Are you sure you want to delete this instance?"
+    description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
+    :has-to-type="false"
+    proceed-label="Delete"
+    :noblur="!themeStore.advancedRendering"
+    @proceed="deleteProfile"
+  />
+  <Card class="header">
+    <div class="iconified-input">
      <SearchIcon />
-      <input v-model="search" type="text" placeholder="Search" />
+      <input v-model="search" type="text" placeholder="Search" class="search-input" />
      <Button class="r-btn" @click="() => (search = '')">
        <XIcon />
      </Button>
    </div>
-    <DropdownSelect
-      v-slot="{ selected }"
-      v-model="sortBy"
-      name="Sort Dropdown"
-      class="max-w-[16rem]"
-      :options="['Name', 'Last played', 'Date created', 'Date modified', 'Game version']"
-      placeholder="Select..."
-    >
-      <span class="font-semibold text-primary">Sort by: </span>
-      <span class="font-semibold text-secondary">{{ selected }}</span>
-    </DropdownSelect>
-    <DropdownSelect
-      v-slot="{ selected }"
-      v-model="group"
-      class="max-w-[16rem]"
-      name="Group Dropdown"
-      :options="['Group', 'Loader', 'Game version', 'None']"
-      placeholder="Select..."
-    >
-      <span class="font-semibold text-primary">Group by: </span>
-      <span class="font-semibold text-secondary">{{ selected }}</span>
-    </DropdownSelect>
-  </div>
+    <div class="labeled_button">
+      <span>Sort by</span>
+      <DropdownSelect
+        v-model="sortBy"
+        class="sort-dropdown"
+        name="Sort Dropdown"
+        :options="['Name', 'Last played', 'Date created', 'Date modified', 'Game version']"
+        placeholder="Select..."
+      />
+    </div>
+    <div class="labeled_button">
+      <span>Filter by</span>
+      <DropdownSelect
+        v-model="filters"
+        class="filter-dropdown"
+        name="Filter Dropdown"
+        :options="['All profiles', 'Custom instances', 'Downloaded modpacks']"
+        placeholder="Select..."
+      />
+    </div>
+    <div class="labeled_button">
+      <span>Group by</span>
+      <DropdownSelect
+        v-model="group"
+        class="group-dropdown"
+        name="Group Dropdown"
+        :options="['Category', 'Loader', 'Game version', 'None']"
+        placeholder="Select..."
+      />
+    </div>
+  </Card>
  <div
    v-for="instanceSection in Array.from(filteredResults, ([key, value]) => ({
      key,
@@ -271,14 +300,6 @@ const filteredResults = computed(() => {
      />
    </section>
  </div>
-  <ConfirmModalWrapper
-    ref="confirmModal"
-    title="Are you sure you want to delete this instance?"
-    description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
-    :has-to-type="false"
-    proceed-label="Delete"
-    @proceed="deleteProfile"
-  />
  <ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
    <template #play> <PlayIcon /> Play </template>
    <template #stop> <StopCircleIcon /> Stop </template>
@@ -296,6 +317,7 @@ const filteredResults = computed(() => {
  flex-direction: column;
  align-items: flex-start;
  width: 100%;
+  padding: 1rem;

  .divider {
    display: flex;
@@ -363,9 +385,9 @@ const filteredResults = computed(() => {

 .instances {
  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(16rem, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
  width: 100%;
-  gap: 0.75rem;
+  gap: 1rem;
  margin-right: auto;
  scroll-behavior: smooth;
  overflow-y: auto;
--- a/apps/app-frontend/src/components/LoadingIndicatorBar.vue
+++ b/apps/app-frontend/src/components/LoadingIndicatorBar.vue
@@ -1,141 +0,0 @@
-<script setup>
-import { computed, onBeforeUnmount, ref, watch } from 'vue'
-import { useLoading } from '@/store/state.js'
-
-const props = defineProps({
-  throttle: {
-    type: Number,
-    default: 0,
-  },
-  duration: {
-    type: Number,
-    default: 1000,
-  },
-  height: {
-    type: Number,
-    default: 2,
-  },
-  color: {
-    type: String,
-    default: 'var(--loading-bar-gradient)',
-  },
-})
-
-const indicator = useLoadingIndicator({
-  duration: props.duration,
-  throttle: props.throttle,
-})
-
-onBeforeUnmount(() => indicator.clear)
-
-const loading = useLoading()
-
-watch(loading, (newValue) => {
-  if (newValue.barEnabled) {
-    if (newValue.loading) {
-      indicator.start()
-    } else {
-      indicator.finish()
-    }
-  }
-})
-
-function useLoadingIndicator(opts) {
-  const progress = ref(0)
-  const isLoading = ref(false)
-  const step = computed(() => 10000 / opts.duration)
-
-  let _timer = null
-  let _throttle = null
-
-  function start() {
-    clear()
-    progress.value = 0
-    if (opts.throttle) {
-      _throttle = setTimeout(() => {
-        isLoading.value = true
-        _startTimer()
-      }, opts.throttle)
-    } else {
-      isLoading.value = true
-      _startTimer()
-    }
-  }
-
-  function finish() {
-    progress.value = 100
-    _hide()
-  }
-
-  function clear() {
-    clearInterval(_timer)
-    clearTimeout(_throttle)
-    _timer = null
-    _throttle = null
-  }
-
-  function _increase(num) {
-    progress.value = Math.min(100, progress.value + num)
-  }
-
-  function _hide() {
-    clear()
-    setTimeout(() => {
-      isLoading.value = false
-      setTimeout(() => {
-        progress.value = 0
-      }, 400)
-    }, 500)
-  }
-
-  function _startTimer() {
-    _timer = setInterval(() => {
-      _increase(step.value)
-    }, 100)
-  }
-
-  return { progress, isLoading, start, finish, clear }
-}
-</script>
-
-<template>
-  <div
-    class="loading-indicator-bar"
-    :style="{
-      '--_width': `${indicator.progress.value}%`,
-      '--_height': `${indicator.isLoading.value ? props.height : 0}px`,
-      '--_opacity': `${indicator.isLoading.value ? 1 : 0}`,
-      top: `0`,
-      right: `0`,
-      left: `${props.offsetWidth}`,
-      pointerEvents: 'none',
-      width: `var(--_width)`,
-      height: `var(--_height)`,
-      borderRadius: `var(--_height)`,
-      // opacity: `var(--_opacity)`,
-      background: `${props.color}`,
-      backgroundSize: `${(100 / indicator.progress.value) * 100}% auto`,
-      transition: 'width 0.1s ease-in-out, height 0.1s ease-out',
-      zIndex: 6,
-    }"
-  >
-    <slot />
-  </div>
-</template>
-<style lang="scss" scoped>
-.loading-indicator-bar::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  width: var(--_width);
-  bottom: 0;
-  background-image: radial-gradient(80% 100% at 20% 0%, var(--color-brand) 0%, transparent 80%);
-  opacity: calc(var(--_opacity) * 0.1);
-  z-index: 5;
-  transition:
-    width 0.1s ease-in-out,
-    opacity 0.1s ease-out;
-}
-</style>
--- a/apps/app-frontend/src/components/RowDisplay.vue
+++ b/apps/app-frontend/src/components/RowDisplay.vue
@@ -12,7 +12,7 @@ import {
  EyeIcon,
  ChevronRightIcon,
 } from '@modrinth/assets'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import { ConfirmModal } from '@modrinth/ui'
 import Instance from '@/components/ui/Instance.vue'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
@@ -22,10 +22,10 @@ import { handleError } from '@/store/notifications.js'
 import { duplicate, kill, remove, run } from '@/helpers/profile.js'
 import { useRouter } from 'vue-router'
 import { showProfileInFolder } from '@/helpers/utils.js'
+import { useTheming } from '@/store/state.js'
 import { trackEvent } from '@/helpers/analytics'
 import { handleSevereError } from '@/store/error.js'
 import { install as installVersion } from '@/store/install.js'
-import { openUrl } from '@tauri-apps/plugin-opener'

 const router = useRouter()

@@ -53,6 +53,7 @@ const instanceComponents = ref(null)
 const rows = ref(null)
 const deleteConfirmModal = ref(null)

+const themeStore = useTheming()
 const currentDeleteInstance = ref(null)

 async function deleteProfile() {
@@ -166,7 +167,13 @@ const handleOptionsClick = async (args) => {
      break
    }
    case 'open_link':
-      openUrl(`https://modrinth.com/${args.item.project_type}/${args.item.slug}`)
+      window.__TAURI_INVOKE__('tauri', {
+        __tauriModule: 'Shell',
+        message: {
+          cmd: 'open',
+          path: `https://modrinth.com/${args.item.project_type}/${args.item.slug}`,
+        },
+      })
      break
    case 'copy_link':
      await navigator.clipboard.writeText(
@@ -176,7 +183,6 @@ const handleOptionsClick = async (args) => {
  }
 }

-const maxInstancesPerCompactRow = ref(1)
 const maxInstancesPerRow = ref(1)
 const maxProjectsPerRow = ref(1)

@@ -186,73 +192,41 @@ const calculateCardsPerRow = () => {
  // Convert container width from pixels to rem
  const containerWidthInRem =
    containerWidth / parseFloat(getComputedStyle(document.documentElement).fontSize)
-
-  maxInstancesPerCompactRow.value = Math.floor((containerWidthInRem + 0.75) / 18.75)
-  maxInstancesPerRow.value = Math.floor((containerWidthInRem + 0.75) / 20.75)
-  maxProjectsPerRow.value = Math.floor((containerWidthInRem + 0.75) / 18.75)
-
-  if (maxInstancesPerRow.value < 5) {
-    maxInstancesPerRow.value *= 2
-  }
-  if (maxInstancesPerCompactRow.value < 5) {
-    maxInstancesPerCompactRow.value *= 2
-  }
-  if (maxProjectsPerRow.value < 3) {
-    maxProjectsPerRow.value *= 2
-  }
+  maxInstancesPerRow.value = Math.floor((containerWidthInRem + 1) / 11)
+  maxProjectsPerRow.value = Math.floor((containerWidthInRem + 1) / 19)
 }

-const rowContainer = ref(null)
-const resizeObserver = ref(null)
 onMounted(() => {
  calculateCardsPerRow()
-  resizeObserver.value = new ResizeObserver(calculateCardsPerRow)
-  resizeObserver.value.observe(rowContainer.value)
  window.addEventListener('resize', calculateCardsPerRow)
 })

 onUnmounted(() => {
  window.removeEventListener('resize', calculateCardsPerRow)
-  resizeObserver.value.unobserve(rowContainer.value)
 })
 </script>

 <template>
-  <ConfirmModalWrapper
+  <ConfirmModal
    ref="deleteConfirmModal"
    title="Are you sure you want to delete this instance?"
    description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
    :has-to-type="false"
    proceed-label="Delete"
+    :noblur="!themeStore.advancedRendering"
    @proceed="deleteProfile"
  />
-  <div ref="rowContainer" class="flex flex-col gap-4">
-    <div v-for="(row, rowIndex) in actualInstances" ref="rows" :key="row.label" class="row">
-      <router-link
-        class="flex mb-3 leading-none items-center gap-1 text-primary text-lg font-bold hover:underline group"
-        :class="{ 'mt-1': rowIndex > 0 }"
-        :to="row.route"
-      >
-        {{ row.label }}
-        <ChevronRightIcon
-          class="h-5 w-5 stroke-[3px] group-hover:translate-x-1 transition-transform group-hover:text-brand"
-        />
-      </router-link>
-      <section
-        v-if="row.instance"
-        ref="modsRow"
-        class="instances"
-        :class="{ compact: row.compact }"
-      >
+  <div class="content">
+    <div v-for="row in actualInstances" ref="rows" :key="row.label" class="row">
+      <div class="header">
+        <router-link :to="row.route">{{ row.label }}</router-link>
+        <ChevronRightIcon />
+      </div>
+      <section v-if="row.instance" ref="modsRow" class="instances">
        <Instance
-          v-for="(instance, instanceIndex) in row.instances.slice(
-            0,
-            row.compact ? maxInstancesPerCompactRow : maxInstancesPerRow,
-          )"
-          :key="row.label + instance.path"
+          v-for="instance in row.instances.slice(0, maxInstancesPerRow)"
+          :key="(instance?.project_id || instance?.id) + instance.install_stage"
          :instance="instance"
-          :compact="row.compact"
-          :first="instanceIndex === 0"
          @contextmenu.prevent.stop="(event) => handleInstanceRightClick(event, instance)"
        />
      </section>
@@ -289,6 +263,7 @@ onUnmounted(() => {
  align-items: center;
  justify-content: center;
  width: 100%;
+  padding: 1rem;
  gap: 1rem;

  -ms-overflow-style: none;
@@ -322,36 +297,31 @@ onUnmounted(() => {

    a {
      margin: 0;
-      font-size: var(--font-size-md);
+      font-size: var(--font-size-lg);
      font-weight: bolder;
      white-space: nowrap;
-      color: var(--color-base);
+      color: var(--color-contrast);
    }

    svg {
-      height: 1.25rem;
-      width: 1.25rem;
-      color: var(--color-base);
+      height: 1.5rem;
+      width: 1.5rem;
+      color: var(--color-contrast);
    }
  }

  .instances {
    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
-    grid-gap: 0.75rem;
+    grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
+    grid-gap: 1rem;
    width: 100%;
-
-    &.compact {
-      grid-template-columns: repeat(auto-fill, minmax(18rem, 1fr));
-      gap: 0.75rem;
-    }
  }

  .projects {
    display: grid;
    width: 100%;
    grid-template-columns: repeat(auto-fill, minmax(18rem, 1fr));
-    grid-gap: 0.75rem;
+    grid-gap: 1rem;

    .item {
      width: 100%;
--- a/apps/app-frontend/src/components/modrinth-loading-indicator.js
+++ b/apps/app-frontend/src/components/modrinth-loading-indicator.js
@@ -0,0 +1,136 @@
+import { computed, defineComponent, h, onBeforeUnmount, ref, watch } from 'vue'
+import { useLoading } from '@/store/state.js'
+
+export default defineComponent({
+  props: {
+    throttle: {
+      type: Number,
+      default: 50,
+    },
+    duration: {
+      type: Number,
+      default: 500,
+    },
+    height: {
+      type: Number,
+      default: 3,
+    },
+    color: {
+      type: [String, Boolean],
+      default:
+        'repeating-linear-gradient(to right, var(--color-brand) 0%, var(--color-brand) 100%)',
+    },
+    offsetWidth: {
+      type: String,
+      default: '208px',
+    },
+    offsetHeight: {
+      type: String,
+      default: '52px',
+    },
+  },
+  setup(props, { slots }) {
+    const indicator = useLoadingIndicator({
+      duration: props.duration,
+      throttle: props.throttle,
+    })
+
+    onBeforeUnmount(() => indicator.clear)
+
+    const loading = useLoading()
+
+    watch(loading, (newValue) => {
+      if (newValue.barEnabled) {
+        if (newValue.loading) {
+          indicator.start()
+        } else {
+          indicator.finish()
+        }
+      }
+    })
+
+    return () =>
+      h(
+        'div',
+        {
+          style: {
+            position: 'fixed',
+            top: props.offsetHeight,
+            right: 0,
+            left: props.offsetWidth,
+            pointerEvents: 'none',
+            width: `calc((100vw - ${props.offsetWidth}) * ${indicator.progress.value / 100})`,
+            height: `${props.height}px`,
+            opacity: indicator.isLoading.value ? 1 : 0,
+            background: props.color || undefined,
+            backgroundSize: `${(100 / indicator.progress.value) * 100}% auto`,
+            transition: 'width 0.1s, height 0.4s, opacity 0.4s',
+            zIndex: 6,
+          },
+        },
+        slots,
+      )
+  },
+})
+
+function useLoadingIndicator(opts) {
+  const progress = ref(0)
+  const isLoading = ref(false)
+  const step = computed(() => 10000 / opts.duration)
+
+  let _timer = null
+  let _throttle = null
+
+  function start() {
+    clear()
+    progress.value = 0
+    if (opts.throttle) {
+      _throttle = setTimeout(() => {
+        isLoading.value = true
+        _startTimer()
+      }, opts.throttle)
+    } else {
+      isLoading.value = true
+      _startTimer()
+    }
+  }
+  function finish() {
+    progress.value = 100
+    _hide()
+  }
+
+  function clear() {
+    clearInterval(_timer)
+    clearTimeout(_throttle)
+    _timer = null
+    _throttle = null
+  }
+
+  function _increase(num) {
+    progress.value = Math.min(100, progress.value + num)
+  }
+
+  function _hide() {
+    clear()
+    setTimeout(() => {
+      isLoading.value = false
+      setTimeout(() => {
+        progress.value = 0
+      }, 400)
+    }, 500)
+  }
+
+  function _startTimer() {
+    _timer = setInterval(() => {
+      _increase(step.value)
+    }, 100)
+  }
+
+  return {
+    progress,
+    isLoading,
+    start,
+    finish,
+    clear,
+  }
+}
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -2,23 +2,19 @@
  <div
    v-if="mode !== 'isolated'"
    ref="button"
-    class="button-base mt-2 px-3 py-2 bg-button-bg rounded-xl flex items-center gap-2"
+    v-tooltip.right="'Minecraft accounts'"
+    class="button-base avatar-button"
    :class="{ expanded: mode === 'expanded' }"
-    @click="toggleMenu"
+    @click="showCard = !showCard"
  >
    <Avatar
-      size="36px"
+      :size="mode === 'expanded' ? 'xs' : 'sm'"
      :src="
        selectedAccount
          ? `https://mc-heads.net/avatar/${selectedAccount.id}/128`
          : 'https://launcher-files.modrinth.com/assets/steve_head.png'
      "
    />
-    <div class="flex flex-col w-full">
-      <span>{{ selectedAccount ? selectedAccount.username : 'Select account' }}</span>
-      <span class="text-secondary text-xs">Minecraft account</span>
-    </div>
-    <DropdownIcon class="w-5 h-5 shrink-0" />
  </div>
  <transition name="fade">
    <Card
@@ -63,7 +59,7 @@
 </template>

 <script setup>
-import { DropdownIcon, PlusIcon, TrashIcon, LogInIcon } from '@modrinth/assets'
+import { PlusIcon, TrashIcon, LogInIcon } from '@modrinth/assets'
 import { Avatar, Button, Card } from '@modrinth/ui'
 import { ref, computed, onMounted, onBeforeUnmount, onUnmounted } from 'vue'
 import {
@@ -137,9 +133,9 @@ const logout = async (id) => {
  trackEvent('AccountLogOut')
 }

-const showCard = ref(false)
-const card = ref(null)
-const button = ref(null)
+let showCard = ref(false)
+let card = ref(null)
+let button = ref(null)
 const handleClickOutside = (event) => {
  const elements = document.elementsFromPoint(event.clientX, event.clientY)
  if (
@@ -148,15 +144,7 @@ const handleClickOutside = (event) => {
    !elements.includes(card.value.$el) &&
    !button.value.contains(event.target)
  ) {
-    toggleMenu(false)
-  }
-}
-
-function toggleMenu(override = true) {
-  if (showCard.value || !override) {
    showCard.value = false
-  } else {
-    showCard.value = true
  }
 }

@@ -207,11 +195,11 @@ onUnmounted(() => {
 }

 .account-card {
-  position: fixed;
+  position: absolute;
  display: flex;
  flex-direction: column;
-  margin-top: 0.5rem;
-  right: 2rem;
+  top: 0.5rem;
+  left: 5.5rem;
  z-index: 11;
  gap: 0.5rem;
  padding: 1rem;
@@ -286,17 +274,12 @@ onUnmounted(() => {

 .fade-enter-active,
 .fade-leave-active {
-  transition:
-    opacity 0.25s ease,
-    translate 0.25s ease,
-    scale 0.25s ease;
+  transition: opacity 0.3s ease;
 }

 .fade-enter-from,
 .fade-leave-to {
  opacity: 0;
-  translate: 0 -2rem;
-  scale: 0.9;
 }

 .avatar-button {
@@ -304,10 +287,9 @@ onUnmounted(() => {
  align-items: center;
  gap: 0.5rem;
  color: var(--color-base);
-  background-color: var(--color-button-bg);
+  background-color: var(--color-raised-bg);
  border-radius: var(--radius-md);
  width: 100%;
-  padding: 0.5rem 0.75rem;
  text-align: left;

  &.expanded {
--- a/apps/app-frontend/src/components/ui/AddContentButton.vue
+++ b/apps/app-frontend/src/components/ui/AddContentButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { DropdownIcon, PlusIcon, FolderOpenIcon } from '@modrinth/assets'
-import { ButtonStyled, OverflowMenu } from '@modrinth/ui'
+import { DropdownIcon, FolderOpenIcon, SearchIcon } from '@modrinth/assets'
+import { Button, OverflowMenu } from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
 import { add_project_from_path } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
@@ -20,13 +20,13 @@ const handleAddContentFromFile = async () => {
  if (!newProject) return

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

 const handleSearchContent = async () => {
  await router.push({
-    path: `/browse/${props.instance.loader === 'vanilla' ? 'resourcepack' : 'mod'}`,
+    path: `/browse/${props.instance.loader === 'vanilla' ? 'datapack' : 'mod'}`,
    query: { i: props.instance.path },
  })
 }
@@ -34,27 +34,30 @@ const handleSearchContent = async () => {

 <template>
  <div class="joined-buttons">
-    <ButtonStyled>
-      <button @click="handleSearchContent">
-        <PlusIcon />
-        Install content
-      </button>
-    </ButtonStyled>
-    <ButtonStyled>
-      <OverflowMenu
-        :options="[
-          {
-            id: 'from_file',
-            action: handleAddContentFromFile,
-          },
-        ]"
-      >
-        <DropdownIcon />
-        <template #from_file>
-          <FolderOpenIcon />
-          <span class="no-wrap"> Add from file </span>
-        </template>
-      </OverflowMenu>
-    </ButtonStyled>
+    <Button color="primary" @click="handleSearchContent"><SearchIcon /> Add content </Button>
+
+    <OverflowMenu
+      :options="[
+        {
+          id: 'search',
+          action: handleSearchContent,
+        },
+        {
+          id: 'from_file',
+          action: handleAddContentFromFile,
+        },
+      ]"
+      class="btn btn-primary btn-dropdown-animation icon-only"
+    >
+      <DropdownIcon />
+      <template #search>
+        <SearchIcon />
+        <span class="no-wrap"> Search </span>
+      </template>
+      <template #from_file>
+        <FolderOpenIcon />
+        <span class="no-wrap"> Add from file </span>
+      </template>
+    </OverflowMenu>
  </div>
 </template>
--- a/apps/app-frontend/src/components/ui/Breadcrumbs.vue
+++ b/apps/app-frontend/src/components/ui/Breadcrumbs.vue
@@ -1,18 +1,13 @@
 <template>
-  <div data-tauri-drag-region class="flex items-center gap-1 pl-3">
-    <Button v-if="false" class="breadcrumbs__back transparent" icon-only @click="$router.back()">
+  <div class="breadcrumbs">
+    <Button class="breadcrumbs__back transparent" icon-only @click="$router.back()">
      <ChevronLeftIcon />
    </Button>
-    <Button
-      v-if="false"
-      class="breadcrumbs__forward transparent"
-      icon-only
-      @click="$router.forward()"
-    >
+    <Button class="breadcrumbs__forward transparent" icon-only @click="$router.forward()">
      <ChevronRightIcon />
    </Button>
    {{ breadcrumbData.resetToNames(breadcrumbs) }}
-    <template v-for="breadcrumb in breadcrumbs" :key="breadcrumb.name">
+    <div v-for="breadcrumb in breadcrumbs" :key="breadcrumb.name" class="breadcrumbs__item">
      <router-link
        v-if="breadcrumb.link"
        :to="{
@@ -25,18 +20,13 @@
            : breadcrumb.name
        }}
      </router-link>
-      <span
-        v-else
-        data-tauri-drag-region
-        class="text-contrast font-semibold cursor-default select-none"
-        >{{
-          breadcrumb.name.charAt(0) === '?'
-            ? breadcrumbData.getName(breadcrumb.name.slice(1))
-            : breadcrumb.name
-        }}</span
-      >
-      <ChevronRightIcon v-if="breadcrumb.link" data-tauri-drag-region class="w-5 h-5" />
-    </template>
+      <span v-else class="selected">{{
+        breadcrumb.name.charAt(0) === '?'
+          ? breadcrumbData.getName(breadcrumb.name.slice(1))
+          : breadcrumb.name
+      }}</span>
+      <ChevronRightIcon v-if="breadcrumb.link" class="chevron" />
+    </div>
  </div>
 </template>

@@ -60,3 +50,38 @@ const breadcrumbs = computed(() => {
  return additionalContext ? [additionalContext, ...route.meta.breadcrumb] : route.meta.breadcrumb
 })
 </script>
+
+<style scoped lang="scss">
+.breadcrumbs {
+  display: flex;
+  flex-direction: row;
+
+  .breadcrumbs__item {
+    display: flex;
+    flex-direction: row;
+    vertical-align: center;
+    margin: auto 0;
+
+    .chevron,
+    a {
+      margin: auto 0;
+    }
+  }
+
+  .breadcrumbs__back,
+  .breadcrumbs__forward {
+    margin: auto 0;
+    color: var(--color-base);
+    height: unset;
+    width: unset;
+  }
+
+  .breadcrumbs__forward {
+    margin-right: 1rem;
+  }
+}
+
+.selected {
+  color: var(--color-contrast);
+}
+</style>
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { XIcon, HammerIcon, LogInIcon, UpdatedIcon } from '@modrinth/assets'
+import { Modal } from '@modrinth/ui'
 import { ChatIcon } from '@/assets/icons'
 import { ref } from 'vue'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
@@ -8,7 +9,6 @@ import { handleSevereError } from '@/store/error.js'
 import { cancel_directory_change } from '@/helpers/settings.js'
 import { install } from '@/helpers/profile.js'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'

 const errorModal = ref()
 const error = ref()
@@ -121,7 +121,7 @@ async function repairInstance() {
 </script>

 <template>
-  <ModalWrapper ref="errorModal" :header="title" :closable="closable">
+  <Modal ref="errorModal" :header="title" :closable="closable">
    <div class="modal-body">
      <div class="markdown-body">
        <template v-if="errorType === 'minecraft_auth'">
@@ -230,7 +230,7 @@ async function repairInstance() {
          </p>
          <p>You may be able to fix it through one of the following ways:</p>
          <ul>
-            <li>Ensuring you are connected to the internet, then try restarting the app.</li>
+            <li>Ennsuring you are connected to the internet, then try restarting the app.</li>
            <li>Redownloading the app.</li>
          </ul>
        </template>
@@ -272,7 +272,7 @@ async function repairInstance() {
        <button v-if="closable" class="btn" @click="errorModal.hide()"><XIcon /> Close</button>
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <style>
@@ -323,6 +323,7 @@ async function repairInstance() {
  display: flex;
  flex-direction: column;
  gap: var(--gap-md);
+  padding: var(--gap-lg);
 }

 .markdown-body {
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -1,12 +1,12 @@
 <script setup>
 import { XIcon, PlusIcon } from '@modrinth/assets'
-import { Button, Checkbox } from '@modrinth/ui'
+import { Button, Checkbox, Modal } from '@modrinth/ui'
 import { PackageIcon, VersionIcon } from '@/assets/icons'
 import { ref } from 'vue'
 import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile.js'
 import { open } from '@tauri-apps/plugin-dialog'
 import { handleError } from '@/store/notifications.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { useTheming } from '@/store/theme'

 const props = defineProps({
  instance: {
@@ -30,6 +30,8 @@ const files = ref([])
 const folders = ref([])
 const showingFiles = ref(false)

+const themeStore = useTheming()
+
 const initFiles = async () => {
  const newFolders = new Map()
  const sep = '/'
@@ -104,7 +106,7 @@ const exportPack = async () => {
 </script>

 <template>
-  <ModalWrapper ref="exportModal" header="Export modpack">
+  <Modal ref="exportModal" header="Export modpack" :noblur="!themeStore.advancedRendering">
    <div class="modal-body">
      <div class="labeled_input">
        <p>Modpack Name</p>
@@ -206,11 +208,12 @@ const exportPack = async () => {
        </Button>
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <style scoped lang="scss">
 .modal-body {
+  padding: var(--gap-xl);
  display: flex;
  flex-direction: column;
  gap: var(--gap-md);
@@ -285,7 +288,6 @@ const exportPack = async () => {
  flex-direction: row;
  justify-content: space-between;
  align-items: center;
-  gap: 1rem;
 }

 .textarea-wrapper {
--- a/apps/app-frontend/src/components/ui/Instance.vue
+++ b/apps/app-frontend/src/components/ui/Instance.vue
@@ -1,8 +1,8 @@
 <script setup>
-import { onUnmounted, ref, computed, onMounted } from 'vue'
+import { onUnmounted, ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
-import { SpinnerIcon, GameIcon, TimerIcon, StopCircleIcon, PlayIcon } from '@modrinth/assets'
-import { ButtonStyled, Avatar } from '@modrinth/ui'
+import { StopCircleIcon, PlayIcon } from '@modrinth/assets'
+import { Card, Avatar, AnimatedLogo } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { kill, run } from '@/helpers/profile'
 import { get_by_profile_path } from '@/helpers/process'
@@ -11,11 +11,6 @@ import { handleError } from '@/store/state.js'
 import { showProfileInFolder } from '@/helpers/utils.js'
 import { handleSevereError } from '@/store/error.js'
 import { trackEvent } from '@/helpers/analytics'
-import dayjs from 'dayjs'
-import relativeTime from 'dayjs/plugin/relativeTime'
-import { formatCategory } from '@modrinth/utils'
-
-dayjs.extend(relativeTime)

 const props = defineProps({
  instance: {
@@ -24,30 +19,16 @@ const props = defineProps({
      return {}
    },
  },
-  compact: {
-    type: Boolean,
-    default: false,
-  },
-  first: {
-    type: Boolean,
-    default: false,
-  },
 })

 const playing = ref(false)
-const loading = ref(false)
-const modLoading = computed(
-  () =>
-    loading.value ||
-    currentEvent.value === 'installing' ||
-    (currentEvent.value === 'launched' && !playing.value),
-)
-const installing = computed(() => props.instance.install_stage !== 'installed')
+
+const modLoading = computed(() => props.instance.install_stage !== 'installed')

 const router = useRouter()

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

 const checkProcess = async () => {
@@ -58,17 +39,17 @@ const checkProcess = async () => {

 const play = async (e, context) => {
  e?.stopPropagation()
-  loading.value = true
-  await run(props.instance.path)
-    .catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
-    .finally(() => {
-      trackEvent('InstancePlay', {
-        loader: props.instance.loader,
-        game_version: props.instance.game_version,
-        source: context,
-      })
-    })
-  loading.value = false
+  modLoading.value = true
+  await run(props.instance.path).catch((err) =>
+    handleSevereError(err, { profilePath: props.instance.path }),
+  )
+  modLoading.value = false
+
+  trackEvent('InstancePlay', {
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
+    source: context,
+  })
 }

 const stop = async (e, context) => {
@@ -104,120 +85,175 @@ defineExpose({
  instance: props.instance,
 })

-const currentEvent = ref(null)
-
 const unlisten = await process_listener((e) => {
-  if (e.profile_path_id === props.instance.path) {
-    currentEvent.value = e.event
-    if (e.event === 'finished') {
-      playing.value = false
-    }
-  }
+  if (e.event === 'finished' && e.profile_path_id === props.instance.path) playing.value = false
 })

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

 <template>
-  <template v-if="compact">
-    <div
-      class="card-shadow grid grid-cols-[auto_1fr_auto] bg-bg-raised rounded-xl p-3 pl-4 gap-2 cursor-pointer hover:brightness-90 transition-all"
-      @click="seeInstance"
-      @mouseenter="checkProcess"
-    >
+  <div class="instance">
+    <Card class="instance-card-item button-base" @click="seeInstance" @mouseenter="checkProcess">
      <Avatar
-        size="48px"
-        :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-        :tint-by="instance.path"
+        size="lg"
+        :src="props.instance.icon_path ? convertFileSrc(props.instance.icon_path) : null"
        alt="Mod card"
+        class="mod-image"
      />
-      <div class="h-full flex items-center font-bold text-contrast leading-normal">
-        <span class="line-clamp-2">{{ instance.name }}</span>
-      </div>
-      <div class="flex items-center">
-        <ButtonStyled v-if="playing" color="red" circular @mousehover="checkProcess">
-          <button v-tooltip="'Stop'" @click="(e) => stop(e, 'InstanceCard')">
-            <StopCircleIcon />
-          </button>
-        </ButtonStyled>
-        <ButtonStyled v-else-if="modLoading" color="standard" circular>
-          <button v-tooltip="'Instance is loading...'" disabled>
-            <SpinnerIcon class="animate-spin" />
-          </button>
-        </ButtonStyled>
-        <ButtonStyled v-else :color="first ? 'brand' : 'standard'" circular>
-          <button
-            v-tooltip="'Play'"
-            @click="(e) => play(e, 'InstanceCard')"
-            @mousehover="checkProcess"
-          >
-            <!-- Translate for optical centering -->
-            <PlayIcon class="translate-x-[1px]" />
-          </button>
-        </ButtonStyled>
-      </div>
-      <div class="flex items-center col-span-3 gap-1 text-secondary font-semibold">
-        <TimerIcon />
-        <span class="text-sm"> Played {{ dayjs(instance.last_played).fromNow() }} </span>
-      </div>
-    </div>
-  </template>
-  <div v-else>
-    <div
-      class="button-base bg-bg-raised p-4 rounded-xl flex gap-3 group"
-      @click="seeInstance"
-      @mouseenter="checkProcess"
-    >
-      <div class="relative flex items-center justify-center">
-        <Avatar
-          size="48px"
-          :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-          :tint-by="instance.path"
-          alt="Mod card"
-          :class="`transition-all ${modLoading || installing ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
-        />
-        <div class="absolute inset-0 flex items-center justify-center">
-          <ButtonStyled v-if="playing" size="large" color="red" circular>
-            <button
-              v-tooltip="'Stop'"
-              :class="{ 'scale-100 opacity-100': playing }"
-              class="transition-all scale-75 origin-bottom opacity-0 card-shadow"
-              @click="(e) => stop(e, 'InstanceCard')"
-              @mousehover="checkProcess"
-            >
-              <StopCircleIcon />
-            </button>
-          </ButtonStyled>
-          <SpinnerIcon
-            v-else-if="modLoading || installing"
-            v-tooltip="modLoading ? 'Instance is loading...' : 'Installing...'"
-            class="animate-spin w-8 h-8"
-            tabindex="-1"
-          />
-          <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"
-              @click="(e) => play(e, 'InstanceCard')"
-              @mousehover="checkProcess"
-            >
-              <PlayIcon class="translate-x-[2px]" />
-            </button>
-          </ButtonStyled>
-        </div>
-      </div>
-      <div class="flex flex-col gap-1">
-        <p class="m-0 text-md font-bold text-contrast leading-tight line-clamp-1">
-          {{ instance.name }}
+      <div class="project-info">
+        <p class="title">{{ props.instance.name }}</p>
+        <p
+          v-if="
+            props.instance.install_stage === 'installing' ||
+            props.instance.install_stage === 'not_installed' ||
+            props.instance.install_stage === 'pack_installing'
+          "
+          class="description"
+        >
+          Installing...
+        </p>
+        <p v-else class="description">
+          {{ props.instance.loader }}
+          {{ props.instance.game_version }}
        </p>
-        <div class="flex items-center col-span-3 gap-1 text-secondary font-semibold mt-auto">
-          <GameIcon class="shrink-0" />
-          <span class="text-sm">
-            {{ formatCategory(instance.loader) }} {{ instance.game_version }}
-          </span>
-        </div>
      </div>
+    </Card>
+    <div
+      v-if="playing === true"
+      class="stop cta button-base"
+      @click="(e) => stop(e, 'InstanceCard')"
+      @mousehover="checkProcess"
+    >
+      <StopCircleIcon />
+    </div>
+    <div v-else-if="modLoading === true && playing === false" class="cta loading-cta">
+      <AnimatedLogo class="loading-indicator" />
+    </div>
+    <div v-else class="install cta button-base" @click="(e) => play(e, 'InstanceCard')">
+      <PlayIcon />
    </div>
  </div>
 </template>
+
+<style lang="scss">
+.loading-indicator {
+  width: 2.5rem !important;
+  height: 2.5rem !important;
+
+  svg {
+    width: 2.5rem !important;
+    height: 2.5rem !important;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.instance {
+  position: relative;
+
+  &:hover {
+    .cta {
+      opacity: 1;
+      bottom: calc(var(--gap-md) + 4.25rem);
+    }
+  }
+}
+
+.cta {
+  position: absolute;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: var(--radius-md);
+  z-index: 1;
+  width: 3rem;
+  height: 3rem;
+  right: calc(var(--gap-md) * 2);
+  bottom: 3.25rem;
+  opacity: 0;
+  transition:
+    0.2s ease-in-out bottom,
+    0.2s ease-in-out opacity,
+    0.1s ease-in-out filter !important;
+  cursor: pointer;
+  box-shadow: var(--shadow-floating);
+
+  svg {
+    color: var(--color-accent-contrast);
+    width: 1.5rem !important;
+    height: 1.5rem !important;
+  }
+
+  &.install {
+    background: var(--color-brand);
+    display: flex;
+  }
+
+  &.stop {
+    background: var(--color-red);
+    display: flex;
+  }
+
+  &.loading-cta {
+    background: hsl(220, 11%, 10%) !important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
+.instance-card-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  padding: var(--gap-md);
+  transition: 0.1s ease-in-out all !important; /* overrides Omorphia defaults */
+  margin-bottom: 0;
+
+  .mod-image {
+    --size: 100%;
+
+    width: 100% !important;
+    height: auto !important;
+    max-width: unset !important;
+    max-height: unset !important;
+    aspect-ratio: 1 / 1 !important;
+  }
+
+  .project-info {
+    margin-top: 1rem;
+    width: 100%;
+
+    .title {
+      color: var(--color-contrast);
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      width: 100%;
+      margin: 0;
+      font-weight: 600;
+      font-size: 1rem;
+      line-height: 110%;
+      display: inline-block;
+    }
+
+    .description {
+      color: var(--color-base);
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      font-weight: 500;
+      font-size: 0.775rem;
+      line-height: 125%;
+      margin: 0.25rem 0 0;
+      text-transform: capitalize;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+}
+</style>
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="modal" header="Create instance">
+  <Modal ref="modal" header="Create instance" :noblur="!themeStore.advancedRendering">
    <div class="modal-header">
      <Chips v-model="creationType" :items="['custom', 'from file', 'import from launcher']" />
    </div>
@@ -193,11 +193,10 @@
        />
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <script setup>
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import {
  PlusIcon,
  UploadIcon,
@@ -208,7 +207,7 @@ import {
  FolderSearchIcon,
  UpdatedIcon,
 } from '@modrinth/assets'
-import { Avatar, Button, Chips, Checkbox } from '@modrinth/ui'
+import { Avatar, Button, Chips, Modal, Checkbox } from '@modrinth/ui'
 import { computed, onUnmounted, ref, shallowRef } from 'vue'
 import { get_loaders } from '@/helpers/tags'
 import { create } from '@/helpers/profile'
@@ -218,6 +217,8 @@ import { get_game_versions, get_loader_versions } from '@/helpers/metadata'
 import { handleError } from '@/store/notifications.js'
 import Multiselect from 'vue-multiselect'
 import { trackEvent } from '@/helpers/analytics'
+import { useTheming } from '@/store/state.js'
+import { listen } from '@tauri-apps/api/event'
 import { install_from_file } from '@/helpers/pack.js'
 import {
  get_default_launcher_path,
@@ -225,7 +226,8 @@ import {
  import_instance,
 } from '@/helpers/import.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
-import { getCurrentWebview } from '@tauri-apps/api/webview'
+
+const themeStore = useTheming()

 const profile_name = ref('')
 const game_version = ref('')
@@ -237,7 +239,7 @@ const display_icon = ref(null)
 const showAdvanced = ref(false)
 const creating = ref(false)
 const showSnapshots = ref(false)
-const creationType = ref('custom')
+const creationType = ref('from file')
 const isShowing = ref(false)

 defineExpose({
@@ -255,15 +257,13 @@ defineExpose({
    isShowing.value = true
    modal.value.show()

-    unlistener.value = await getCurrentWebview().onDragDropEvent(async (event) => {
+    unlistener.value = await listen('tauri://file-drop', async (event) => {
      // Only if modal is showing
      if (!isShowing.value) return
-      if (event.payload.type !== 'drop') return
      if (creationType.value !== 'from file') return
      hide()
-      const { paths } = event.payload
-      if (paths && paths.length > 0 && paths[0].endsWith('.mrpack')) {
-        await install_from_file(paths[0]).catch(handleError)
+      if (event.payload && event.payload.length > 0 && event.payload[0].endsWith('.mrpack')) {
+        await install_from_file(event.payload[0]).catch(handleError)
        trackEvent('InstanceCreate', {
          source: 'CreationModalFileDrop',
        })
@@ -371,7 +371,7 @@ const create_instance = async () => {
 }

 const upload_icon = async () => {
-  const res = await open({
+  icon.value = await open({
    multiple: false,
    filters: [
      {
@@ -381,8 +381,6 @@ const upload_icon = async () => {
    ],
  })

-  icon.value = res.path ?? res
-
  if (!icon.value) return
  display_icon.value = convertFileSrc(icon.value)
 }
@@ -419,7 +417,7 @@ const openFile = async () => {
  const newProject = await open({ multiple: false })
  if (!newProject) return
  hide()
-  await install_from_file(newProject.path ?? newProject).catch(handleError)
+  await install_from_file(newProject).catch(handleError)

  trackEvent('InstanceCreate', {
    source: 'CreationModalFileOpen',
@@ -464,7 +462,7 @@ const promises = profileOptions.value.map(async (option) => {
      option.name,
      instances.map((name) => ({ name, selected: false })),
    )
-  } catch {
+  } catch (error) {
    // Allow failure silently
  }
 })
@@ -525,8 +523,8 @@ const next = async () => {
 .modal-body {
  display: flex;
  flex-direction: column;
+  padding: var(--gap-lg);
  gap: var(--gap-md);
-  margin-top: var(--gap-lg);
 }

 .input-label {
@@ -595,6 +593,7 @@ const next = async () => {
  flex-direction: row;
  justify-content: space-between;
  align-items: center;
+  padding: var(--gap-lg);
  padding-bottom: 0;
 }

--- a/apps/app-frontend/src/components/ui/InstanceIndicator.vue
+++ b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
@@ -1,53 +0,0 @@
-<script setup lang="ts">
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { formatCategory } from '@modrinth/utils'
-import { GameIcon, LeftArrowIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled } from '@modrinth/ui'
-
-type Instance = {
-  game_version: string
-  loader: string
-  path: string
-  install_stage: string
-  icon_path?: string
-  name: string
-}
-
-defineProps<{
-  instance: Instance
-}>()
-</script>
-
-<template>
-  <div class="flex justify-between items-center border-0 border-b border-solid border-divider pb-4">
-    <router-link
-      :to="`/instance/${encodeURIComponent(instance.path)}`"
-      tabindex="-1"
-      class="flex flex-col gap-4 text-primary"
-    >
-      <span class="flex items-center gap-2">
-        <Avatar
-          :src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
-          :alt="instance.name"
-          size="48px"
-        />
-        <span class="flex flex-col gap-2">
-          <span class="font-extrabold bold text-contrast">
-            {{ instance.name }}
-          </span>
-          <span class="text-secondary flex items-center gap-2 font-semibold">
-            <GameIcon class="h-5 w-5 text-secondary" />
-            {{ formatCategory(instance.loader) }} {{ instance.game_version }}
-          </span>
-        </span>
-      </span>
-    </router-link>
-    <ButtonStyled>
-      <router-link :to="`/instance/${encodeURIComponent(instance.path)}`">
-        <LeftArrowIcon /> Back to instance
-      </router-link>
-    </ButtonStyled>
-  </div>
-</template>
-
-<style scoped lang="scss"></style>
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="detectJavaModal" header="Select java version" :show-ad-on-close="false">
+  <Modal ref="detectJavaModal" header="Select java version" :noblur="!themeStore.advancedRendering">
    <div class="auto-detect-modal">
      <div class="table">
        <div class="table-row table-head">
@@ -32,16 +32,18 @@
        </Button>
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 <script setup>
 import { PlusIcon, CheckIcon, XIcon } from '@modrinth/assets'
-import { Button } from '@modrinth/ui'
+import { Modal, Button } from '@modrinth/ui'
 import { ref } from 'vue'
 import { find_filtered_jres } from '@/helpers/jre.js'
 import { handleError } from '@/store/notifications.js'
+import { useTheming } from '@/store/theme.js'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+
+const themeStore = useTheming()

 const chosenInstallOptions = ref([])
 const detectJavaModal = ref(null)
@@ -73,6 +75,8 @@ function setJavaInstall(javaInstall) {
 </script>
 <style lang="scss" scoped>
 .auto-detect-modal {
+  padding: 1rem;
+
  .table {
    .table-row {
      grid-template-columns: 1fr 4fr min-content;
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -28,7 +28,7 @@
      </Button>
      <Button :disabled="props.disabled" @click="autoDetect">
        <SearchIcon />
-        Detect
+        Auto detect
      </Button>
      <Button :disabled="props.disabled" @click="handleJavaFileInput()">
        <FolderSearchIcon />
@@ -124,19 +124,20 @@ async function testJava() {
 }

 async function handleJavaFileInput() {
-  const filePath = await open()
+  let filePath = await open()

  if (filePath) {
-    let result = await get_jre(filePath.path ?? filePath)
+    let result = await get_jre(filePath)
    if (!result) {
      result = {
-        path: filePath.path ?? filePath,
+        path: filePath,
        version: props.version.toString(),
        architecture: 'x86',
      }
    }

    trackEvent('JavaManualSelect', {
+      path: filePath,
      version: props.version,
    })

@@ -149,7 +150,7 @@ async function autoDetect() {
  if (!props.compact) {
    detectJavaModal.value.show(props.version, props.modelValue)
  } else {
-    const versions = await find_filtered_jres(props.version).catch(handleError)
+    let versions = await find_filtered_jres(props.version).catch(handleError)
    if (versions.length > 0) {
      emit('update:modelValue', versions[0])
    }
@@ -187,7 +188,6 @@ async function reinstallJava() {

 .toggle-setting {
  display: flex;
-  flex-wrap: wrap;
  flex-direction: row;
  justify-content: space-between;
  align-items: center;
--- a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
+++ b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { CheckIcon } from '@modrinth/assets'
-import { Button, Badge } from '@modrinth/ui'
+import { Button, Modal, Badge } from '@modrinth/ui'
 import { computed, ref } from 'vue'
+import { useTheming } from '@/store/theme'
 import { update_managed_modrinth_version } from '@/helpers/profile'
 import { releaseColor } from '@/helpers/utils'
 import { SwapIcon } from '@/assets/icons/index.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'

 const props = defineProps({
  versions: {
@@ -24,8 +24,6 @@ defineExpose({
  },
 })

-const emit = defineEmits(['finish-install'])
-
 const filteredVersions = computed(() => {
  return props.versions
 })
@@ -35,30 +33,24 @@ const installedVersion = computed(() => props.instance?.linked_data?.version_id)
 const installing = computed(() => props.instance.install_stage !== 'installed')
 const inProgress = ref(false)

+const themeStore = useTheming()
+
 const switchVersion = async (versionId) => {
-  modpackVersionModal.value.hide()
  inProgress.value = true
  await update_managed_modrinth_version(props.instance.path, versionId)
  inProgress.value = false
-  emit('finish-install')
-}
-
-const onHide = () => {
-  if (!inProgress.value) {
-    emit('finish-install')
-  }
 }
 </script>

 <template>
-  <ModalWrapper
+  <Modal
    ref="modpackVersionModal"
    class="modpack-version-modal"
    header="Change modpack version"
-    :on-hide="onHide"
+    :noblur="!themeStore.advancedRendering"
  >
    <div class="modal-body">
-      <div v-if="instance.linked_data" class="mod-card">
+      <Card 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" />
@@ -117,9 +109,9 @@ const onHide = () => {
            </div>
          </div>
        </div>
-      </div>
+      </Card>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <style scoped lang="scss">
@@ -184,6 +176,7 @@ const onHide = () => {
 }

 .modal-body {
+  padding: var(--gap-xl);
  display: flex;
  flex-direction: column;
  gap: var(--gap-md);
--- a/apps/app-frontend/src/components/ui/NavButton.vue
+++ b/apps/app-frontend/src/components/ui/NavButton.vue
@@ -1,59 +0,0 @@
-<template>
-  <RouterLink
-    v-if="typeof to === 'string'"
-    :to="to"
-    v-bind="$attrs"
-    :class="{
-      'router-link-active': isPrimary && isPrimary(route),
-      'subpage-active': isSubpage && isSubpage(route),
-    }"
-    class="w-12 h-12 rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast"
-  >
-    <slot />
-  </RouterLink>
-  <button
-    v-else
-    v-bind="$attrs"
-    class="button-animation border-none text-primary cursor-pointer w-12 h-12 rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast"
-    @click="to"
-  >
-    <slot />
-  </button>
-</template>
-
-<script setup lang="ts">
-import type { RouteLocationNormalizedLoaded } from 'vue-router'
-import { RouterLink, useRoute } from 'vue-router'
-
-const route = useRoute()
-
-type RouteFunction = (route: RouteLocationNormalizedLoaded) => boolean
-
-defineProps<{
-  to: (() => void) | string
-  isPrimary?: RouteFunction
-  isSubpage?: RouteFunction
-  highlightOverride?: boolean
-}>()
-
-defineOptions({
-  inheritAttrs: false,
-})
-</script>
-
-<style lang="scss" scoped>
-.router-link-active,
-.subpage-active {
-  svg {
-    filter: drop-shadow(0 0 0.5rem black);
-  }
-}
-
-.router-link-active {
-  @apply text-[--color-button-text-selected] bg-[--color-button-bg-selected];
-}
-
-.subpage-active {
-  @apply text-contrast bg-button-bg;
-}
-</style>
--- a/apps/app-frontend/src/components/ui/NavTabs.vue
+++ b/apps/app-frontend/src/components/ui/NavTabs.vue
@@ -1,160 +0,0 @@
-<template>
-  <nav
-    class="card-shadow experimental-styles-within relative flex w-fit overflow-clip rounded-full bg-bg-raised p-1 text-sm font-bold"
-  >
-    <RouterLink
-      v-for="(link, index) in filteredLinks"
-      v-show="link.shown === undefined ? true : link.shown"
-      :key="index"
-      ref="tabLinkElements"
-      :to="query ? (link.href ? `?${query}=${link.href}` : '?') : link.href"
-      :class="`button-animation z-[1] flex flex-row items-center gap-2 px-4 py-2 focus:rounded-full ${activeIndex === index && !subpageSelected ? 'text-button-textSelected' : activeIndex === index && subpageSelected ? 'text-contrast' : 'text-primary'}`"
-    >
-      <component :is="link.icon" v-if="link.icon" class="size-5" />
-      <span class="text-nowrap">{{ link.label }}</span>
-    </RouterLink>
-    <div
-      :class="`navtabs-transition pointer-events-none absolute h-[calc(100%-0.5rem)] overflow-hidden rounded-full p-1 ${subpageSelected ? 'bg-button-bg' : 'bg-button-bgSelected'}`"
-      :style="{
-        left: sliderLeftPx,
-        top: sliderTopPx,
-        right: sliderRightPx,
-        bottom: sliderBottomPx,
-        opacity: sliderLeft === 4 && sliderLeft === sliderRight ? 0 : activeIndex === -1 ? 0 : 1,
-      }"
-      aria-hidden="true"
-    ></div>
-  </nav>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
-import type { RouteLocationRaw } from 'vue-router'
-import { useRoute, RouterLink } from 'vue-router'
-
-const route = useRoute()
-
-interface Tab {
-  label: string
-  href: string | RouteLocationRaw
-  shown?: boolean
-  icon?: unknown
-  subpages?: string[]
-}
-
-const props = defineProps<{
-  links: Tab[]
-  query?: string
-}>()
-
-const sliderLeft = ref(4)
-const sliderTop = ref(4)
-const sliderRight = ref(4)
-const sliderBottom = ref(4)
-const activeIndex = ref(-1)
-const oldIndex = ref(-1)
-const subpageSelected = ref(false)
-
-const filteredLinks = computed(() =>
-  props.links.filter((x) => (x.shown === undefined ? true : x.shown)),
-)
-const sliderLeftPx = computed(() => `${sliderLeft.value}px`)
-const sliderTopPx = computed(() => `${sliderTop.value}px`)
-const sliderRightPx = computed(() => `${sliderRight.value}px`)
-const sliderBottomPx = computed(() => `${sliderBottom.value}px`)
-
-function pickLink() {
-  let index = -1
-  subpageSelected.value = false
-  for (let i = filteredLinks.value.length - 1; i >= 0; i--) {
-    const link = filteredLinks.value[i]
-
-    if (route.path === (typeof link.href === 'string' ? link.href : link.href.path)) {
-      index = i
-      break
-    } else if (link.subpages && link.subpages.some((subpage) => route.path.includes(subpage))) {
-      index = i
-      subpageSelected.value = true
-      break
-    }
-  }
-  activeIndex.value = index
-
-  if (activeIndex.value !== -1) {
-    startAnimation()
-  } else {
-    oldIndex.value = -1
-    sliderLeft.value = 0
-    sliderRight.value = 0
-  }
-}
-
-const tabLinkElements = ref()
-
-function startAnimation() {
-  const el = tabLinkElements.value[activeIndex.value].$el
-
-  if (!el || !el.offsetParent) return
-
-  const newValues = {
-    left: el.offsetLeft,
-    top: el.offsetTop,
-    right: el.offsetParent.offsetWidth - el.offsetLeft - el.offsetWidth,
-    bottom: el.offsetParent.offsetHeight - el.offsetTop - el.offsetHeight,
-  }
-
-  if (sliderLeft.value === 4 && sliderRight.value === 4) {
-    sliderLeft.value = newValues.left
-    sliderRight.value = newValues.right
-    sliderTop.value = newValues.top
-    sliderBottom.value = newValues.bottom
-  } else {
-    const delay = 200
-
-    if (newValues.left < sliderLeft.value) {
-      sliderLeft.value = newValues.left
-      setTimeout(() => {
-        sliderRight.value = newValues.right
-      }, delay)
-    } else {
-      sliderRight.value = newValues.right
-      setTimeout(() => {
-        sliderLeft.value = newValues.left
-      }, delay)
-    }
-
-    if (newValues.top < sliderTop.value) {
-      sliderTop.value = newValues.top
-      setTimeout(() => {
-        sliderBottom.value = newValues.bottom
-      }, delay)
-    } else {
-      sliderBottom.value = newValues.bottom
-      setTimeout(() => {
-        sliderTop.value = newValues.top
-      }, delay)
-    }
-  }
-}
-
-onMounted(() => {
-  window.addEventListener('resize', pickLink)
-  pickLink()
-})
-
-onUnmounted(() => {
-  window.removeEventListener('resize', pickLink)
-})
-
-watch(route, () => {
-  pickLink()
-})
-</script>
-<style scoped>
-.navtabs-transition {
-  /* Delay on opacity is to hide any jankiness as the page loads */
-  transition:
-    all 150ms cubic-bezier(0.4, 0, 0.2, 1) 0s,
-    opacity 250ms cubic-bezier(0.5, 0, 0.2, 1) 50ms;
-}
-</style>
--- a/apps/app-frontend/src/components/ui/ProjectCard.vue
+++ b/apps/app-frontend/src/components/ui/ProjectCard.vue
@@ -1,15 +1,17 @@
 <script setup>
-import { Avatar, TagItem } from '@modrinth/ui'
-import { DownloadIcon, HeartIcon, TagIcon } from '@modrinth/assets'
+import { Card, Avatar, Button } from '@modrinth/ui'
+import { DownloadIcon, HeartIcon, CalendarIcon } from '@modrinth/assets'
 import { formatNumber, formatCategory } from '@modrinth/utils'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { useRouter } from 'vue-router'
+import { install as installVersion } from '@/store/install.js'

 dayjs.extend(relativeTime)

 const router = useRouter()
+const installing = ref(false)

 const props = defineProps({
  project: {
@@ -20,17 +22,6 @@ const props = defineProps({
  },
 })

-const featuredCategory = computed(() => {
-  if (props.project.categories.includes('optimization')) {
-    return 'optimization'
-  }
-
-  if (props.project.categories.length > 0) {
-    return props.project.categories[0]
-  }
-  return undefined
-})
-
 const toColor = computed(() => {
  let color = props.project.color

@@ -56,66 +47,197 @@ const toTransparent = computed(() => {
    '))'
  )
 })
+
+const install = async (e) => {
+  e?.stopPropagation()
+  installing.value = true
+  await installVersion(
+    props.project.project_id,
+    null,
+    props.instance ? props.instance.path : null,
+    'ProjectCard',
+    () => {
+      installing.value = false
+    },
+  )
+}
 </script>

 <template>
-  <div
-    class="card-shadow bg-bg-raised rounded-xl overflow-clip cursor-pointer hover:brightness-90 transition-all"
-    @click="router.push(`/project/${project.slug}`)"
-  >
-    <div
-      class="w-full aspect-[2/1] bg-cover bg-center bg-no-repeat"
-      :style="{
-        'background-color': project.featured_gallery ?? project.gallery[0] ? null : toColor,
-        'background-image': `url(${
-          project.featured_gallery ??
-          project.gallery[0] ??
-          'https://launcher-files.modrinth.com/assets/maze-bg.png'
-        })`,
-      }"
-    >
+  <div class="wrapper">
+    <Card class="project-card button-base" @click="router.push(`/project/${project.slug}`)">
      <div
-        class="badges-wrapper"
-        :class="{
+        class="banner"
+        :style="{
+          'background-color': project.featured_gallery ?? project.gallery[0] ? null : toColor,
+          'background-image': `url(${
+            project.featured_gallery ??
+            project.gallery[0] ??
+            'https://launcher-files.modrinth.com/assets/maze-bg.png'
+          })`,
          'no-image': !project.featured_gallery && !project.gallery[0],
        }"
-        :style="{
-          background: !project.featured_gallery && !project.gallery[0] ? toTransparent : null,
-        }"
-      ></div>
-    </div>
-    <div class="flex flex-col justify-center gap-2 px-4 py-3">
-      <div class="flex gap-2 items-center">
-        <Avatar size="48px" :src="project.icon_url" />
-        <div class="h-full flex items-center font-bold text-contrast leading-normal">
-          <span class="line-clamp-2">{{ project.title }}</span>
+      >
+        <div class="badges">
+          <div class="badge">
+            <DownloadIcon />
+            {{ formatNumber(project.downloads) }}
+          </div>
+          <div class="badge">
+            <HeartIcon />
+            {{ formatNumber(project.follows) }}
+          </div>
+          <div class="badge">
+            <CalendarIcon />
+            {{ formatCategory(dayjs(project.date_modified).fromNow()) }}
+          </div>
        </div>
+        <div
+          class="badges-wrapper"
+          :class="{
+            'no-image': !project.featured_gallery && !project.gallery[0],
+          }"
+          :style="{
+            background: !project.featured_gallery && !project.gallery[0] ? toTransparent : null,
+          }"
+        ></div>
      </div>
-      <p class="m-0 text-sm font-medium line-clamp-3 leading-tight h-[3.25rem]">
+      <Avatar class="icon" size="sm" :src="project.icon_url" />
+      <div class="title">
+        <div class="title-text">
+          {{ project.title }}
+        </div>
+        <div class="author">by {{ project.author }}</div>
+      </div>
+      <div class="description">
        {{ project.description }}
-      </p>
-      <div class="flex items-center gap-2 text-sm text-secondary font-semibold mt-auto">
-        <div
-          class="flex items-center gap-1 pr-2 border-0 border-r-[1px] border-solid border-button-border"
-        >
-          <DownloadIcon />
-          {{ formatNumber(project.downloads) }}
-        </div>
-        <div
-          class="flex items-center gap-1 pr-2 border-0 border-r-[1px] border-solid border-button-border"
-        >
-          <HeartIcon />
-          {{ formatNumber(project.follows) }}
-        </div>
-        <div class="flex items-center gap-1 pr-2">
-          <TagIcon />
-          <TagItem>
-            {{ formatCategory(featuredCategory) }}
-          </TagItem>
-        </div>
      </div>
-    </div>
+    </Card>
+    <Button color="primary" class="install" :disabled="installing" @click="install">
+      <DownloadIcon />
+      {{ installing ? 'Installing' : 'Install' }}
+    </Button>
  </div>
 </template>

-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.wrapper {
+  position: relative;
+  aspect-ratio: 1;
+
+  &:hover {
+    .install:enabled {
+      opacity: 1;
+    }
+  }
+}
+
+.project-card {
+  display: grid;
+  grid-gap: 1rem;
+  grid-template:
+    '. . . .' 0
+    '. icon title .' 3rem
+    'banner banner banner banner' auto
+    '. description description .' 3.5rem
+    '. . . .' 0 / 0 3rem minmax(0, 1fr) 0;
+  max-width: 100%;
+  height: 100%;
+  padding: 0;
+  margin: 0;
+
+  .icon {
+    grid-area: icon;
+  }
+
+  .title {
+    max-width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    grid-area: title;
+    white-space: nowrap;
+
+    .title-text {
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      font-size: var(--font-size-md);
+      font-weight: bold;
+    }
+  }
+
+  .author {
+    font-size: var(--font-size-sm);
+    grid-area: author;
+  }
+
+  .banner {
+    grid-area: banner;
+    background-size: cover;
+    background-position: center;
+    position: relative;
+
+    .badges-wrapper {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      position: absolute;
+      top: 0;
+      left: 0;
+      mix-blend-mode: hard-light;
+    }
+
+    .badges {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      padding: var(--gap-sm);
+      gap: var(--gap-xs);
+      display: flex;
+      z-index: 10;
+      flex-direction: row;
+      justify-content: flex-end;
+      align-items: flex-end;
+    }
+  }
+
+  .description {
+    grid-area: description;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+}
+
+.badge {
+  background-color: var(--color-raised-bg);
+  font-size: var(--font-size-xs);
+  padding: var(--gap-xs) var(--gap-sm);
+  border-radius: var(--radius-sm);
+
+  svg {
+    width: 1rem;
+    height: 1rem;
+    margin-right: var(--gap-xs);
+  }
+}
+
+.install {
+  position: absolute;
+  top: calc(5rem + var(--gap-sm));
+  right: var(--gap-sm);
+  z-index: 10;
+  opacity: 0;
+  transition: opacity 0.2s ease-in-out;
+
+  svg {
+    width: 1rem;
+    height: 1rem;
+  }
+}
+</style>
--- a/apps/app-frontend/src/components/ui/PromotionWrapper.vue
+++ b/apps/app-frontend/src/components/ui/PromotionWrapper.vue
@@ -1,39 +1,23 @@
-<script setup>
-import { ref, onMounted } from 'vue'
-import { init_ads_window } from '@/helpers/ads.js'
+<script setup lang="ts">
+import { ref } from 'vue'
+import { Promotion } from '@modrinth/ui'
+import { get as getCreds } from '@/helpers/mr_auth.js'
+import { handleError } from '@/store/notifications.js'
+import { get_user } from '@/helpers/cache.js'

-const adsWrapper = ref(null)
+const showAd = ref(true)

-let devicePixelRatioWatcher = null
+const creds = await getCreds().catch(handleError)
+if (creds && creds.user_id) {
+  const user = await get_user(creds.user_id).catch(handleError)

-function initDevicePixelRatioWatcher() {
-  if (devicePixelRatioWatcher) {
-    devicePixelRatioWatcher.removeEventListener('change', updateAdPosition)
-  }
-
-  devicePixelRatioWatcher = window.matchMedia(`(resolution: ${window.devicePixelRatio}dppx)`)
-  devicePixelRatioWatcher.addEventListener('change', updateAdPosition)
-}
-
-onMounted(() => {
-  updateAdPosition()
-
-  window.addEventListener('resize', updateAdPosition)
-  initDevicePixelRatioWatcher()
-})
-
-function updateAdPosition() {
-  if (adsWrapper.value) {
-    init_ads_window()
-    initDevicePixelRatioWatcher()
+  const MIDAS_BITFLAG = 1 << 0
+  if (user && (user.badges & MIDAS_BITFLAG) === MIDAS_BITFLAG) {
+    showAd.value = false
  }
 }
 </script>

 <template>
-  <div ref="adsWrapper" class="ad-parent relative flex w-full justify-center cursor-pointer bg-bg">
-    <div class="flex max-h-[250px] min-h-[250px] min-w-[300px] max-w-[300px] flex-col gap-4 p-6">
-      <p class="m-0 text-2xl font-bold text-contrast">75% of ad revenue goes to creators</p>
-    </div>
-  </div>
+  <Promotion v-if="showAd" :external="false" query-param="?r=launcher" />
 </template>
--- a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -1,73 +0,0 @@
-<script setup>
-import { list } from '@/helpers/profile'
-import { handleError } from '@/store/notifications'
-import dayjs from 'dayjs'
-import { onUnmounted, ref } from 'vue'
-import { profile_listener } from '@/helpers/events.js'
-import NavButton from '@/components/ui/NavButton.vue'
-import { Avatar } from '@modrinth/ui'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { SpinnerIcon } from '@modrinth/assets'
-
-const recentInstances = ref([])
-const getInstances = async () => {
-  const profiles = await list().catch(handleError)
-
-  recentInstances.value = profiles
-    .sort((a, b) => {
-      const dateACreated = dayjs(a.created)
-      const dateAPlayed = a.last_played ? dayjs(a.last_played) : dayjs(0)
-
-      const dateBCreated = dayjs(b.created)
-      const dateBPlayed = b.last_played ? dayjs(b.last_played) : dayjs(0)
-
-      const dateA = dateACreated.isAfter(dateAPlayed) ? dateACreated : dateAPlayed
-      const dateB = dateBCreated.isAfter(dateBPlayed) ? dateBCreated : dateBPlayed
-
-      if (dateA.isSame(dateB)) {
-        return a.name.localeCompare(b.name)
-      }
-
-      return dateB - dateA
-    })
-    .slice(0, 4)
-}
-
-await getInstances()
-
-const unlistenProfile = await profile_listener(async (event) => {
-  if (event.event !== 'synced') {
-    await getInstances()
-  }
-})
-
-onUnmounted(() => {
-  unlistenProfile()
-})
-</script>
-
-<template>
-  <NavButton
-    v-for="instance in recentInstances"
-    :key="instance.id"
-    v-tooltip.right="instance.name"
-    :to="`/instance/${encodeURIComponent(instance.path)}`"
-    class="relative"
-  >
-    <Avatar
-      :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-      size="28px"
-      :tint-by="instance.path"
-      :class="`transition-all ${instance.install_stage !== 'installed' ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
-    />
-    <div
-      v-if="instance.install_stage !== 'installed'"
-      class="absolute inset-0 flex items-center justify-center z-10"
-    >
-      <SpinnerIcon class="animate-spin w-4 h-4" />
-    </div>
-  </NavButton>
-  <div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-button-bg"></div>
-</template>
-
-<style scoped lang="scss"></style>
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -1,12 +1,20 @@
 <template>
  <div class="action-groups">
-    <ButtonStyled v-if="currentLoadingBars.length > 0" color="brand" type="transparent" circular>
-      <button ref="infoButton" @click="toggleCard()">
-        <DownloadIcon />
-      </button>
-    </ButtonStyled>
+    <a href="https://support.modrinth.com" class="link">
+      <ChatIcon />
+      <span> Get support </span>
+    </a>
+    <Button
+      v-if="currentLoadingBars.length > 0"
+      ref="infoButton"
+      icon-only
+      class="icon-button show-card-icon"
+      @click="toggleCard()"
+    >
+      <DownloadIcon />
+    </Button>
    <div v-if="offline" class="status">
-      <UnplugIcon />
+      <span class="circle stopped" />
      <div class="running-text">
        <span> Offline </span>
      </div>
@@ -37,6 +45,15 @@
      <Button v-tooltip="'View logs'" icon-only class="icon-button" @click="goToTerminal()">
        <TerminalSquareIcon />
      </Button>
+      <Button
+        v-if="currentLoadingBars.length > 0"
+        ref="infoButton"
+        icon-only
+        class="icon-button show-card-icon"
+        @click="toggleCard()"
+      >
+        <DownloadIcon />
+      </Button>
    </div>
    <div v-else class="status">
      <span class="circle stopped" />
@@ -91,14 +108,8 @@
 </template>

 <script setup>
-import {
-  DownloadIcon,
-  StopCircleIcon,
-  TerminalSquareIcon,
-  DropdownIcon,
-  UnplugIcon,
-} from '@modrinth/assets'
-import { Button, ButtonStyled, Card } from '@modrinth/ui'
+import { DownloadIcon, StopCircleIcon, TerminalSquareIcon, DropdownIcon } from '@modrinth/assets'
+import { Button, Card } from '@modrinth/ui'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 import { get_all as getRunningProcesses, kill as killProcess } from '@/helpers/process'
 import { loading_listener, process_listener } from '@/helpers/events'
@@ -106,6 +117,7 @@ import { useRouter } from 'vue-router'
 import { progress_bars_list } from '@/helpers/state.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { handleError } from '@/store/notifications.js'
+import { ChatIcon } from '@/assets/icons'
 import { get_many } from '@/helpers/profile.js'
 import { trackEvent } from '@/helpers/analytics'

@@ -396,6 +408,10 @@ onBeforeUnmount(() => {
  }
 }

+.show-card-icon {
+  color: var(--color-brand);
+}
+
 .download-enter-active,
 .download-leave-active {
  transition: opacity 0.3s ease;
--- a/apps/app-frontend/src/components/ui/SearchCard.vue
+++ b/apps/app-frontend/src/components/ui/SearchCard.vue
@@ -1,128 +1,74 @@
 <template>
-  <div
-    class="card-shadow p-4 bg-bg-raised rounded-xl flex gap-3 group cursor-pointer hover:brightness-90 transition-all"
+  <Card
+    class="card button-base"
    @click="
      () => {
-        emit('open')
+        emits('open')
        $router.push({
-          path: `/project/${project.project_id ?? project.id}`,
+          path: `/project/${project.project_id ?? project.id}/`,
          query: { i: props.instance ? props.instance.path : undefined },
        })
      }
    "
  >
-    <div class="icon w-[96px] h-[96px] relative">
-      <Avatar :src="project.icon_url" size="96px" class="search-icon origin-top transition-all" />
+    <div class="icon">
+      <Avatar :src="project.icon_url" size="md" class="search-icon" />
    </div>
-    <div class="flex flex-col gap-2 overflow-hidden">
-      <div class="gap-2 overflow-hidden no-wrap text-ellipsis">
-        <span class="text-lg font-extrabold text-contrast m-0 leading-none">
-          {{ project.title }}
-        </span>
-        <span v-if="project.author" class="text-secondary"> by {{ project.author }}</span>
+    <div class="content-wrapper">
+      <div class="title joined-text">
+        <h2>{{ project.title }}</h2>
+        <span v-if="project.author">by {{ project.author }}</span>
      </div>
-      <div class="m-0 line-clamp-2">
+      <div class="description">
        {{ project.description }}
      </div>
-      <div v-if="categories.length > 0" class="mt-auto flex items-center gap-1 no-wrap">
-        <TagsIcon class="h-4 w-4 shrink-0" />
-        <div
-          v-if="project.project_type === 'mod' || project.project_type === 'modpack'"
-          class="text-sm font-semibold text-secondary flex gap-1 px-[0.375rem] py-0.5 bg-button-bg rounded-full"
-        >
-          <template v-if="project.client_side === 'optional' && project.server_side === 'optional'">
-            Client or server
-          </template>
-          <template
-            v-else-if="
-              (project.client_side === 'optional' || project.client_side === 'required') &&
-              (project.server_side === 'optional' || project.server_side === 'unsupported')
-            "
-          >
-            Client
-          </template>
-          <template
-            v-else-if="
-              (project.server_side === 'optional' || project.server_side === 'required') &&
-              (project.client_side === 'optional' || project.client_side === 'unsupported')
-            "
-          >
-            Server
-          </template>
-          <template
-            v-else-if="
-              project.client_side === 'unsupported' && project.server_side === 'unsupported'
-            "
-          >
-            Unsupported
-          </template>
-          <template
-            v-else-if="project.client_side === 'required' && project.server_side === 'required'"
-          >
-            Client and server
-          </template>
-        </div>
-        <div
-          v-for="tag in categories"
-          :key="tag"
-          class="text-sm font-semibold text-secondary flex gap-1 px-[0.375rem] py-0.5 bg-button-bg rounded-full"
-        >
-          {{ formatCategory(tag.name) }}
-        </div>
+      <div class="tags">
+        <Categories :categories="categories" :type="project.project_type">
+          <EnvironmentIndicator
+            :type-only="project.moderation"
+            :client-side="project.client_side"
+            :server-side="project.server_side"
+            :type="project.project_type"
+            :search="true"
+          />
+        </Categories>
      </div>
    </div>
-    <div class="flex flex-col gap-2 items-end shrink-0 ml-auto">
-      <div class="flex items-center gap-2">
-        <DownloadIcon class="shrink-0" />
-        <span>
-          {{ formatNumber(project.downloads) }}
-          <span class="text-secondary">downloads</span>
-        </span>
+    <div class="stats button-group">
+      <div v-if="featured" class="badge">
+        <StarIcon />
+        Featured
      </div>
-      <div class="flex items-center gap-2">
-        <HeartIcon class="shrink-0" />
-        <span>
-          {{ formatNumber(project.follows ?? project.followers) }}
-          <span class="text-secondary">followers</span>
-        </span>
+      <div class="badge">
+        <DownloadIcon />
+        {{ formatNumber(project.downloads) }}
      </div>
-      <div class="mt-auto relative">
-        <div class="absolute bottom-0 right-0 w-fit">
-          <ButtonStyled color="brand" type="outlined">
-            <button
-              :disabled="installed || installing"
-              class="shrink-0 no-wrap"
-              @click.stop="install()"
-            >
-              <template v-if="!installed">
-                <DownloadIcon v-if="modpack || instance" />
-                <PlusIcon v-else />
-              </template>
-              <CheckIcon v-else />
-              {{
-                installing
-                  ? 'Installing'
-                  : installed
-                    ? 'Installed'
-                    : modpack || instance
-                      ? 'Install'
-                      : 'Add to an instance'
-              }}
-            </button>
-          </ButtonStyled>
-        </div>
+      <div class="badge">
+        <HeartIcon />
+        {{ formatNumber(project.follows ?? project.followers) }}
+      </div>
+      <div class="badge">
+        <CalendarIcon />
+        {{ formatCategory(dayjs(project.date_modified ?? project.updated).fromNow()) }}
      </div>
    </div>
-  </div>
+    <div v-if="project.author" class="install">
+      <Button color="primary" :disabled="installed || installing" @click.stop="install()">
+        <DownloadIcon v-if="!installed" />
+        <CheckIcon v-else />
+        {{ installing ? 'Installing' : installed ? 'Installed' : 'Install' }}
+      </Button>
+    </div>
+  </Card>
 </template>

 <script setup>
-import { TagsIcon, DownloadIcon, HeartIcon, PlusIcon, CheckIcon } from '@modrinth/assets'
-import { ButtonStyled, Avatar } from '@modrinth/ui'
+import { DownloadIcon, HeartIcon, CalendarIcon, CheckIcon, StarIcon } from '@modrinth/assets'
+import { Avatar, Card, Categories, EnvironmentIndicator, Button } from '@modrinth/ui'
 import { formatNumber, formatCategory } from '@modrinth/utils'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { install as installVersion } from '@/store/install.js'
 dayjs.extend(relativeTime)

@@ -153,23 +99,99 @@ const props = defineProps({
  },
 })

-const emit = defineEmits(['open', 'install'])
+const emits = defineEmits(['open'])

 const installing = ref(false)
+const installed = ref(props.installed)

 async function install() {
  installing.value = true
  await installVersion(
-    props.project.project_id ?? props.project.id,
+    props.project.project_id,
    null,
    props.instance ? props.instance.path : null,
    'SearchCard',
-    () => {
+    (version) => {
      installing.value = false
-      emit('install', props.project.project_id ?? props.project.id)
+
+      if (props.instance && version) {
+        installed.value = true
+      }
    },
  )
 }
-
-const modpack = computed(() => props.project.project_type === 'modpack')
 </script>
+
+<style scoped lang="scss">
+.icon {
+  grid-column: 1;
+  grid-row: 1;
+  align-self: center;
+  height: 6rem;
+}
+
+.content-wrapper {
+  display: flex;
+  justify-content: space-between;
+  grid-column: 2 / 4;
+  flex-direction: column;
+  grid-row: 1;
+  gap: 0.5rem;
+
+  .description {
+    word-wrap: break-word;
+    overflow-wrap: anywhere;
+  }
+}
+
+.stats {
+  grid-column: 1 / 3;
+  grid-row: 2;
+  justify-self: stretch;
+  align-self: start;
+}
+
+.install {
+  grid-column: 3 / 4;
+  grid-row: 2;
+  justify-self: end;
+  align-self: start;
+}
+
+.card {
+  margin-bottom: 0;
+  display: grid;
+  grid-template-columns: 6rem auto 7rem;
+  gap: 0.75rem;
+  padding: 1rem;
+
+  &:active:not(&:disabled) {
+    scale: 0.98 !important;
+  }
+}
+
+.joined-text {
+  display: inline-flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  column-gap: 0.5rem;
+  align-items: baseline;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  h2 {
+    margin-bottom: 0 !important;
+    word-wrap: break-word;
+    overflow-wrap: anywhere;
+  }
+}
+
+.button-group {
+  display: inline-flex;
+  flex-direction: row;
+  gap: 0.5rem;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+</style>
--- a/apps/app-frontend/src/components/ui/SplashScreen.vue
+++ b/apps/app-frontend/src/components/ui/SplashScreen.vue
@@ -72,7 +72,7 @@
          </g>
        </g>
      </svg>
-      <ProgressBar class="loading-bar" :progress="Math.min(loadingProgress, 100)" />
+      <ProgressBar class="loading-bar" :progress="loadingProgress" />
      <span v-if="message">{{ message }}</span>
    </div>
    <div class="gradient-bg" data-tauri-drag-region></div>
@@ -86,7 +86,10 @@ import { ref, watch } from 'vue'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { loading_listener } from '@/helpers/events.js'
 import { getCurrentWindow } from '@tauri-apps/api/window'
-import { XIcon, MaximizeIcon, MinimizeIcon } from '@modrinth/assets'
+import { XIcon } from '@modrinth/assets'
+import { MaximizeIcon, MinimizeIcon } from '@/assets/icons/index.js'
+import { TauriEvent } from '@tauri-apps/api/event'
+import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
 import { getOS } from '@/helpers/utils.js'
 import { useLoading } from '@/store/loading.js'

@@ -130,12 +133,6 @@ loading_listener(async (e) => {
  if (e.event.type === 'directory_move') {
    loadingProgress.value = 100 * (e.fraction ?? 1)
    message.value = 'Updating app directory...'
-  } else if (e.event.type === 'launcher_update') {
-    loadingProgress.value = 100 * (e.fraction ?? 1)
-    message.value = 'Updating Modrinth App...'
-  } else if (e.event.type === 'checking_for_updates') {
-    loadingProgress.value = 100 * (e.fraction ?? 1)
-    message.value = 'Checking for updates...'
  }
 })

--- a/apps/app-frontend/src/components/ui/URLConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { Button } from '@modrinth/ui'
+import { Modal, Button } from '@modrinth/ui'
 import { ref } from 'vue'
 import SearchCard from '@/components/ui/SearchCard.vue'
 import { get_categories } from '@/helpers/tags.js'
 import { handleError } from '@/store/notifications.js'
 import { get_version, get_project } from '@/helpers/cache.js'
 import { install as installVersion } from '@/store/install.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'

 const confirmModal = ref(null)
 const project = ref(null)
@@ -42,7 +41,7 @@ async function install() {
 </script>

 <template>
-  <ModalWrapper ref="confirmModal" :header="`Install ${project?.title}`">
+  <Modal ref="confirmModal" :header="`Install ${project?.title}`">
    <div class="modal-body">
      <SearchCard
        :project="project"
@@ -61,7 +60,7 @@ async function install() {
        </div>
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <style scoped lang="scss">
@@ -71,6 +70,7 @@ async function install() {
  align-items: center;
  justify-content: center;
  gap: var(--gap-md);
+  padding: var(--gap-lg);
 }

 .button-row {
--- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -1,357 +0,0 @@
-<script setup lang="ts">
-import { Avatar, ButtonStyled, OverflowMenu } from '@modrinth/ui'
-import {
-  UserPlusIcon,
-  MoreVerticalIcon,
-  MailIcon,
-  SettingsIcon,
-  TrashIcon,
-  XIcon,
-} from '@modrinth/assets'
-import { ref, onUnmounted, watch, computed } from 'vue'
-import { friend_listener } from '@/helpers/events'
-import { friends, friend_statuses, add_friend, remove_friend } from '@/helpers/friends'
-import { get_user_many } from '@/helpers/cache'
-import { handleError } from '@/store/notifications.js'
-import ContextMenu from '@/components/ui/ContextMenu.vue'
-import type { Dayjs } from 'dayjs'
-import dayjs from 'dayjs'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-
-const props = defineProps<{
-  credentials: unknown | null
-  signIn: () => void2
-}>()
-
-const userCredentials = computed(() => props.credentials)
-
-const search = ref('')
-const manageFriendsModal = 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()
-}
-
-const friendOptions = ref()
-async function handleFriendOptions(args) {
-  switch (args.option) {
-    case 'remove-friend':
-      await removeFriend(args.item)
-      break
-  }
-}
-
-async function addFriend(friend: Friend) {
-  await add_friend(
-    friend.id === userCredentials.value.user_id ? friend.friend_id : friend.id,
-  ).catch(handleError)
-  await loadFriends()
-}
-
-async function removeFriend(friend: Friend) {
-  await remove_friend(
-    friend.id === userCredentials.value.user_id ? friend.friend_id : friend.id,
-  ).catch(handleError)
-  await loadFriends()
-}
-
-type Friend = {
-  id: string
-  friend_id: string | null
-  status: string | null
-  last_updated: Dayjs | null
-  created: Dayjs
-  username: string
-  accepted: boolean
-  online: boolean
-  avatar: string
-}
-
-const userFriends = ref<Friend[]>([])
-const acceptedFriends = computed(() =>
-  userFriends.value
-    .filter((x) => x.accepted)
-    .toSorted((a, b) => {
-      if (a.last_updated === null && b.last_updated === null) {
-        return 0 // Both are null, equal in sorting
-      }
-      if (a.last_updated === null) {
-        return 1 // `a` is null, move it after `b`
-      }
-      if (b.last_updated === null) {
-        return -1 // `b` is null, move it after `a`
-      }
-      // Both are non-null, sort by date
-      return b.last_updated.diff(a.last_updated)
-    }),
-)
-const pendingFriends = computed(() =>
-  userFriends.value.filter((x) => !x.accepted).toSorted((a, b) => b.created.diff(a.created)),
-)
-
-const loading = ref(true)
-async function loadFriends(timeout = false) {
-  loading.value = timeout
-
-  try {
-    const friendsList = await friends()
-
-    if (friendsList.length === 0) {
-      userFriends.value = []
-    } else {
-      const friendStatuses = await friend_statuses()
-      const users = await get_user_many(
-        friendsList.map((x) => (x.id === userCredentials.value.user_id ? x.friend_id : x.id)),
-      )
-
-      userFriends.value = friendsList.map((friend) => {
-        const user = users.find((x) => x.id === friend.id || x.id === friend.friend_id)
-        const status = friendStatuses.find(
-          (x) => x.user_id === friend.id || x.user_id === friend.friend_id,
-        )
-        return {
-          id: friend.id,
-          friend_id: friend.friend_id,
-          status: status?.profile_name,
-          last_updated: status && status.last_update ? dayjs(status.last_update) : null,
-          created: dayjs(friend.created),
-          avatar: user?.avatar_url,
-          username: user?.username,
-          online: !!status,
-          accepted: friend.accepted,
-        }
-      })
-    }
-
-    loading.value = false
-  } catch (e) {
-    console.error('Error loading friends', e)
-    if (timeout) {
-      setTimeout(() => loadFriends(), 15 * 1000)
-    }
-  }
-}
-
-watch(
-  userCredentials,
-  () => {
-    if (userCredentials.value === undefined) {
-      userFriends.value = []
-    } else if (userCredentials.value === null) {
-      userFriends.value = []
-      loading.value = false
-    } else {
-      loadFriends(true)
-    }
-  },
-  { immediate: true },
-)
-
-const unlisten = await friend_listener(() => loadFriends())
-onUnmounted(() => {
-  unlisten()
-})
-</script>
-
-<template>
-  <ModalWrapper ref="manageFriendsModal" header="Manage friends">
-    <p v-if="acceptedFriends.length === 0">Add friends to share what you're playing!</p>
-    <div v-else class="flex flex-col gap-4 min-w-[20rem]">
-      <input v-model="search" type="text" placeholder="Search friends..." class="w-full" />
-      <div
-        v-for="friend in acceptedFriends.filter(
-          (x) => !search || x.username.toLowerCase().includes(search),
-        )"
-        :key="friend.username"
-        class="flex gap-2 items-center"
-      >
-        <div class="relative">
-          <Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle />
-          <span
-            v-if="friend.online"
-            class="bottom-1 right-0 absolute w-3 h-3 bg-brand border-2 border-black border-solid rounded-full"
-          />
-        </div>
-        <div>{{ friend.username }}</div>
-        <div class="ml-auto">
-          <ButtonStyled>
-            <button @click="removeFriend(friend)">
-              <XIcon />
-              Remove
-            </button>
-          </ButtonStyled>
-        </div>
-      </div>
-    </div>
-  </ModalWrapper>
-  <ModalWrapper ref="friendInvitesModal" header="View friend requests">
-    <p v-if="pendingFriends.length === 0">You have no pending friend requests :C</p>
-    <div v-else class="flex flex-col gap-4">
-      <div v-for="friend in pendingFriends" :key="friend.username" class="flex gap-2">
-        <Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle />
-        <div class="flex flex-col gap-2">
-          <div>
-            <p class="m-0">
-              <template v-if="friend.id === userCredentials.user_id">
-                <span class="font-bold">{{ friend.username }}</span> sent you a friend request
-              </template>
-              <template v-else>
-                You sent <span class="font-bold">{{ friend.username }}</span> a friend request
-              </template>
-            </p>
-            <p class="m-0 text-sm text-secondary">{{ friend.created.fromNow() }}</p>
-          </div>
-          <div class="flex gap-2">
-            <template v-if="friend.id === userCredentials.user_id">
-              <ButtonStyled color="brand">
-                <button @click="addFriend(friend)">
-                  <UserPlusIcon />
-                  Accept
-                </button>
-              </ButtonStyled>
-              <ButtonStyled>
-                <button @click="removeFriend(friend)">
-                  <XIcon />
-                  Ignore
-                </button>
-              </ButtonStyled>
-            </template>
-            <template v-else>
-              <ButtonStyled>
-                <button @click="removeFriend(friend)">
-                  <XIcon />
-                  Cancel
-                </button>
-              </ButtonStyled>
-            </template>
-          </div>
-        </div>
-      </div>
-    </div>
-  </ModalWrapper>
-  <ModalWrapper ref="addFriendModal" header="Add a friend">
-    <div class="mb-4">
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Username</h2>
-      <p class="m-0 mt-1 leading-tight">You can add friends with their Modrinth username.</p>
-      <input v-model="username" class="mt-2 w-full" type="text" placeholder="Enter username..." />
-    </div>
-    <ButtonStyled color="brand">
-      <button :disabled="username.length === 0" @click="addFriendFromModal">
-        <UserPlusIcon />
-        Add friend
-      </button>
-    </ButtonStyled>
-  </ModalWrapper>
-  <div class="flex justify-between items-center">
-    <h3 class="text-lg m-0">Friends</h3>
-    <ButtonStyled v-if="userCredentials" type="transparent" circular>
-      <OverflowMenu
-        :options="[
-          {
-            id: 'add-friend',
-            action: () => addFriendModal.show(),
-          },
-          {
-            id: 'manage-friends',
-            action: () => manageFriendsModal.show(),
-            shown: acceptedFriends.length > 0,
-          },
-          {
-            id: 'view-requests',
-            action: () => friendInvitesModal.show(),
-            shown: pendingFriends.length > 0,
-          },
-        ]"
-        aria-label="More options"
-      >
-        <MoreVerticalIcon aria-hidden="true" />
-        <template #add-friend>
-          <UserPlusIcon aria-hidden="true" />
-          Add friend
-        </template>
-        <template #manage-friends>
-          <SettingsIcon aria-hidden="true" />
-          Manage friends
-          <div
-            v-if="acceptedFriends.length > 0"
-            class="bg-button-bg w-6 h-6 rounded-full flex items-center justify-center"
-          >
-            {{ acceptedFriends.length }}
-          </div>
-        </template>
-        <template #view-requests>
-          <MailIcon aria-hidden="true" />
-          View friend requests
-          <div
-            v-if="pendingFriends.length > 0"
-            class="bg-button-bg w-6 h-6 rounded-full flex items-center justify-center"
-          >
-            {{ pendingFriends.length }}
-          </div>
-        </template>
-      </OverflowMenu>
-    </ButtonStyled>
-  </div>
-  <div class="flex flex-col gap-2 mt-2">
-    <template v-if="loading">
-      <div v-for="n in 5" :key="n" class="flex gap-2 items-center animate-pulse">
-        <div class="min-w-9 min-h-9 bg-button-bg rounded-full"></div>
-        <div class="flex flex-col w-full">
-          <div class="h-3 bg-button-bg rounded-full w-1/2 mb-1"></div>
-          <div class="h-2.5 bg-button-bg rounded-full w-3/4"></div>
-        </div>
-      </div>
-    </template>
-    <template v-else-if="acceptedFriends.length === 0">
-      <div class="text-sm">
-        <div v-if="!userCredentials">
-          <span class="text-link cursor-pointer" @click="signIn">Sign in</span> to add friends!
-        </div>
-        <div v-else>
-          <span class="text-link cursor-pointer" @click="addFriendModal.show()">Add friends</span>
-          to share what you're playing!
-        </div>
-      </div>
-    </template>
-    <template v-else>
-      <ContextMenu ref="friendOptions" @option-clicked="handleFriendOptions">
-        <template #remove-friend> <TrashIcon /> Remove friend </template>
-      </ContextMenu>
-      <div
-        v-for="friend in acceptedFriends.slice(0, 5)"
-        :key="friend.username"
-        class="flex gap-2 items-center"
-        :class="{ grayscale: !friend.online }"
-        @contextmenu.prevent.stop="
-          (event) =>
-            friendOptions.showMenu(event, friend, [
-              {
-                name: 'remove-friend',
-                color: 'danger',
-              },
-            ])
-        "
-      >
-        <div class="relative">
-          <Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle />
-          <span
-            v-if="friend.online"
-            class="bottom-1 right-0 absolute w-3 h-3 bg-brand border-2 border-black border-solid rounded-full"
-          />
-        </div>
-        <div class="flex flex-col">
-          <span class="text-md m-0 font-medium" :class="{ 'text-secondary': !friend.online }">
-            {{ friend.username }}
-          </span>
-          <span v-if="friend.status" class="m-0 text-xs">{{ friend.status }}</span>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
@@ -1,5 +1,10 @@
 <template>
-  <ModalWrapper ref="incompatibleModal" header="Incompatibility warning" :on-hide="onInstall">
+  <Modal
+    ref="incompatibleModal"
+    header="Incompatibility warning"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
    <div class="modal-body">
      <p>
        This {{ versions?.length > 0 ? 'project' : 'version' }} is not compatible with the instance
@@ -7,43 +12,37 @@
        installed.
      </p>
      <table>
-        <thead>
-          <tr class="header">
-            <th>{{ instance?.name }}</th>
-            <th>{{ project.title }}</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr class="content">
-            <td class="data">{{ instance?.loader }} {{ instance?.game_version }}</td>
-            <td>
-              <multiselect
-                v-if="versions?.length > 1"
-                v-model="selectedVersion"
-                :options="versions"
-                :searchable="true"
-                placeholder="Select version"
-                open-direction="top"
-                :show-labels="false"
-                :custom-label="
-                  (version) =>
-                    `${version?.name} (${version?.loaders
-                      .map((name) => formatCategory(name))
-                      .join(', ')} - ${version?.game_versions.join(', ')})`
-                "
-                :max-height="150"
-              />
-              <span v-else>
-                <span>
-                  {{ selectedVersion?.name }} ({{
-                    selectedVersion?.loaders.map((name) => formatCategory(name)).join(', ')
-                  }}
-                  - {{ selectedVersion?.game_versions.join(', ') }})
-                </span>
+        <tr class="header">
+          <th>{{ instance?.name }}</th>
+          <th>{{ project.title }}</th>
+        </tr>
+        <tr class="content">
+          <td class="data">{{ instance?.loader }} {{ instance?.game_version }}</td>
+          <td>
+            <DropdownSelect
+              v-if="versions?.length > 1"
+              v-model="selectedVersion"
+              :options="versions"
+              placeholder="Select version"
+              name="Version select"
+              :display-name="
+                (version) =>
+                  `${version?.name} (${version?.loaders
+                    .map((name) => formatCategory(name))
+                    .join(', ')} - ${version?.game_versions.join(', ')})`
+              "
+              render-up
+            />
+            <span v-else>
+              <span>
+                {{ selectedVersion?.name }} ({{
+                  selectedVersion?.loaders.map((name) => formatCategory(name)).join(', ')
+                }}
+                - {{ selectedVersion?.game_versions.join(', ') }})
              </span>
-            </td>
-          </tr>
-        </tbody>
+            </span>
+          </td>
+        </tr>
      </table>
      <div class="button-group">
        <Button @click="() => incompatibleModal.hide()"><XIcon />Cancel</Button>
@@ -52,19 +51,19 @@
        </Button>
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <script setup>
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { XIcon, DownloadIcon } from '@modrinth/assets'
-import { Button } from '@modrinth/ui'
+import { Button, Modal, DropdownSelect } from '@modrinth/ui'
 import { formatCategory } from '@modrinth/utils'
 import { add_project_from_version as installMod } from '@/helpers/profile'
 import { ref } from 'vue'
-import { handleError } from '@/store/state.js'
+import { handleError, useTheming } from '@/store/state.js'
 import { trackEvent } from '@/helpers/analytics'
-import Multiselect from 'vue-multiselect'
+
+const themeStore = useTheming()

 const instance = ref(null)
 const project = ref(null)
@@ -73,7 +72,7 @@ const selectedVersion = ref(null)
 const incompatibleModal = ref(null)
 const installing = ref(false)

-const onInstall = ref(() => {})
+let onInstall = ref(() => {})

 defineExpose({
  show: (instanceVal, projectVal, projectVersions, callback) => {
@@ -158,6 +157,7 @@ td:first-child {
  display: flex;
  flex-direction: column;
  gap: 1rem;
+  padding: 1rem;

  :deep(.animated-dropdown .options) {
    max-height: 13.375rem;
--- a/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
@@ -1,18 +1,20 @@
 <script setup>
 import { XIcon, DownloadIcon } from '@modrinth/assets'
-import { Button } from '@modrinth/ui'
+import { Button, Modal } from '@modrinth/ui'
 import { install as pack_install } from '@/helpers/pack'
 import { ref } from 'vue'
 import { trackEvent } from '@/helpers/analytics'
+import { useTheming } from '@/store/theme.js'
 import { handleError } from '@/store/state.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+
+const themeStore = useTheming()

 const versionId = ref()
 const project = ref()
 const confirmModal = ref(null)
 const installing = ref(false)

-const onInstall = ref(() => {})
+let onInstall = ref(() => {})

 defineExpose({
  show: (projectVal, versionIdVal, callback) => {
@@ -50,7 +52,12 @@ async function install() {
 </script>

 <template>
-  <ModalWrapper ref="confirmModal" header="Are you sure?" :on-hide="onInstall">
+  <Modal
+    ref="confirmModal"
+    header="Are you sure?"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
    <div class="modal-body">
      <p>You already have this modpack installed. Are you sure you want to install it again?</p>
      <div class="input-group push-right">
@@ -60,7 +67,7 @@ async function install() {
        >
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <style lang="scss" scoped>
@@ -68,5 +75,6 @@ async function install() {
  display: flex;
  flex-direction: column;
  gap: 1rem;
+  padding: 1rem;
 }
 </style>
--- a/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
@@ -7,7 +7,7 @@ import {
  RightArrowIcon,
  CheckIcon,
 } from '@modrinth/assets'
-import { Avatar, Button, Card } from '@modrinth/ui'
+import { Avatar, Modal, Button, Card } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 import {
  add_project_from_version as installMod,
@@ -19,11 +19,12 @@ import {
 import { open } from '@tauri-apps/plugin-dialog'
 import { installVersionDependencies } from '@/store/install.js'
 import { handleError } from '@/store/notifications.js'
+import { useTheming } from '@/store/theme.js'
 import { useRouter } from 'vue-router'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'

+const themeStore = useTheming()
 const router = useRouter()

 const versions = ref()
@@ -48,7 +49,7 @@ const shownProfiles = computed(() =>
      return profile.name.toLowerCase().includes(searchFilter.value.toLowerCase())
    })
    .filter((profile) => {
-      const loaders = versions.value.flatMap((v) => v.loaders)
+      let loaders = versions.value.flatMap((v) => v.loaders)

      return (
        versions.value.flatMap((v) => v.game_versions).includes(profile.game_version) &&
@@ -59,7 +60,7 @@ const shownProfiles = computed(() =>
    }),
 )

-const onInstall = ref(() => {})
+let onInstall = ref(() => {})

 defineExpose({
  show: async (projectVal, versionsVal, callback) => {
@@ -77,7 +78,7 @@ defineExpose({
    onInstall.value = callback

    const profilesVal = await list().catch(handleError)
-    for (const profile of profilesVal) {
+    for (let profile of profilesVal) {
      profile.installing = false
      profile.installedMod = await check_installed(profile.path, project.value.id).catch(
        handleError,
@@ -141,7 +142,7 @@ const toggleCreation = () => {
 }

 const upload_icon = async () => {
-  const res = await open({
+  icon.value = await open({
    multiple: false,
    filters: [
      {
@@ -150,7 +151,6 @@ const upload_icon = async () => {
      },
    ],
  })
-  icon.value = res.path ?? res

  if (!icon.value) return
  display_icon.value = convertFileSrc(icon.value)
@@ -213,7 +213,12 @@ const createInstance = async () => {
 </script>

 <template>
-  <ModalWrapper ref="installModal" header="Install project to instance" :on-hide="onInstall">
+  <Modal
+    ref="installModal"
+    header="Install project to instance"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
    <div class="modal-body">
      <input
        v-model="searchFilter"
@@ -230,7 +235,7 @@ const createInstance = async () => {
            @click="installModal.hide()"
          >
            <Avatar
-              :src="profile.icon_path ? convertFileSrc(profile.icon_path) : null"
+              :src="profile.icon_path ? tauri.convertFileSrc(profile.icon_path) : null"
              class="profile-image"
            />
            {{ profile.name }}
@@ -243,7 +248,7 @@ const createInstance = async () => {
            "
          >
            <Button
-              :disabled="profile.installedMod || profile.installing"
+              :disabled="profile.installedMod || profile.installing || profile.linked_data?.locked"
              @click="install(profile)"
            >
              <DownloadIcon v-if="!profile.installedMod && !profile.installing" />
@@ -253,7 +258,9 @@ const createInstance = async () => {
                  ? 'Installing...'
                  : profile.installedMod
                    ? 'Installed'
-                    : 'Install'
+                    : profile.linked_data && profile.linked_data.locked
+                      ? 'Paired'
+                      : 'Install'
              }}
            </Button>
          </div>
@@ -297,7 +304,7 @@ const createInstance = async () => {
        <Button @click="installModal.hide()">Cancel</Button>
      </div>
    </div>
-  </ModalWrapper>
+  </Modal>
 </template>

 <style scoped lang="scss">
@@ -306,6 +313,7 @@ const createInstance = async () => {
  flex-direction: column;
  gap: 1rem;
  margin: 0;
+  padding: 1rem;
  background-color: var(--color-bg);
 }

@@ -357,7 +365,7 @@ const createInstance = async () => {
  display: flex;
  flex-direction: column;
  gap: 1rem;
-  min-width: 350px;
+  padding: 1rem;
 }

 .profiles {
@@ -378,6 +386,7 @@ const createInstance = async () => {
  flex-direction: row;
  justify-content: space-between;
  align-items: center;
+  padding: 0 0.5rem;
  gap: 0.5rem;

  img {
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
@@ -1,326 +0,0 @@
-<script setup lang="ts">
-import { convertFileSrc } from '@tauri-apps/api/core'
-import { SpinnerIcon, TrashIcon, UploadIcon, PlusIcon, EditIcon, CopyIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, OverflowMenu, Checkbox } from '@modrinth/ui'
-import { computed, ref, type Ref, watch } from 'vue'
-import { duplicate, edit, edit_icon, list, remove } from '@/helpers/profile'
-import { handleError } from '@/store/notifications'
-import { trackEvent } from '@/helpers/analytics'
-import { open } from '@tauri-apps/plugin-dialog'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { useRouter } from 'vue-router'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import type { InstanceSettingsTabProps, GameInstance } from '../../../helpers/types'
-
-const { formatMessage } = useVIntl()
-const router = useRouter()
-
-const deleteConfirmModal = ref()
-
-const props = defineProps<InstanceSettingsTabProps>()
-
-const title = ref(props.instance.name)
-const icon: Ref<string | undefined> = ref(props.instance.icon_path)
-const groups = ref(props.instance.groups)
-
-const newCategoryInput = ref('')
-
-const installing = computed(() => props.instance.install_stage !== 'installed')
-
-async function duplicateProfile() {
-  await duplicate(props.instance.path).catch(handleError)
-  trackEvent('InstanceDuplicate', {
-    loader: props.instance.loader,
-    game_version: props.instance.game_version,
-  })
-}
-
-const allInstances = ref((await list()) as GameInstance[])
-const availableGroups = computed(() => [
-  ...new Set([...allInstances.value.flatMap((instance) => instance.groups), ...groups.value]),
-])
-
-async function resetIcon() {
-  icon.value = undefined
-  await edit_icon(props.instance.path, null).catch(handleError)
-  trackEvent('InstanceRemoveIcon')
-}
-
-async function setIcon() {
-  const value = await open({
-    multiple: false,
-    filters: [
-      {
-        name: 'Image',
-        extensions: ['png', 'jpeg', 'svg', 'webp', 'gif', 'jpg'],
-      },
-    ],
-  })
-
-  if (!value) return
-
-  icon.value = value
-  await edit_icon(props.instance.path, icon.value).catch(handleError)
-
-  trackEvent('InstanceSetIcon')
-}
-
-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),
-}))
-
-const toggleGroup = (group: string) => {
-  if (groups.value.includes(group)) {
-    groups.value = groups.value.filter((x) => x !== group)
-  } else {
-    groups.value.push(group)
-  }
-}
-
-const addCategory = () => {
-  const text = newCategoryInput.value.trim()
-
-  if (text.length > 0) {
-    groups.value.push(text.substring(0, 32))
-    newCategoryInput.value = ''
-  }
-}
-
-watch(
-  [title, groups, groups],
-  async () => {
-    await edit(props.instance.path, editProfileObject.value)
-  },
-  { deep: true },
-)
-
-const removing = ref(false)
-async function removeProfile() {
-  removing.value = true
-  await remove(props.instance.path).catch(handleError)
-  removing.value = false
-
-  trackEvent('InstanceRemove', {
-    loader: props.instance.loader,
-    game_version: props.instance.game_version,
-  })
-
-  await router.push({ path: '/' })
-}
-
-const messages = defineMessages({
-  name: {
-    id: 'instance.settings.tabs.general.name',
-    defaultMessage: 'Name',
-  },
-  libraryGroups: {
-    id: 'instance.settings.tabs.general.library-groups',
-    defaultMessage: 'Library groups',
-  },
-  libraryGroupsDescription: {
-    id: 'instance.settings.tabs.general.library-groups.description',
-    defaultMessage:
-      'Library groups allow you to organize your instances into different sections in your library.',
-  },
-  libraryGroupsEnterName: {
-    id: 'instance.settings.tabs.general.library-groups.enter-name',
-    defaultMessage: 'Enter group name',
-  },
-  libraryGroupsCreate: {
-    id: 'instance.settings.tabs.general.library-groups.create',
-    defaultMessage: 'Create new group',
-  },
-  editIcon: {
-    id: 'instance.settings.tabs.general.edit-icon',
-    defaultMessage: 'Edit icon',
-  },
-  selectIcon: {
-    id: 'instance.settings.tabs.general.edit-icon.select',
-    defaultMessage: 'Select icon',
-  },
-  replaceIcon: {
-    id: 'instance.settings.tabs.general.edit-icon.replace',
-    defaultMessage: 'Replace icon',
-  },
-  removeIcon: {
-    id: 'instance.settings.tabs.general.edit-icon.remove',
-    defaultMessage: 'Remove icon',
-  },
-  duplicateInstance: {
-    id: 'instance.settings.tabs.general.duplicate-instance',
-    defaultMessage: 'Duplicate instance',
-  },
-  duplicateInstanceDescription: {
-    id: 'instance.settings.tabs.general.duplicate-instance.description',
-    defaultMessage: 'Creates a copy of this instance, including worlds, configs, mods, etc.',
-  },
-  duplicateButtonTooltipInstalling: {
-    id: 'instance.settings.tabs.general.duplicate-button.tooltip.installing',
-    defaultMessage: 'Cannot duplicate while installing.',
-  },
-  duplicateButton: {
-    id: 'instance.settings.tabs.general.duplicate-button',
-    defaultMessage: 'Duplicate',
-  },
-  deleteInstance: {
-    id: 'instance.settings.tabs.general.delete',
-    defaultMessage: 'Delete instance',
-  },
-  deleteInstanceDescription: {
-    id: 'instance.settings.tabs.general.delete.description',
-    defaultMessage:
-      'Permanently deletes an instance from your device, including your worlds, configs, and all installed content. Be careful, as once you delete a instance there is no way to recover it.',
-  },
-  deleteInstanceButton: {
-    id: 'instance.settings.tabs.general.delete.button',
-    defaultMessage: 'Delete instance',
-  },
-  deletingInstanceButton: {
-    id: 'instance.settings.tabs.general.deleting.button',
-    defaultMessage: 'Deleting...',
-  },
-})
-</script>
-
-<template>
-  <ConfirmModalWrapper
-    ref="deleteConfirmModal"
-    title="Are you sure you want to delete this instance?"
-    description="If you proceed, all data for your instance will be permanently erased, including your worlds. You will not be able to recover it."
-    :has-to-type="false"
-    proceed-label="Delete"
-    :show-ad-on-close="false"
-    @proceed="removeProfile"
-  />
-  <div class="block">
-    <div class="float-end ml-4 relative group">
-      <OverflowMenu
-        v-tooltip="formatMessage(messages.editIcon)"
-        class="bg-transparent border-none appearance-none p-0 m-0 cursor-pointer group-active:scale-95 transition-transform"
-        :options="[
-          {
-            id: 'select',
-            action: () => setIcon(),
-          },
-          {
-            id: 'remove',
-            color: 'danger',
-            action: () => resetIcon(),
-            shown: !!icon,
-          },
-        ]"
-      >
-        <Avatar
-          :src="icon ? convertFileSrc(icon) : icon"
-          size="108px"
-          class="!border-4 group-hover:brightness-75"
-          :tint-by="props.instance.path"
-          no-shadow
-        />
-        <div class="absolute top-0 right-0 m-2">
-          <div
-            class="p-2 m-0 text-primary flex items-center justify-center aspect-square bg-button-bg rounded-full border-button-border border-solid border-[1px] hovering-icon-shadow"
-          >
-            <EditIcon aria-hidden="true" class="h-4 w-4 text-primary" />
-          </div>
-        </div>
-        <template #select>
-          <UploadIcon />
-          {{ icon ? formatMessage(messages.replaceIcon) : formatMessage(messages.selectIcon) }}
-        </template>
-        <template #remove> <TrashIcon /> {{ formatMessage(messages.removeIcon) }} </template>
-      </OverflowMenu>
-    </div>
-    <label for="instance-name" class="m-0 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.name) }}
-    </label>
-    <div class="flex">
-      <input
-        id="instance-name"
-        v-model="title"
-        autocomplete="off"
-        maxlength="80"
-        class="flex-grow"
-        type="text"
-      />
-    </div>
-    <template v-if="instance.install_stage == 'installed'">
-      <div>
-        <h2
-          id="duplicate-instance-label"
-          class="m-0 mt-4 mb-1 text-lg font-extrabold text-contrast block"
-        >
-          {{ formatMessage(messages.duplicateInstance) }}
-        </h2>
-        <p class="m-0 mb-2">
-          {{ formatMessage(messages.duplicateInstanceDescription) }}
-        </p>
-      </div>
-      <ButtonStyled>
-        <button
-          v-tooltip="installing ? formatMessage(messages.duplicateButtonTooltipInstalling) : null"
-          aria-labelledby="duplicate-instance-label"
-          :disabled="installing"
-          @click="duplicateProfile"
-        >
-          <CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
-        </button>
-      </ButtonStyled>
-    </template>
-    <h2 class="m-0 mt-4 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.libraryGroups) }}
-    </h2>
-    <p class="m-0 mb-2">
-      {{ formatMessage(messages.libraryGroupsDescription) }}
-    </p>
-    <div class="flex flex-col gap-1">
-      <Checkbox
-        v-for="group in availableGroups"
-        :key="group"
-        :model-value="groups.includes(group)"
-        :label="group"
-        @click="toggleGroup(group)"
-      />
-      <div class="flex gap-2 items-center">
-        <input
-          v-model="newCategoryInput"
-          type="text"
-          :placeholder="formatMessage(messages.libraryGroupsEnterName)"
-          @submit="() => addCategory"
-        />
-        <ButtonStyled>
-          <button class="w-fit" @click="() => addCategory()">
-            <PlusIcon /> {{ formatMessage(messages.libraryGroupsCreate) }}
-          </button>
-        </ButtonStyled>
-      </div>
-    </div>
-    <h2 id="delete-instance-label" class="m-0 mt-4 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.deleteInstance) }}
-    </h2>
-    <p class="m-0 mb-2">
-      {{ formatMessage(messages.deleteInstanceDescription) }}
-    </p>
-    <ButtonStyled color="red">
-      <button
-        aria-labelledby="delete-instance-label"
-        :disabled="removing"
-        @click="deleteConfirmModal.show()"
-      >
-        <SpinnerIcon v-if="removing" class="animate-spin" />
-        <TrashIcon v-else />
-        {{
-          removing
-            ? formatMessage(messages.deletingInstanceButton)
-            : formatMessage(messages.deleteInstanceButton)
-        }}
-      </button>
-    </ButtonStyled>
-  </div>
-</template>
-<style scoped lang="scss">
-.hovering-icon-shadow {
-  box-shadow: var(--shadow-inset-sm), var(--shadow-raised);
-}
-</style>
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -1,153 +0,0 @@
-<script setup lang="ts">
-import { Checkbox } from '@modrinth/ui'
-import { computed, ref, watch } from 'vue'
-import { handleError } from '@/store/notifications'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get } from '@/helpers/settings'
-import { edit } from '@/helpers/profile'
-import type { InstanceSettingsTabProps, AppSettings, Hooks } from '../../../helpers/types'
-
-const { formatMessage } = useVIntl()
-
-const props = defineProps<InstanceSettingsTabProps>()
-
-const globalSettings = (await get().catch(handleError)) as AppSettings
-
-const overrideHooks = ref(
-  !!props.instance.hooks.pre_launch ||
-    !!props.instance.hooks.wrapper ||
-    !!props.instance.hooks.post_exit,
-)
-const hooks = ref(props.instance.hooks ?? globalSettings.hooks)
-
-const editProfileObject = computed(() => {
-  const editProfile: {
-    hooks?: Hooks
-  } = {}
-
-  if (overrideHooks.value) {
-    editProfile.hooks = hooks.value
-  }
-
-  return editProfile
-})
-
-watch(
-  [overrideHooks, hooks],
-  async () => {
-    await edit(props.instance.path, editProfileObject.value)
-  },
-  { deep: true },
-)
-const messages = defineMessages({
-  hooks: {
-    id: 'instance.settings.tabs.hooks.title',
-    defaultMessage: 'Game launch hooks',
-  },
-  hooksDescription: {
-    id: 'instance.settings.tabs.hooks.description',
-    defaultMessage:
-      'Hooks allow advanced users to run certain system commands before and after launching the game.',
-  },
-  customHooks: {
-    id: 'instance.settings.tabs.hooks.custom-hooks',
-    defaultMessage: 'Custom launch hooks',
-  },
-  preLaunch: {
-    id: 'instance.settings.tabs.hooks.pre-launch',
-    defaultMessage: 'Pre-launch',
-  },
-  preLaunchDescription: {
-    id: 'instance.settings.tabs.hooks.pre-launch.description',
-    defaultMessage: 'Ran before the instance is launched.',
-  },
-  preLaunchEnter: {
-    id: 'instance.settings.tabs.hooks.pre-launch.enter',
-    defaultMessage: 'Enter pre-launch command...',
-  },
-  wrapper: {
-    id: 'instance.settings.tabs.hooks.wrapper',
-    defaultMessage: 'Wrapper',
-  },
-  wrapperDescription: {
-    id: 'instance.settings.tabs.hooks.wrapper.description',
-    defaultMessage: 'Wrapper command for launching Minecraft.',
-  },
-  wrapperEnter: {
-    id: 'instance.settings.tabs.hooks.wrapper.enter',
-    defaultMessage: 'Enter wrapper command...',
-  },
-  postExit: {
-    id: 'instance.settings.tabs.hooks.post-exit',
-    defaultMessage: 'Post-exit',
-  },
-  postExitDescription: {
-    id: 'instance.settings.tabs.hooks.post-exit.description',
-    defaultMessage: 'Ran after the game closes.',
-  },
-  postExitEnter: {
-    id: 'instance.settings.tabs.hooks.post-exit.enter',
-    defaultMessage: 'Enter post-exit command...',
-  },
-})
-</script>
-
-<template>
-  <div>
-    <h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
-      {{ formatMessage(messages.hooks) }}
-    </h2>
-    <p class="m-0">
-      {{ formatMessage(messages.hooksDescription) }}
-    </p>
-    <Checkbox v-model="overrideHooks" :label="formatMessage(messages.customHooks)" class="mt-2" />
-
-    <h2 class="mt-2 mb-1 text-lg font-extrabold text-contrast">
-      {{ formatMessage(messages.preLaunch) }}
-    </h2>
-    <p class="m-0">
-      {{ formatMessage(messages.preLaunchDescription) }}
-    </p>
-    <input
-      id="pre-launch"
-      v-model="hooks.pre_launch"
-      autocomplete="off"
-      :disabled="!overrideHooks"
-      type="text"
-      :placeholder="formatMessage(messages.preLaunchEnter)"
-      class="w-full mt-2"
-    />
-
-    <h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast">
-      {{ formatMessage(messages.wrapper) }}
-    </h2>
-    <p class="m-0">
-      {{ formatMessage(messages.wrapperDescription) }}
-    </p>
-    <input
-      id="wrapper"
-      v-model="hooks.wrapper"
-      autocomplete="off"
-      :disabled="!overrideHooks"
-      type="text"
-      :placeholder="formatMessage(messages.wrapperEnter)"
-      class="w-full mt-2"
-    />
-
-    <h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast">
-      {{ formatMessage(messages.postExit) }}
-    </h2>
-    <p class="m-0">
-      {{ formatMessage(messages.postExitDescription) }}
-    </p>
-    <input
-      id="post-exit"
-      v-model="hooks.post_exit"
-      autocomplete="off"
-      :disabled="!overrideHooks"
-      type="text"
-      :placeholder="formatMessage(messages.postExitEnter)"
-      class="w-full mt-2"
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -1,789 +0,0 @@
-<script setup lang="ts">
-import {
-  TransferIcon,
-  IssuesIcon,
-  HammerIcon,
-  DownloadIcon,
-  WrenchIcon,
-  UndoIcon,
-  SpinnerIcon,
-  UnplugIcon,
-  UnlinkIcon,
-} from '@modrinth/assets'
-import { Avatar, Checkbox, Chips, ButtonStyled, TeleportDropdownMenu } from '@modrinth/ui'
-import { computed, type ComputedRef, type Ref, ref, shallowRef, watch } from 'vue'
-import { edit, install, update_repair_modrinth } from '@/helpers/profile'
-import { handleError } from '@/store/notifications'
-import { trackEvent } from '@/helpers/analytics'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get_loader_versions } from '@/helpers/metadata'
-import { get_game_versions, get_loaders } from '@/helpers/tags'
-import {
-  formatCategory,
-  type GameVersionTag,
-  type PlatformTag,
-  type Project,
-  type Version,
-} from '@modrinth/utils'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import { get_project, get_version_many } from '@/helpers/cache'
-import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
-import dayjs from 'dayjs'
-import type {
-  InstanceSettingsTabProps,
-  ManifestLoaderVersion,
-  Manifest,
-} from '../../../helpers/types'
-
-const { formatMessage } = useVIntl()
-
-const repairConfirmModal = ref()
-const modpackVersionModal = ref()
-const modalConfirmUnpair = ref()
-const modalConfirmReinstall = ref()
-
-const props = defineProps<InstanceSettingsTabProps>()
-
-const loader = ref(props.instance.loader)
-const gameVersion = ref(props.instance.game_version)
-
-const showSnapshots = ref(false)
-
-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 modpackProject: Ref<Project | null> = ref(null)
-const modpackVersion: Ref<Version | null> = ref(null)
-const modpackVersions: Ref<Version[] | null> = ref(null)
-const fetching = ref(true)
-
-if (props.instance.linked_data && props.instance.linked_data.project_id && !props.offline) {
-  get_project(props.instance.linked_data.project_id, 'must_revalidate')
-    .then((project) => {
-      modpackProject.value = project
-
-      if (project && project.versions) {
-        get_version_many(project.versions, 'must_revalidate')
-          .then((versions: Version[]) => {
-            modpackVersions.value = versions.sort((a, b) =>
-              dayjs(b.date_published).diff(dayjs(a.date_published)),
-            )
-            modpackVersion.value =
-              versions.find(
-                (version: Version) => version.id === props.instance.linked_data?.version_id,
-              ) ?? null
-          })
-          .catch(handleError)
-          .finally(() => {
-            fetching.value = false
-          })
-      }
-    })
-    .catch((err) => {
-      handleError(err)
-      fetching.value = false
-    })
-} else {
-  fetching.value = false
-}
-
-const currentLoaderIcon = computed(
-  () => loaders?.value.find((x) => x.name === props.instance.loader)?.icon,
-)
-
-const gameVersionsForLoader = computed(() => {
-  return all_game_versions?.value.filter((item) => {
-    if (loader.value === 'fabric') {
-      return !!fabric_versions?.value.gameVersions.some((x) => item.version === x.id)
-    } else if (loader.value === 'forge') {
-      return !!forge_versions?.value.gameVersions.some((x) => item.version === x.id)
-    } else if (loader.value === 'quilt') {
-      return !!quilt_versions?.value.gameVersions.some((x) => item.version === x.id)
-    } else if (loader.value === 'neoforge') {
-      return !!neoforge_versions?.value.gameVersions.some((x) => item.version === x.id)
-    }
-
-    return []
-  })
-})
-
-const hasSnapshots = computed(() =>
-  gameVersionsForLoader.value?.some((x) => x.version_type !== 'release'),
-)
-
-const selectableGameVersionNumbers = computed(() => {
-  return gameVersionsForLoader.value
-    ?.filter((x) => x.version_type === 'release' || showSnapshots.value)
-    .map((x) => x.version)
-})
-
-const selectableLoaderVersions: ComputedRef<ManifestLoaderVersion[] | undefined> = computed(() => {
-  if (gameVersion.value) {
-    if (loader.value === 'fabric') {
-      return fabric_versions?.value.gameVersions[0].loaders
-    } else if (loader.value === 'forge') {
-      return forge_versions?.value?.gameVersions?.find((item) => item.id === gameVersion.value)
-        ?.loaders
-    } else if (loader.value === 'quilt') {
-      return quilt_versions?.value.gameVersions[0].loaders
-    } else if (loader.value === 'neoforge') {
-      return neoforge_versions?.value?.gameVersions?.find((item) => item.id === gameVersion.value)
-        ?.loaders
-    }
-  }
-  return []
-})
-const loaderVersionIndex: Ref<number> = ref(-1)
-
-resetLoaderVersionIndex()
-
-function resetLoaderVersionIndex() {
-  loaderVersionIndex.value =
-    selectableLoaderVersions.value?.findIndex((x) => x.id === props.instance.loader_version) ?? -1
-}
-
-const isValid = computed(() => {
-  return (
-    selectableGameVersionNumbers.value?.includes(gameVersion.value) &&
-    ((loaderVersionIndex.value !== undefined && loaderVersionIndex.value >= 0) ||
-      loader.value === 'vanilla')
-  )
-})
-
-const isChanged = computed(() => {
-  return (
-    loader.value !== props.instance.loader ||
-    gameVersion.value !== props.instance.game_version ||
-    (loader.value !== 'vanilla' &&
-      loaderVersionIndex.value !== undefined &&
-      loaderVersionIndex.value >= 0 &&
-      selectableLoaderVersions.value?.[loaderVersionIndex.value].id !==
-        props.instance.loader_version)
-  )
-})
-
-watch(loader, () => {
-  loaderVersionIndex.value = 0
-})
-
-const editing = ref(false)
-
-async function saveGvLoaderEdits() {
-  editing.value = true
-
-  const editProfile: { loader?: string; game_version?: string; loader_version?: string } = {}
-  editProfile.loader = loader.value
-  editProfile.game_version = gameVersion.value
-
-  if (loader.value !== 'vanilla' && loaderVersionIndex.value !== undefined) {
-    editProfile.loader_version = selectableLoaderVersions.value?.[loaderVersionIndex.value].id
-  } else {
-    loaderVersionIndex.value = -1
-  }
-  console.log('Editing:')
-  console.log(loader.value)
-
-  await edit(props.instance.path, editProfile).catch(handleError)
-  await repairProfile(false)
-
-  editing.value = false
-}
-
-const installing = computed(() => props.instance.install_stage !== 'installed')
-const repairing = ref(false)
-const reinstalling = ref(false)
-const changingVersion = ref(false)
-
-async function repairProfile(force: boolean) {
-  if (force) {
-    repairing.value = true
-  }
-  await install(props.instance.path, force).catch(handleError)
-  if (force) {
-    repairing.value = false
-  }
-
-  trackEvent('InstanceRepair', {
-    loader: props.instance.loader,
-    game_version: props.instance.game_version,
-  })
-}
-
-async function unpairProfile() {
-  await edit(props.instance.path, {
-    linked_data: null,
-  })
-  modpackProject.value = null
-  modpackVersion.value = null
-  modpackVersions.value = null
-  modalConfirmUnpair.value.hide()
-}
-
-async function repairModpack() {
-  reinstalling.value = true
-  await update_repair_modrinth(props.instance.path).catch(handleError)
-  reinstalling.value = false
-
-  trackEvent('InstanceRepair', {
-    loader: props.instance.loader,
-    game_version: props.instance.game_version,
-  })
-}
-
-const messages = defineMessages({
-  cannotWhileInstalling: {
-    id: 'instance.settings.tabs.installation.tooltip.cannot-while-installing',
-    defaultMessage: 'Cannot {action} while installing',
-  },
-  cannotWhileOffline: {
-    id: 'instance.settings.tabs.installation.tooltip.cannot-while-offline',
-    defaultMessage: 'Cannot {action} while offline',
-  },
-  cannotWhileRepairing: {
-    id: 'instance.settings.tabs.installation.tooltip.cannot-while-repairing',
-    defaultMessage: 'Cannot {action} while repairing',
-  },
-  currentlyInstalled: {
-    id: 'instance.settings.tabs.installation.currently-installed',
-    defaultMessage: 'Currently installed',
-  },
-  platform: {
-    id: 'instance.settings.tabs.installation.platform',
-    defaultMessage: 'Platform',
-  },
-  gameVersion: {
-    id: 'instance.settings.tabs.installation.game-version',
-    defaultMessage: 'Game version',
-  },
-  loaderVersion: {
-    id: 'instance.settings.tabs.installation.loader-version',
-    defaultMessage: '{loader} version',
-  },
-  showAllVersions: {
-    id: 'instance.settings.tabs.installation.show-all-versions',
-    defaultMessage: 'Show all versions',
-  },
-  install: {
-    id: 'instance.settings.tabs.installation.install',
-    defaultMessage: 'Install',
-  },
-  resetSelections: {
-    id: 'instance.settings.tabs.installation.reset-selections',
-    defaultMessage: 'Reset to current',
-  },
-  unknownVersion: {
-    id: 'instance.settings.tabs.installation.unknown-version',
-    defaultMessage: '(unknown version)',
-  },
-  repairConfirmTitle: {
-    id: 'instance.settings.tabs.installation.repair.confirm.title',
-    defaultMessage: 'Repair instance?',
-  },
-  repairConfirmDescription: {
-    id: 'instance.settings.tabs.installation.repair.confirm.description',
-    defaultMessage:
-      'Repairing reinstalls Minecraft dependencies and checks for corruption. This may resolve issues if your game is not launching due to launcher-related errors, but will not resolve issues or crashes related to installed mods.',
-  },
-  repairButton: {
-    id: 'instance.settings.tabs.installation.repair.button',
-    defaultMessage: 'Repair',
-  },
-  repairingButton: {
-    id: 'instance.settings.tabs.installation.repair.button.repairing',
-    defaultMessage: 'Repairing',
-  },
-  repairInProgress: {
-    id: 'instance.settings.tabs.installation.repair.in-progress',
-    defaultMessage: 'Repair in progress',
-  },
-  repairAction: {
-    id: 'instance.settings.tabs.installation.tooltip.action.repair',
-    defaultMessage: 'repair',
-  },
-  changeVersionCannotWhileFetching: {
-    id: 'instance.settings.tabs.installation.change-version.cannot-while-fetching',
-    defaultMessage: 'Fetching modpack versions',
-  },
-  changeVersionButton: {
-    id: 'instance.settings.tabs.installation.change-version.button',
-    defaultMessage: 'Change version',
-  },
-  changeVersionAction: {
-    id: 'instance.settings.tabs.installation.tooltip.action.change-version',
-    defaultMessage: 'change version',
-  },
-  installingButton: {
-    id: 'instance.settings.tabs.installation.change-version.button.installing',
-    defaultMessage: 'Installing',
-  },
-  installInProgress: {
-    id: 'instance.settings.tabs.installation.install.in-progress',
-    defaultMessage: 'Installation in progress',
-  },
-  installButton: {
-    id: 'instance.settings.tabs.installation.change-version.button.install',
-    defaultMessage: 'Install',
-  },
-  alreadyInstalledVanilla: {
-    id: 'instance.settings.tabs.installation.change-version.already-installed.vanilla',
-    defaultMessage: 'Vanilla {game_version} already installed',
-  },
-  alreadyInstalledModded: {
-    id: 'instance.settings.tabs.installation.change-version.already-installed.modded',
-    defaultMessage: '{platform} {version} for Minecraft {game_version} already installed',
-  },
-  installAction: {
-    id: 'instance.settings.tabs.installation.tooltip.action.install',
-    defaultMessage: 'install',
-  },
-  installingNewVersion: {
-    id: 'instance.settings.tabs.installation.change-version.in-progress',
-    defaultMessage: 'Installing new version',
-  },
-  minecraftVersion: {
-    id: 'instance.settings.tabs.installation.minecraft-version',
-    defaultMessage: 'Minecraft {version}',
-  },
-  noLoaderVersions: {
-    id: 'instance.settings.tabs.installation.no-loader-versions',
-    defaultMessage: '{loader} is not available for Minecraft {version}. Try another mod loader.',
-  },
-  noConnection: {
-    id: 'instance.settings.tabs.installation.no-connection',
-    defaultMessage: 'Cannot fetch linked modpack details. Please check your internet connection.',
-  },
-  noModpackFound: {
-    id: 'instance.settings.tabs.installation.no-modpack-found',
-    defaultMessage:
-      'This instance is linked to a modpack, but the modpack could not be found on Modrinth.',
-  },
-  debugInformation: {
-    id: 'instance.settings.tabs.installation.debug-information',
-    defaultMessage: 'Debug information:',
-  },
-  fetchingModpackDetails: {
-    id: 'instance.settings.tabs.installation.fetching-modpack-details',
-    defaultMessage: 'Fetching modpack details',
-  },
-  unlinkInstanceTitle: {
-    id: 'instance.settings.tabs.installation.unlink.title',
-    defaultMessage: 'Unlink from modpack',
-  },
-  unlinkInstanceDescription: {
-    id: 'instance.settings.tabs.installation.unlink.description',
-    defaultMessage: `This instance is linked to a modpack, which means mods can't be updated and you can't change the mod loader or Minecraft version. Unlinking will permanently disconnect this instance from the modpack.`,
-  },
-  unlinkInstanceButton: {
-    id: 'instance.settings.tabs.installation.unlink.button',
-    defaultMessage: 'Unlink instance',
-  },
-  unlinkInstanceConfirmTitle: {
-    id: 'instance.settings.tabs.installation.unlink.confirm.title',
-    defaultMessage: 'Are you sure you want to unlink this instance?',
-  },
-  unlinkInstanceConfirmDescription: {
-    id: 'instance.settings.tabs.installation.unlink.confirm.description',
-    defaultMessage:
-      'If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal.',
-  },
-  reinstallModpackConfirmTitle: {
-    id: 'instance.settings.tabs.installation.reinstall.confirm.title',
-    defaultMessage: 'Are you sure you want to reinstall this instance?',
-  },
-  reinstallModpackConfirmDescription: {
-    id: 'instance.settings.tabs.installation.reinstall.confirm.description',
-    defaultMessage: `Reinstalling will reset all installed or modified content to what is provided by the modpack, removing any mods or content you have added on top of the original installation. This may fix unexpected behavior if changes have been made to the instance, but if your worlds now depend on additional installed content, it may break existing worlds.`,
-  },
-  reinstallModpackTitle: {
-    id: 'instance.settings.tabs.installation.reinstall.title',
-    defaultMessage: 'Reinstall modpack',
-  },
-  reinstallModpackDescription: {
-    id: 'instance.settings.tabs.installation.reinstall.description',
-    defaultMessage: `Resets the instance's content to its original state, removing any mods or content you have added on top of the original modpack.`,
-  },
-  reinstallModpackButton: {
-    id: 'instance.settings.tabs.installation.reinstall.button',
-    defaultMessage: 'Reinstall modpack',
-  },
-  reinstallingModpackButton: {
-    id: 'instance.settings.tabs.installation.reinstall.button.reinstalling',
-    defaultMessage: 'Reinstalling modpack',
-  },
-  reinstallAction: {
-    id: 'instance.settings.tabs.installation.tooltip.action.reinstall',
-    defaultMessage: 'reinstall',
-  },
-})
-</script>
-
-<template>
-  <ConfirmModalWrapper
-    ref="repairConfirmModal"
-    :title="formatMessage(messages.repairConfirmTitle)"
-    :description="formatMessage(messages.repairConfirmDescription)"
-    :proceed-icon="HammerIcon"
-    :proceed-label="formatMessage(messages.repairButton)"
-    :danger="false"
-    :show-ad-on-close="false"
-    @proceed="() => repairProfile(true)"
-  />
-  <ModpackVersionModal
-    v-if="instance.linked_data && modpackVersions"
-    ref="modpackVersionModal"
-    :instance="instance"
-    :versions="modpackVersions"
-    @finish-install="
-      () => {
-        changingVersion = false
-        modpackVersion =
-          modpackVersions?.find(
-            (version: Version) => version.id === props.instance.linked_data?.version_id,
-          ) ?? null
-      }
-    "
-  />
-  <ConfirmModalWrapper
-    ref="modalConfirmUnpair"
-    :title="formatMessage(messages.unlinkInstanceConfirmTitle)"
-    :description="formatMessage(messages.unlinkInstanceConfirmDescription)"
-    :proceed-icon="UnlinkIcon"
-    :proceed-label="formatMessage(messages.unlinkInstanceButton)"
-    :show-ad-on-close="false"
-    @proceed="() => unpairProfile()"
-  />
-  <ConfirmModalWrapper
-    ref="modalConfirmReinstall"
-    :title="formatMessage(messages.reinstallModpackConfirmTitle)"
-    :description="formatMessage(messages.reinstallModpackConfirmDescription)"
-    :proceed-icon="DownloadIcon"
-    :proceed-label="formatMessage(messages.reinstallModpackButton)"
-    :show-ad-on-close="false"
-    @proceed="() => repairModpack()"
-  />
-  <div>
-    <h2 id="project-name" class="m-0 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.currentlyInstalled) }}
-    </h2>
-    <div
-      v-if="!modpackProject && instance.linked_data && offline && !fetching"
-      class="text-secondary font-medium mb-2"
-    >
-      <UnplugIcon class="top-[3px] relative" /> {{ formatMessage(messages.noConnection) }}
-    </div>
-    <div v-else-if="!modpackProject && instance.linked_data && !fetching" class="mb-2">
-      <p class="text-brand-red font-medium mt-0">
-        <IssuesIcon class="top-[3px] relative" /> {{ formatMessage(messages.noModpackFound) }}
-      </p>
-      <p>{{ formatMessage(messages.debugInformation) }}</p>
-      <div class="bg-bg p-6 rounded-2xl mt-2 text-sm text-secondary">
-        {{ instance.linked_data }}
-      </div>
-    </div>
-    <div class="flex gap-4 items-center justify-between p-4 bg-bg rounded-2xl">
-      <div v-if="fetching" class="flex items-center gap-2 h-10">
-        <SpinnerIcon class="animate-spin" />
-        {{ formatMessage(messages.fetchingModpackDetails) }}
-      </div>
-      <template v-else>
-        <div class="flex gap-2 items-center">
-          <Avatar v-if="modpackProject" :src="modpackProject?.icon_url" size="40px" />
-          <div
-            v-else
-            class="w-10 h-10 flex items-center justify-center rounded-full bg-button-bg border-solid border-[1px] border-button-border p-2 [&_svg]:h-full [&_svg]:w-full"
-          >
-            <div v-if="!!currentLoaderIcon" class="contents" v-html="currentLoaderIcon" />
-            <WrenchIcon v-else />
-          </div>
-          <div class="flex flex-col gap-2 justify-center">
-            <span class="font-semibold leading-none">
-              {{
-                modpackProject
-                  ? modpackProject.title
-                  : formatMessage(messages.minecraftVersion, { version: instance.game_version })
-              }}
-            </span>
-            <span class="text-sm text-secondary leading-none">
-              {{
-                modpackProject
-                  ? modpackVersion
-                    ? modpackVersion?.version_number
-                    : 'Unknown version'
-                  : formatCategory(instance.loader)
-              }}
-              <template v-if="instance.loader !== 'vanilla' && !modpackProject">
-                {{ instance.loader_version || formatMessage(messages.unknownVersion) }}
-              </template>
-            </span>
-          </div>
-        </div>
-        <div class="flex gap-1">
-          <ButtonStyled color="orange" type="transparent" hover-color-fill="background">
-            <button
-              v-tooltip="
-                repairing
-                  ? formatMessage(messages.repairInProgress)
-                  : installing || reinstalling
-                    ? formatMessage(messages.cannotWhileInstalling, {
-                        action: formatMessage(messages.repairAction),
-                      })
-                    : offline
-                      ? formatMessage(messages.cannotWhileOffline, {
-                          action: formatMessage(messages.repairAction),
-                        })
-                      : null
-              "
-              :disabled="installing || repairing || reinstalling || offline"
-              @click="repairConfirmModal.show()"
-            >
-              <SpinnerIcon v-if="repairing" class="animate-spin" />
-              <HammerIcon v-else />
-              {{
-                repairing
-                  ? formatMessage(messages.repairingButton)
-                  : formatMessage(messages.repairButton)
-              }}
-            </button>
-          </ButtonStyled>
-          <ButtonStyled v-if="modpackProject" hover-color-fill="background">
-            <button
-              v-tooltip="
-                changingVersion
-                  ? formatMessage(messages.installingNewVersion)
-                  : repairing
-                    ? formatMessage(messages.cannotWhileRepairing, {
-                        action: formatMessage(messages.changeVersionAction),
-                      })
-                    : installing || reinstalling
-                      ? formatMessage(messages.cannotWhileInstalling, {
-                          action: formatMessage(messages.changeVersionAction),
-                        })
-                      : fetching && !modpackVersions
-                        ? formatMessage(messages.changeVersionCannotWhileFetching)
-                        : offline
-                          ? formatMessage(messages.cannotWhileOffline, {
-                              action: formatMessage(messages.changeVersionAction),
-                            })
-                          : null
-              "
-              :disabled="
-                changingVersion ||
-                repairing ||
-                installing ||
-                reinstalling ||
-                offline ||
-                fetching ||
-                !modpackVersions
-              "
-              @click="
-                () => {
-                  changingVersion = true
-                  modpackVersionModal.show()
-                }
-              "
-            >
-              <SpinnerIcon v-if="changingVersion" class="animate-spin" />
-              <TransferIcon v-else />
-              {{
-                changingVersion
-                  ? formatMessage(messages.installingButton)
-                  : formatMessage(messages.changeVersionButton)
-              }}
-            </button>
-          </ButtonStyled>
-        </div>
-      </template>
-    </div>
-    <template v-if="!instance.linked_data || !instance.linked_data.locked">
-      <h2 class="m-0 mt-4 text-lg font-extrabold text-contrast block">
-        {{ formatMessage(messages.platform) }}
-      </h2>
-      <Chips v-if="loaders" v-model="loader" :items="loaders.map((x) => x.name)" class="mt-2" />
-      <h2 class="m-0 mt-4 text-lg font-extrabold text-contrast block">
-        {{ formatMessage(messages.gameVersion) }}
-      </h2>
-      <div class="flex flex-wrap mt-2 gap-2">
-        <TeleportDropdownMenu
-          v-if="selectableGameVersionNumbers !== undefined"
-          v-model="gameVersion"
-          :options="selectableGameVersionNumbers"
-          name="Game Version Dropdown"
-        />
-        <Checkbox
-          v-if="hasSnapshots"
-          v-model="showSnapshots"
-          :label="formatMessage(messages.showAllVersions)"
-        />
-      </div>
-      <template v-if="loader !== 'vanilla'">
-        <h2 class="m-0 mt-4 text-lg font-extrabold text-contrast block">
-          {{ formatMessage(messages.loaderVersion, { loader: formatCategory(loader) }) }}
-        </h2>
-        <TeleportDropdownMenu
-          v-if="selectableLoaderVersions"
-          :model-value="selectableLoaderVersions[loaderVersionIndex]"
-          :options="selectableLoaderVersions"
-          :display-name="(option: ManifestLoaderVersion) => option?.id"
-          name="Version selector"
-          class="mt-2"
-          @change="(value) => (loaderVersionIndex = value.index)"
-        />
-        <div v-else class="mt-2 text-brand-red flex gap-2 items-center">
-          <IssuesIcon />
-          {{ formatMessage(messages.noLoaderVersions, { loader: loader, version: gameVersion }) }}
-        </div>
-      </template>
-      <div class="mt-4 flex flex-wrap gap-2">
-        <ButtonStyled color="brand">
-          <button
-            v-tooltip="
-              installing || reinstalling
-                ? formatMessage(messages.installInProgress)
-                : !isChanged
-                  ? formatMessage(
-                      loader === 'vanilla'
-                        ? messages.alreadyInstalledVanilla
-                        : messages.alreadyInstalledModded,
-                      {
-                        platform: formatCategory(loader),
-                        version: instance.loader_version,
-                        game_version: gameVersion,
-                      },
-                    )
-                  : repairing
-                    ? formatMessage(messages.cannotWhileRepairing, {
-                        action: formatMessage(messages.installAction),
-                      })
-                    : offline
-                      ? formatMessage(messages.cannotWhileOffline, {
-                          action: formatMessage(messages.installAction),
-                        })
-                      : null
-            "
-            :disabled="!isValid || !isChanged || editing || offline || repairing"
-            @click="saveGvLoaderEdits()"
-          >
-            <SpinnerIcon v-if="editing" class="animate-spin" />
-            <DownloadIcon v-else />
-            {{
-              editing
-                ? formatMessage(messages.installingButton)
-                : formatMessage(messages.installButton)
-            }}
-          </button>
-        </ButtonStyled>
-        <ButtonStyled>
-          <button
-            :disabled="!isChanged"
-            @click="
-              () => {
-                loader = instance.loader
-                gameVersion = instance.game_version
-                resetLoaderVersionIndex()
-              }
-            "
-          >
-            <UndoIcon />
-            {{ formatMessage(messages.resetSelections) }}
-          </button>
-        </ButtonStyled>
-      </div>
-    </template>
-    <template v-else>
-      <template v-if="instance.linked_data && instance.linked_data.locked">
-        <h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
-          {{ formatMessage(messages.unlinkInstanceTitle) }}
-        </h2>
-        <p class="m-0">
-          {{ formatMessage(messages.unlinkInstanceDescription) }}
-        </p>
-        <ButtonStyled>
-          <button class="mt-2" @click="modalConfirmUnpair.show()">
-            <UnlinkIcon /> {{ formatMessage(messages.unlinkInstanceButton) }}
-          </button>
-        </ButtonStyled>
-        <template v-if="modpackProject">
-          <div>
-            <h2 class="m-0 mb-1 text-lg font-extrabold text-contrast block mt-4">
-              {{ formatMessage(messages.reinstallModpackTitle) }}
-            </h2>
-            <p class="m-0">
-              {{ formatMessage(messages.reinstallModpackDescription) }}
-            </p>
-          </div>
-          <ButtonStyled color="red" type="outlined">
-            <button
-              v-tooltip="
-                reinstalling
-                  ? formatMessage(messages.reinstallingModpackButton)
-                  : repairing
-                    ? formatMessage(messages.cannotWhileRepairing, {
-                        action: formatMessage(messages.reinstallAction),
-                      })
-                    : installing
-                      ? formatMessage(messages.cannotWhileInstalling, {
-                          action: formatMessage(messages.reinstallAction),
-                        })
-                      : offline
-                        ? formatMessage(messages.cannotWhileOffline, {
-                            action: formatMessage(messages.reinstallAction),
-                          })
-                        : null
-              "
-              class="mt-2"
-              :disabled="
-                changingVersion ||
-                repairing ||
-                installing ||
-                offline ||
-                fetching ||
-                !modpackVersions
-              "
-              @click="modalConfirmReinstall.show()"
-            >
-              <SpinnerIcon v-if="reinstalling" class="animate-spin" />
-              <DownloadIcon v-else />
-              {{
-                reinstalling
-                  ? formatMessage(messages.reinstallingModpackButton)
-                  : formatMessage(messages.reinstallModpackButton)
-              }}
-            </button>
-          </ButtonStyled>
-        </template>
-      </template>
-    </template>
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -1,188 +0,0 @@
-<script setup lang="ts">
-import { Checkbox, Slider } from '@modrinth/ui'
-import { CheckCircleIcon, XCircleIcon } from '@modrinth/assets'
-import { computed, readonly, ref, watch } from 'vue'
-import { edit, get_optimal_jre_key } from '@/helpers/profile'
-import { handleError } from '@/store/notifications'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import JavaSelector from '@/components/ui/JavaSelector.vue'
-import { get_max_memory } from '@/helpers/jre'
-import { get } from '@/helpers/settings'
-import type { InstanceSettingsTabProps, AppSettings, MemorySettings } from '../../../helpers/types'
-
-const { formatMessage } = useVIntl()
-
-const props = defineProps<InstanceSettingsTabProps>()
-
-const globalSettings = (await get().catch(handleError)) as AppSettings
-
-const overrideJavaInstall = ref(!!props.instance.java_path)
-const optimalJava = readonly(await get_optimal_jre_key(props.instance.path).catch(handleError))
-const javaInstall = ref({ path: optimalJava.path ?? props.instance.java_path })
-
-const overrideJavaArgs = ref(props.instance.extra_launch_args?.length !== undefined)
-const javaArgs = ref(
-  (props.instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
-)
-
-const overrideEnvVars = ref(props.instance.custom_env_vars?.length !== undefined)
-const envVars = ref(
-  (props.instance.custom_env_vars ?? globalSettings.custom_env_vars)
-    .map((x) => x.join('='))
-    .join(' '),
-)
-
-const overrideMemorySettings = ref(!!props.instance.memory)
-const memory = ref(props.instance.memory ?? globalSettings.memory)
-const maxMemory = Math.floor((await get_max_memory().catch(handleError)) / 1024)
-
-const editProfileObject = computed(() => {
-  const editProfile: {
-    java_path?: string
-    extra_launch_args?: string[]
-    custom_env_vars?: string[][]
-    memory?: MemorySettings
-  } = {}
-
-  if (overrideJavaInstall.value) {
-    if (javaInstall.value.path !== '') {
-      editProfile.java_path = javaInstall.value.path.replace('java.exe', 'javaw.exe')
-    }
-  }
-
-  if (overrideJavaArgs.value) {
-    editProfile.extra_launch_args = javaArgs.value.trim().split(/\s+/).filter(Boolean)
-  }
-
-  if (overrideEnvVars.value) {
-    editProfile.custom_env_vars = envVars.value
-      .trim()
-      .split(/\s+/)
-      .filter(Boolean)
-      .map((x) => x.split('=').filter(Boolean))
-  }
-
-  if (overrideMemorySettings.value) {
-    editProfile.memory = memory.value
-  }
-
-  return editProfile
-})
-
-watch(
-  [
-    overrideJavaInstall,
-    javaInstall,
-    overrideJavaArgs,
-    javaArgs,
-    overrideEnvVars,
-    envVars,
-    overrideMemorySettings,
-    memory,
-  ],
-  async () => {
-    await edit(props.instance.path, editProfileObject.value)
-  },
-  { deep: true },
-)
-
-const messages = defineMessages({
-  javaInstallation: {
-    id: 'instance.settings.tabs.java.java-installation',
-    defaultMessage: 'Java installation',
-  },
-  javaArguments: {
-    id: 'instance.settings.tabs.java.java-arguments',
-    defaultMessage: 'Java arguments',
-  },
-  javaEnvironmentVariables: {
-    id: 'instance.settings.tabs.java.environment-variables',
-    defaultMessage: 'Environment variables',
-  },
-  javaMemory: {
-    id: 'instance.settings.tabs.java.java-memory',
-    defaultMessage: 'Memory allocated',
-  },
-  hooks: {
-    id: 'instance.settings.tabs.java.hooks',
-    defaultMessage: 'Hooks',
-  },
-})
-</script>
-
-<template>
-  <div>
-    <h2 id="project-name" class="m-0 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.javaInstallation) }}
-    </h2>
-    <Checkbox v-model="overrideJavaInstall" label="Custom Java installation" class="mb-2" />
-    <template v-if="!overrideJavaInstall">
-      <div class="flex my-2 items-center gap-2 font-semibold">
-        <template v-if="javaInstall">
-          <CheckCircleIcon class="text-brand-green h-4 w-4" />
-          <span>Using default Java {{ optimalJava.major_version }} installation:</span>
-        </template>
-        <template v-else-if="optimalJava">
-          <XCircleIcon class="text-brand-red h-5 w-5" />
-          <span
-            >Could not find a default Java {{ optimalJava.major_version }} installation. Please set
-            one below:</span
-          >
-        </template>
-        <template v-else>
-          <XCircleIcon class="text-brand-red h-5 w-5" />
-          <span
-            >Could not automatically determine a Java installation to use. Please set one
-            below:</span
-          >
-        </template>
-      </div>
-      <div
-        v-if="javaInstall && !overrideJavaInstall"
-        class="p-4 bg-bg rounded-xl text-xs text-secondary leading-none font-mono"
-      >
-        {{ javaInstall.path }}
-      </div>
-    </template>
-    <JavaSelector v-if="overrideJavaInstall || !javaInstall" v-model="javaInstall" />
-    <h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.javaMemory) }}
-    </h2>
-    <Checkbox v-model="overrideMemorySettings" label="Custom memory allocation" class="mb-2" />
-    <Slider
-      id="max-memory"
-      v-model="memory.maximum"
-      :disabled="!overrideMemorySettings"
-      :min="512"
-      :max="maxMemory"
-      :step="64"
-      unit="MB"
-    />
-    <h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.javaArguments) }}
-    </h2>
-    <Checkbox v-model="overrideJavaArgs" label="Custom java arguments" class="my-2" />
-    <input
-      id="java-args"
-      v-model="javaArgs"
-      autocomplete="off"
-      :disabled="!overrideJavaArgs"
-      type="text"
-      class="w-full"
-      placeholder="Enter java arguments..."
-    />
-    <h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
-      {{ formatMessage(messages.javaEnvironmentVariables) }}
-    </h2>
-    <Checkbox v-model="overrideEnvVars" label="Custom environment variables" class="mb-2" />
-    <input
-      id="env-vars"
-      v-model="envVars"
-      autocomplete="off"
-      :disabled="!overrideEnvVars"
-      type="text"
-      class="w-full"
-      placeholder="Enter environmental variables..."
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
@@ -1,165 +0,0 @@
-<script setup lang="ts">
-import { Checkbox, Toggle } from '@modrinth/ui'
-import { computed, ref, type Ref, watch } from 'vue'
-import { handleError } from '@/store/notifications'
-import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get } from '@/helpers/settings'
-import { edit } from '@/helpers/profile'
-import type { InstanceSettingsTabProps, AppSettings } from '../../../helpers/types'
-
-const { formatMessage } = useVIntl()
-
-const props = defineProps<InstanceSettingsTabProps>()
-
-const globalSettings = (await get().catch(handleError)) as AppSettings
-
-const overrideWindowSettings = ref(
-  !!props.instance.game_resolution || !!props.instance.force_fullscreen,
-)
-const resolution: Ref<[number, number]> = ref(
-  props.instance.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
-)
-const fullscreenSetting: Ref<boolean> = ref(
-  props.instance.force_fullscreen ?? globalSettings.force_fullscreen,
-)
-
-const editProfileObject = computed(() => {
-  const editProfile: {
-    force_fullscreen?: boolean
-    game_resolution?: [number, number]
-  } = {}
-
-  if (overrideWindowSettings.value) {
-    editProfile.force_fullscreen = fullscreenSetting.value
-
-    if (!fullscreenSetting.value) {
-      editProfile.game_resolution = resolution.value
-    }
-  }
-
-  return editProfile
-})
-
-watch(
-  [overrideWindowSettings, resolution, fullscreenSetting],
-  async () => {
-    await edit(props.instance.path, editProfileObject.value)
-  },
-  { deep: true },
-)
-
-const messages = defineMessages({
-  customWindowSettings: {
-    id: 'instance.settings.tabs.window.custom-window-settings',
-    defaultMessage: 'Custom window settings',
-  },
-  fullscreen: {
-    id: 'instance.settings.tabs.window.fullscreen',
-    defaultMessage: 'Fullscreen',
-  },
-  fullscreenDescription: {
-    id: 'instance.settings.tabs.window.fullscreen.description',
-    defaultMessage: 'Make the game start in full screen when launched (using options.txt).',
-  },
-  width: {
-    id: 'instance.settings.tabs.window.width',
-    defaultMessage: 'Width',
-  },
-  widthDescription: {
-    id: 'instance.settings.tabs.window.width.description',
-    defaultMessage: 'The width of the game window when launched.',
-  },
-  enterWidth: {
-    id: 'instance.settings.tabs.window.width.enter',
-    defaultMessage: 'Enter width...',
-  },
-  height: {
-    id: 'instance.settings.tabs.window.height',
-    defaultMessage: 'Height',
-  },
-  heightDescription: {
-    id: 'instance.settings.tabs.window.height.description',
-    defaultMessage: 'The height of the game window when launched.',
-  },
-  enterHeight: {
-    id: 'instance.settings.tabs.window.height.enter',
-    defaultMessage: 'Enter height...',
-  },
-})
-</script>
-
-<template>
-  <div>
-    <Checkbox
-      v-model="overrideWindowSettings"
-      :label="formatMessage(messages.customWindowSettings)"
-      @update:model-value="
-        (value) => {
-          if (!value) {
-            resolution = globalSettings.game_resolution
-            fullscreenSetting = globalSettings.force_fullscreen
-          }
-        }
-      "
-    />
-    <div class="mt-2 flex items-center gap-4 justify-between">
-      <div>
-        <h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
-          {{ formatMessage(messages.fullscreen) }}
-        </h2>
-        <p class="m-0">
-          {{ formatMessage(messages.fullscreenDescription) }}
-        </p>
-      </div>
-      <Toggle
-        id="fullscreen"
-        :model-value="overrideWindowSettings ? fullscreenSetting : globalSettings.force_fullscreen"
-        :checked="fullscreenSetting"
-        :disabled="!overrideWindowSettings"
-        @update:model-value="
-          (e) => {
-            fullscreenSetting = e
-          }
-        "
-      />
-    </div>
-
-    <div class="mt-4 flex items-center gap-4 justify-between">
-      <div>
-        <h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
-          {{ formatMessage(messages.width) }}
-        </h2>
-        <p class="m-0">
-          {{ formatMessage(messages.widthDescription) }}
-        </p>
-      </div>
-      <input
-        id="width"
-        v-model="resolution[0]"
-        autocomplete="off"
-        :disabled="!overrideWindowSettings || fullscreenSetting"
-        type="number"
-        :placeholder="formatMessage(messages.enterWidth)"
-      />
-    </div>
-
-    <div class="mt-4 flex items-center gap-4 justify-between">
-      <div>
-        <h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
-          {{ formatMessage(messages.height) }}
-        </h2>
-        <p class="m-0">
-          {{ formatMessage(messages.heightDescription) }}
-        </p>
-      </div>
-      <input
-        id="height"
-        v-model="resolution[1]"
-        autocomplete="off"
-        :disabled="!overrideWindowSettings || fullscreenSetting"
-        type="number"
-        :placeholder="formatMessage(messages.enterHeight)"
-      />
-    </div>
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -1,161 +0,0 @@
-<script setup lang="ts">
-import {
-  ReportIcon,
-  ModrinthIcon,
-  ShieldIcon,
-  SettingsIcon,
-  GaugeIcon,
-  PaintBrushIcon,
-  GameIcon,
-  CoffeeIcon,
-} from '@modrinth/assets'
-import { TabbedModal } from '@modrinth/ui'
-import { computed, ref, watch } from 'vue'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-import AppearanceSettings from '@/components/ui/settings/AppearanceSettings.vue'
-import JavaSettings from '@/components/ui/settings/JavaSettings.vue'
-import ResourceManagementSettings from '@/components/ui/settings/ResourceManagementSettings.vue'
-import PrivacySettings from '@/components/ui/settings/PrivacySettings.vue'
-import DefaultInstanceSettings from '@/components/ui/settings/DefaultInstanceSettings.vue'
-import { getVersion } from '@tauri-apps/api/app'
-import { version as getOsVersion, platform as getOsPlatform } from '@tauri-apps/plugin-os'
-import { useTheming } from '@/store/state'
-import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { get, set } from '@/helpers/settings'
-
-const themeStore = useTheming()
-
-const { formatMessage } = useVIntl()
-
-const devModeCounter = ref(0)
-
-const developerModeEnabled = defineMessage({
-  id: 'app.settings.developer-mode-enabled',
-  defaultMessage: 'Developer mode enabled.',
-})
-
-const tabs = [
-  {
-    name: defineMessage({
-      id: 'app.settings.tabs.appearance',
-      defaultMessage: 'Appearance',
-    }),
-    icon: PaintBrushIcon,
-    content: AppearanceSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'app.settings.tabs.privacy',
-      defaultMessage: 'Privacy',
-    }),
-    icon: ShieldIcon,
-    content: PrivacySettings,
-  },
-  {
-    name: defineMessage({
-      id: 'app.settings.tabs.java-installations',
-      defaultMessage: 'Java installations',
-    }),
-    icon: CoffeeIcon,
-    content: JavaSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'app.settings.tabs.default-instance-options',
-      defaultMessage: 'Default instance options',
-    }),
-    icon: GameIcon,
-    content: DefaultInstanceSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'app.settings.tabs.resource-management',
-      defaultMessage: 'Resource management',
-    }),
-    icon: GaugeIcon,
-    content: ResourceManagementSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'app.settings.tabs.feature-flags',
-      defaultMessage: 'Feature flags',
-    }),
-    icon: ReportIcon,
-    content: FeatureFlagSettings,
-    developerOnly: true,
-  },
-]
-
-const modal = ref()
-
-function show() {
-  modal.value.show()
-}
-
-const isOpen = computed(() => modal.value?.isOpen)
-
-defineExpose({ show, isOpen })
-
-const version = await getVersion()
-const osPlatform = getOsPlatform()
-const osVersion = getOsVersion()
-const settings = ref(await get())
-
-watch(
-  settings,
-  async () => {
-    await set(settings.value)
-  },
-  { deep: true },
-)
-
-function devModeCount() {
-  devModeCounter.value++
-  if (devModeCounter.value > 5) {
-    themeStore.devMode = !themeStore.devMode
-    settings.value.developer_mode = !!themeStore.devMode
-    devModeCounter.value = 0
-
-    if (!themeStore.devMode && tabs[modal.value.selectedTab].developerOnly) {
-      modal.value.setTab(0)
-    }
-  }
-}
-</script>
-<template>
-  <ModalWrapper ref="modal">
-    <template #title>
-      <span class="flex items-center gap-2 text-lg font-extrabold text-contrast">
-        <SettingsIcon /> Settings
-      </span>
-    </template>
-
-    <TabbedModal :tabs="tabs.filter((t) => !t.developerOnly || themeStore.devMode)">
-      <template #footer>
-        <div class="mt-auto text-secondary text-sm">
-          <p v-if="themeStore.devMode" class="text-brand font-semibold m-0 mb-2">
-            {{ formatMessage(developerModeEnabled) }}
-          </p>
-          <div class="flex items-center gap-3">
-            <button
-              class="p-0 m-0 bg-transparent border-none cursor-pointer button-animation"
-              :class="{ 'text-brand': themeStore.devMode, 'text-secondary': !themeStore.devMode }"
-              @click="devModeCount"
-            >
-              <ModrinthIcon class="w-6 h-6" />
-            </button>
-            <div>
-              <p class="m-0">Modrinth App {{ version }}</p>
-              <p class="m-0">
-                <span v-if="osPlatform === 'macos'">MacOS</span>
-                <span v-else class="capitalize">{{ osPlatform }}</span>
-                {{ osVersion }}
-              </p>
-            </div>
-          </div>
-        </div>
-      </template>
-    </TabbedModal>
-  </ModalWrapper>
-</template>
--- a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
@@ -1,85 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { ConfirmModal } from '@modrinth/ui'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.js'
-
-const themeStore = useTheming()
-
-const props = defineProps({
-  confirmationText: {
-    type: String,
-    default: '',
-  },
-  hasToType: {
-    type: Boolean,
-    default: false,
-  },
-  title: {
-    type: String,
-    default: 'No title defined',
-    required: true,
-  },
-  description: {
-    type: String,
-    default: 'No description defined',
-    required: true,
-  },
-  proceedIcon: {
-    type: Object,
-    default: undefined,
-  },
-  proceedLabel: {
-    type: String,
-    default: 'Proceed',
-  },
-  danger: {
-    type: Boolean,
-    default: true,
-  },
-  showAdOnClose: {
-    type: Boolean,
-    default: true,
-  },
-})
-
-const emit = defineEmits(['proceed'])
-const modal = ref(null)
-
-defineExpose({
-  show: () => {
-    hide_ads_window()
-    modal.value.show()
-  },
-  hide: () => {
-    onModalHide()
-    modal.value.hide()
-  },
-})
-
-function onModalHide() {
-  if (props.showAdOnClose) {
-    show_ads_window()
-  }
-}
-
-function proceed() {
-  emit('proceed')
-}
-</script>
-
-<template>
-  <ConfirmModal
-    ref="modal"
-    :confirmation-text="confirmationText"
-    :has-to-type="hasToType"
-    :title="title"
-    :description="description"
-    :proceed-icon="proceedIcon"
-    :proceed-label="proceedLabel"
-    :on-hide="onModalHide"
-    :noblur="!themeStore.advancedRendering"
-    :danger="danger"
-    @proceed="proceed"
-  />
-</template>
--- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
@@ -1,98 +0,0 @@
-<script setup lang="ts">
-import {
-  ChevronRightIcon,
-  CoffeeIcon,
-  InfoIcon,
-  WrenchIcon,
-  MonitorIcon,
-  CodeIcon,
-} from '@modrinth/assets'
-import { Avatar, TabbedModal, type TabbedModalTab } from '@modrinth/ui'
-import { ref } from 'vue'
-import { defineMessage, useVIntl } from '@vintl/vintl'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import GeneralSettings from '@/components/ui/instance_settings/GeneralSettings.vue'
-import { convertFileSrc } from '@tauri-apps/api/core'
-import InstallationSettings from '@/components/ui/instance_settings/InstallationSettings.vue'
-import JavaSettings from '@/components/ui/instance_settings/JavaSettings.vue'
-import WindowSettings from '@/components/ui/instance_settings/WindowSettings.vue'
-import HooksSettings from '@/components/ui/instance_settings/HooksSettings.vue'
-import type { InstanceSettingsTabProps } from '../../../helpers/types'
-
-const { formatMessage } = useVIntl()
-
-const props = defineProps<InstanceSettingsTabProps>()
-
-const tabs: TabbedModalTab<InstanceSettingsTabProps>[] = [
-  {
-    name: defineMessage({
-      id: 'instance.settings.tabs.general',
-      defaultMessage: 'General',
-    }),
-    icon: InfoIcon,
-    content: GeneralSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'instance.settings.tabs.installation',
-      defaultMessage: 'Installation',
-    }),
-    icon: WrenchIcon,
-    content: InstallationSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'instance.settings.tabs.window',
-      defaultMessage: 'Window',
-    }),
-    icon: MonitorIcon,
-    content: WindowSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'instance.settings.tabs.java',
-      defaultMessage: 'Java and memory',
-    }),
-    icon: CoffeeIcon,
-    content: JavaSettings,
-  },
-  {
-    name: defineMessage({
-      id: 'instance.settings.tabs.hooks',
-      defaultMessage: 'Launch hooks',
-    }),
-    icon: CodeIcon,
-    content: HooksSettings,
-  },
-]
-
-const modal = ref()
-
-function show() {
-  modal.value.show()
-}
-
-defineExpose({ show })
-
-const titleMessage = defineMessage({
-  id: 'instance.settings.title',
-  defaultMessage: 'Settings',
-})
-</script>
-<template>
-  <ModalWrapper ref="modal">
-    <template #title>
-      <span class="flex items-center gap-2 text-lg font-semibold text-primary">
-        <Avatar
-          :src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
-          size="24px"
-          :tint-by="props.instance.path"
-        />
-        {{ instance.name }} <ChevronRightIcon />
-        <span class="font-extrabold text-contrast">{{ formatMessage(titleMessage) }}</span>
-      </span>
-    </template>
-
-    <TabbedModal :tabs="tabs.map((tab) => ({ ...tab, props }))" />
-  </ModalWrapper>
-</template>
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -1,57 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { NewModal as Modal } from '@modrinth/ui'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.js'
-
-const themeStore = useTheming()
-
-const props = defineProps({
-  header: {
-    type: String,
-    default: null,
-  },
-  closable: {
-    type: Boolean,
-    default: true,
-  },
-  onHide: {
-    type: Function,
-    default() {
-      return () => {}
-    },
-  },
-  showAdOnClose: {
-    type: Boolean,
-    default: true,
-  },
-})
-const modal = ref(null)
-
-defineExpose({
-  show: () => {
-    hide_ads_window()
-    modal.value.show()
-  },
-  hide: () => {
-    onModalHide()
-    modal.value.hide()
-  },
-})
-
-function onModalHide() {
-  if (props.showAdOnClose) {
-    show_ads_window()
-  }
-  props.onHide()
-}
-</script>
-
-<template>
-  <Modal ref="modal" :header="header" :noblur="!themeStore.advancedRendering" @hide="onModalHide">
-    <template #title>
-      <slot name="title" />
-    </template>
-    <slot />
-  </Modal>
-</template>
--- a/apps/app-frontend/src/components/ui/modal/ShareModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ShareModalWrapper.vue
@@ -1,61 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { ShareModal } from '@modrinth/ui'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.js'
-
-const themeStore = useTheming()
-
-defineProps({
-  header: {
-    type: String,
-    default: 'Share',
-  },
-  shareTitle: {
-    type: String,
-    default: 'Modrinth',
-  },
-  shareText: {
-    type: String,
-    default: null,
-  },
-  link: {
-    type: Boolean,
-    default: false,
-  },
-  openInNewTab: {
-    type: Boolean,
-    default: true,
-  },
-})
-
-const modal = ref(null)
-
-defineExpose({
-  show: (passedContent) => {
-    hide_ads_window()
-    modal.value.show(passedContent)
-  },
-  hide: () => {
-    onModalHide()
-    modal.value.hide()
-  },
-})
-
-function onModalHide() {
-  show_ads_window()
-}
-</script>
-
-<template>
-  <ShareModal
-    ref="modal"
-    :header="header"
-    :share-title="shareTitle"
-    :share-text="shareText"
-    :link="link"
-    :open-in-new-tab="openInNewTab"
-    :on-hide="onModalHide"
-    :noblur="!themeStore.advancedRendering"
-  />
-</template>
--- a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
@@ -1,123 +0,0 @@
-<script setup lang="ts">
-import { Toggle, ThemeSelector, TeleportDropdownMenu } from '@modrinth/ui'
-import { useTheming } from '@/store/state'
-import { get, set } from '@/helpers/settings'
-import { watch, ref } from 'vue'
-import { getOS } from '@/helpers/utils'
-
-const themeStore = useTheming()
-
-const os = ref(await getOS())
-const settings = ref(await get())
-
-watch(
-  settings,
-  async () => {
-    await set(settings.value)
-  },
-  { deep: true },
-)
-</script>
-<template>
-  <h2 class="m-0 text-lg font-extrabold text-contrast">Color theme</h2>
-  <p class="m-0 mt-1">Select your preferred color theme for Modrinth App.</p>
-
-  <ThemeSelector
-    :update-color-theme="
-      (theme) => {
-        themeStore.setThemeState(theme)
-        settings.theme = theme
-      }
-    "
-    :current-theme="settings.theme"
-    :theme-options="themeStore.themeOptions"
-    system-theme-color="system"
-  />
-
-  <div class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Advanced rendering</h2>
-      <p class="m-0 mt-1">
-        Enables advanced rendering such as blur effects that may cause performance issues without
-        hardware-accelerated rendering.
-      </p>
-    </div>
-
-    <Toggle
-      id="advanced-rendering"
-      :model-value="themeStore.advancedRendering"
-      :checked="themeStore.advancedRendering"
-      @update:model-value="
-        (e) => {
-          themeStore.advancedRendering = e
-          settings.advanced_rendering = themeStore.advancedRendering
-        }
-      "
-    />
-  </div>
-
-  <div v-if="os !== 'MacOS'" class="mt-4 flex items-center justify-between gap-4">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Native Decorations</h2>
-      <p class="m-0 mt-1">Use system window frame (app restart required).</p>
-    </div>
-    <Toggle
-      id="native-decorations"
-      :model-value="settings.native_decorations"
-      :checked="settings.native_decorations"
-      @update:model-value="
-        (e) => {
-          settings.native_decorations = e
-        }
-      "
-    />
-  </div>
-
-  <div class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Minimize launcher</h2>
-      <p class="m-0 mt-1">Minimize the launcher when a Minecraft process starts.</p>
-    </div>
-    <Toggle
-      id="minimize-launcher"
-      :model-value="settings.hide_on_process_start"
-      :checked="settings.hide_on_process_start"
-      @update:model-value="
-        (e) => {
-          settings.hide_on_process_start = e
-        }
-      "
-    />
-  </div>
-
-  <div class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Default landing page</h2>
-      <p class="m-0 mt-1">Change the page to which the launcher opens on.</p>
-    </div>
-    <TeleportDropdownMenu
-      id="opening-page"
-      v-model="settings.default_page"
-      name="Opening page dropdown"
-      :options="['Home', 'Library']"
-    />
-  </div>
-
-  <div class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Toggle sidebar</h2>
-      <p class="m-0 mt-1">Enables the ability to toggle the sidebar.</p>
-    </div>
-    <Toggle
-      id="toggle-sidebar"
-      :model-value="settings.toggle_sidebar"
-      :checked="settings.toggle_sidebar"
-      @update:model-value="
-        (e) => {
-          settings.toggle_sidebar = e
-          themeStore.toggleSidebar = settings.toggle_sidebar
-        }
-      "
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
@@ -1,181 +0,0 @@
-<script setup lang="ts">
-import { get, set } from '@/helpers/settings'
-import { ref, watch } from 'vue'
-import { get_max_memory } from '@/helpers/jre'
-import { handleError } from '@/store/notifications'
-import { Slider, Toggle } from '@modrinth/ui'
-
-const fetchSettings = await get()
-fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
-fetchSettings.envVars = fetchSettings.custom_env_vars.map((x) => x.join('=')).join(' ')
-
-const settings = ref(fetchSettings)
-
-const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
-
-watch(
-  settings,
-  async () => {
-    const setSettings = JSON.parse(JSON.stringify(settings.value))
-
-    setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
-    setSettings.custom_env_vars = setSettings.envVars
-      .trim()
-      .split(/\s+/)
-      .filter(Boolean)
-      .map((x) => x.split('=').filter(Boolean))
-
-    if (!setSettings.hooks.pre_launch) {
-      setSettings.hooks.pre_launch = null
-    }
-    if (!setSettings.hooks.wrapper) {
-      setSettings.hooks.wrapper = null
-    }
-    if (!setSettings.hooks.post_exit) {
-      setSettings.hooks.post_exit = null
-    }
-
-    if (!setSettings.custom_dir) {
-      setSettings.custom_dir = null
-    }
-
-    await set(setSettings)
-  },
-  { deep: true },
-)
-</script>
-
-<template>
-  <div>
-    <h2 class="m-0 text-lg font-extrabold text-contrast">Window size</h2>
-
-    <div class="flex items-center justify-between gap-4">
-      <div>
-        <h3 class="mt-2 m-0 text-base font-extrabold text-primary">Fullscreen</h3>
-        <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-          Overwrites the options.txt file to start in full screen when launched.
-        </p>
-      </div>
-
-      <Toggle
-        id="fullscreen"
-        :model-value="settings.force_fullscreen"
-        :checked="settings.force_fullscreen"
-        @update:model-value="
-          (e) => {
-            settings.force_fullscreen = e
-          }
-        "
-      />
-    </div>
-
-    <div class="flex items-center justify-between gap-4">
-      <div>
-        <h3 class="mt-2 m-0 text-base font-extrabold text-primary">Width</h3>
-        <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-          The width of the game window when launched.
-        </p>
-      </div>
-
-      <input
-        id="width"
-        v-model="settings.game_resolution[0]"
-        :disabled="settings.force_fullscreen"
-        autocomplete="off"
-        type="number"
-        placeholder="Enter width..."
-      />
-    </div>
-
-    <div class="flex items-center justify-between gap-4">
-      <div>
-        <h3 class="mt-2 m-0 text-base font-extrabold text-primary">Height</h3>
-        <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-          The height of the game window when launched.
-        </p>
-      </div>
-
-      <input
-        id="height"
-        v-model="settings.game_resolution[1]"
-        :disabled="settings.force_fullscreen"
-        autocomplete="off"
-        type="number"
-        class="input"
-        placeholder="Enter height..."
-      />
-    </div>
-
-    <hr class="mt-4 bg-button-border border-none h-[1px]" />
-
-    <h2 class="mt-4 m-0 text-lg font-extrabold text-contrast">Memory allocated</h2>
-    <p class="m-0 mt-1 leading-tight">The memory allocated to each instance when it is ran.</p>
-    <Slider
-      id="max-memory"
-      v-model="settings.memory.maximum"
-      :min="512"
-      :max="maxMemory"
-      :step="64"
-      unit="MB"
-    />
-
-    <h2 class="mt-4 mb-2 text-lg font-extrabold text-contrast">Java arguments</h2>
-    <input
-      id="java-args"
-      v-model="settings.launchArgs"
-      autocomplete="off"
-      type="text"
-      placeholder="Enter java arguments..."
-      class="w-full"
-    />
-
-    <h2 class="mt-4 mb-2 text-lg font-extrabold text-contrast">Environmental variables</h2>
-    <input
-      id="env-vars"
-      v-model="settings.envVars"
-      autocomplete="off"
-      type="text"
-      placeholder="Enter environmental variables..."
-      class="w-full"
-    />
-
-    <hr class="mt-4 bg-button-border border-none h-[1px]" />
-
-    <h2 class="mt-4 m-0 text-lg font-extrabold text-contrast">Hooks</h2>
-
-    <h3 class="mt-2 m-0 text-base font-extrabold text-primary">Pre launch</h3>
-    <p class="m-0 mt-1 mb-2 leading-tight text-secondary">Ran before the instance is launched.</p>
-    <input
-      id="pre-launch"
-      v-model="settings.hooks.pre_launch"
-      autocomplete="off"
-      type="text"
-      placeholder="Enter pre-launch command..."
-      class="w-full"
-    />
-
-    <h3 class="mt-2 m-0 text-base font-extrabold text-primary">Wrapper</h3>
-    <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-      Wrapper command for launching Minecraft.
-    </p>
-    <input
-      id="wrapper"
-      v-model="settings.hooks.wrapper"
-      autocomplete="off"
-      type="text"
-      placeholder="Enter wrapper command..."
-      class="w-full"
-    />
-
-    <h3 class="mt-2 m-0 text-base font-extrabold text-primary">Post exit</h3>
-    <p class="m-0 mt-1 mb-2 leading-tight text-secondary">Ran after the game closes.</p>
-    <input
-      id="post-exit"
-      v-model="settings.hooks.post_exit"
-      autocomplete="off"
-      type="text"
-      placeholder="Enter post-exit command..."
-      class="w-full"
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
@@ -1,44 +0,0 @@
-<script setup lang="ts">
-import { Toggle } from '@modrinth/ui'
-import { useTheming } from '@/store/state'
-import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings'
-
-const themeStore = useTheming()
-
-const settings = ref(await get())
-const options = ref(['project_background', 'page_path'])
-
-function getStoreValue(key: string) {
-  return themeStore.featureFlags[key] ?? false
-}
-
-function setStoreValue(key: string, value: boolean) {
-  themeStore.featureFlags[key] = value
-  settings.value.feature_flags[key] = value
-}
-
-watch(
-  settings,
-  async () => {
-    await set(settings.value)
-  },
-  { deep: true },
-)
-</script>
-<template>
-  <div v-for="option in options" :key="option" class="mt-4 flex items-center justify-between">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast capitalize">
-        {{ option }}
-      </h2>
-    </div>
-
-    <Toggle
-      id="advanced-rendering"
-      :model-value="getStoreValue(option)"
-      :checked="getStoreValue(option)"
-      @update:model-value="() => setStoreValue(option, !themeStore.featureFlags[option])"
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/JavaSettings.vue
@@ -1,32 +0,0 @@
-<script setup>
-import { ref } from 'vue'
-import { get_java_versions, set_java_version } from '@/helpers/jre'
-import { handleError } from '@/store/notifications'
-import JavaSelector from '@/components/ui/JavaSelector.vue'
-
-const javaVersions = ref(await get_java_versions().catch(handleError))
-async function updateJavaVersion(version) {
-  if (version?.path === '') {
-    version.path = undefined
-  }
-
-  if (version?.path) {
-    version.path = version.path.replace('java.exe', 'javaw.exe')
-  }
-
-  await set_java_version(version).catch(handleError)
-}
-</script>
-<template>
-  <div v-for="(javaVersion, index) in [21, 17, 8]" :key="`java-${javaVersion}`">
-    <h2 class="m-0 text-lg font-extrabold text-contrast" :class="{ 'mt-4': index !== 0 }">
-      Java {{ javaVersion }} location
-    </h2>
-    <JavaSelector
-      :id="'java-selector-' + javaVersion"
-      v-model="javaVersions[javaVersion]"
-      :version="javaVersion"
-      @update:model-value="updateJavaVersion"
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
@@ -1,84 +0,0 @@
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings'
-import { Toggle } from '@modrinth/ui'
-import { optInAnalytics, optOutAnalytics } from '@/helpers/analytics'
-
-const settings = ref(await get())
-
-watch(
-  settings,
-  async () => {
-    if (settings.value.telemetry) {
-      optInAnalytics()
-    } else {
-      optOutAnalytics()
-    }
-
-    await set(settings.value)
-  },
-  { deep: true },
-)
-</script>
-
-<template>
-  <div class="flex items-center justify-between gap-4">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Personalized ads</h2>
-      <p class="m-0 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"
-      :model-value="settings.personalized_ads"
-      :checked="settings.personalized_ads"
-      @update:model-value="
-        (e) => {
-          settings.personalized_ads = e
-        }
-      "
-    />
-  </div>
-
-  <div class="mt-4 flex items-center justify-between gap-4">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Telemetry</h2>
-      <p class="m-0 text-sm">
-        Modrinth collects anonymized analytics and usage data to improve our user experience and
-        customize your experience. By disabling this option, you opt out and your data will no
-        longer be collected.
-      </p>
-    </div>
-    <Toggle
-      id="opt-out-analytics"
-      :model-value="settings.telemetry"
-      :checked="settings.telemetry"
-      @update:model-value="
-        (e) => {
-          settings.telemetry = e
-        }
-      "
-    />
-  </div>
-
-  <div class="mt-4 flex items-center justify-between gap-4">
-    <div>
-      <h2 class="m-0 text-lg font-extrabold text-contrast">Discord RPC</h2>
-      <p class="m-0 text-sm">
-        Manages the Discord Rich Presence integration. Disabling this will cause 'Modrinth' to no
-        longer show up as a game or app you are using on your Discord profile.
-      </p>
-      <p class="m-0 mt-2 text-sm">
-        Note: This will not prevent any instance-specific Discord Rich Presence integrations, such
-        as those added by mods. (app restart required to take effect)
-      </p>
-    </div>
-    <Toggle
-      id="disable-discord-rpc"
-      v-model="settings.discord_rpc"
-      :checked="settings.discord_rpc"
-    />
-  </div>
-</template>
--- a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
@@ -1,117 +0,0 @@
-<script setup>
-import { Button, Slider } from '@modrinth/ui'
-import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings.js'
-import { purge_cache_types } from '@/helpers/cache.js'
-import { handleError } from '@/store/notifications.js'
-import { BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-import { open } from '@tauri-apps/plugin-dialog'
-
-const settings = ref(await get())
-
-watch(
-  settings,
-  async () => {
-    const setSettings = JSON.parse(JSON.stringify(settings.value))
-
-    if (!setSettings.custom_dir) {
-      setSettings.custom_dir = null
-    }
-
-    await set(setSettings)
-  },
-  { deep: true },
-)
-
-async function purgeCache() {
-  await purge_cache_types([
-    'project',
-    'version',
-    'user',
-    'team',
-    'organization',
-    'loader_manifest',
-    'minecraft_manifest',
-    'categories',
-    'report_types',
-    'loaders',
-    'game_versions',
-    'donation_platforms',
-    'file_update',
-    'search_results',
-  ]).catch(handleError)
-}
-
-async function findLauncherDir() {
-  const newDir = await open({
-    multiple: false,
-    directory: true,
-    title: 'Select a new app directory',
-  })
-
-  if (newDir) {
-    settings.value.custom_dir = newDir
-  }
-}
-</script>
-
-<template>
-  <h2 class="m-0 text-lg font-extrabold text-contrast">App directory</h2>
-  <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-    The directory where the launcher stores all of its files. Changes will be applied after
-    restarting the launcher.
-  </p>
-
-  <div class="m-1 my-2">
-    <div class="iconified-input w-full">
-      <BoxIcon />
-      <input id="appDir" v-model="settings.custom_dir" type="text" class="input" />
-      <Button class="r-btn" @click="findLauncherDir">
-        <FolderSearchIcon />
-      </Button>
-    </div>
-  </div>
-
-  <div>
-    <ConfirmModalWrapper
-      ref="purgeCacheConfirmModal"
-      title="Are you sure you want to purge the cache?"
-      description="If you proceed, your entire cache will be purged. This may slow down the app temporarily."
-      :has-to-type="false"
-      proceed-label="Purge cache"
-      :show-ad-on-close="false"
-      @proceed="purgeCache"
-    />
-
-    <h2 class="m-0 text-lg font-extrabold text-contrast">App cache</h2>
-    <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-      The Modrinth app stores a cache of data to speed up loading. This can be purged to force the
-      app to reload data. This may slow down the app temporarily.
-    </p>
-  </div>
-  <button id="purge-cache" class="btn min-w-max" @click="$refs.purgeCacheConfirmModal.show()">
-    <TrashIcon />
-    Purge cache
-  </button>
-
-  <h2 class="m-0 text-lg font-extrabold text-contrast mt-4">Maximum concurrent downloads</h2>
-  <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-    The maximum amount of files the launcher can download at the same time. Set this to a lower
-    value if you have a poor internet connection. (app restart required to take effect)
-  </p>
-  <Slider
-    id="max-downloads"
-    v-model="settings.max_concurrent_downloads"
-    :min="1"
-    :max="10"
-    :step="1"
-  />
-
-  <h2 class="mt-4 m-0 text-lg font-extrabold text-contrast">Maximum concurrent writes</h2>
-  <p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-    The maximum amount of files the launcher can write to the disk at once. Set this to a lower
-    value if you are frequently getting I/O errors. (app restart required to take effect)
-  </p>
-  <Slider id="max-writes" v-model="settings.max_concurrent_writes" :min="1" :max="50" :step="1" />
-</template>
--- a/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue
+++ b/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue
@@ -0,0 +1,367 @@
+<script setup>
+import { UserIcon, LockIcon, MailIcon } from '@modrinth/assets'
+import { Button, Card, Checkbox, Modal } from '@modrinth/ui'
+import {
+  DiscordIcon,
+  GithubIcon,
+  MicrosoftIcon,
+  GoogleIcon,
+  SteamIcon,
+  GitLabIcon,
+} from '@/assets/external'
+import { login, login_2fa, create_account, login_pass } from '@/helpers/mr_auth.js'
+import { handleError, useNotifications } from '@/store/state.js'
+import { ref } from 'vue'
+import { handleSevereError } from '@/store/error.js'
+
+const props = defineProps({
+  callback: {
+    type: Function,
+    required: true,
+  },
+})
+
+const modal = ref()
+const turnstileToken = ref()
+const widgetId = ref()
+
+defineExpose({
+  show: () => {
+    modal.value.show()
+
+    if (window.turnstile === null || !window.turnstile) {
+      const script = document.createElement('script')
+      script.src =
+        'https://challenges.cloudflare.com/turnstile/v0/api.js?onload=onloadTurnstileCallback'
+      script.async = true
+      script.defer = true
+      document.head.appendChild(script)
+
+      window.onloadTurnstileCallback = loadWidget
+    } else {
+      loadWidget()
+    }
+  },
+})
+
+function loadWidget() {
+  widgetId.value = window.turnstile.render('#turnstile-container', {
+    sitekey: '0x4AAAAAAAW3guHM6Eunbgwu',
+    callback: (token) => (turnstileToken.value = token),
+    expiredCallback: () => (turnstileToken.value = null),
+  })
+}
+
+function removeWidget() {
+  if (widgetId.value) {
+    window.turnstile.remove(widgetId.value)
+    widgetId.value = null
+    turnstileToken.value = null
+  }
+}
+
+const loggingIn = ref(true)
+const twoFactorFlow = ref(null)
+const twoFactorCode = ref('')
+
+const email = ref('')
+const username = ref('')
+const password = ref('')
+const confirmPassword = ref('')
+const subscribe = ref(true)
+
+async function signInOauth(provider) {
+  const creds = await login(provider).catch(handleSevereError)
+
+  if (creds && creds.type === 'two_factor_required') {
+    twoFactorFlow.value = creds.flow
+  } else if (creds && creds.session) {
+    props.callback()
+    modal.value.hide()
+  }
+}
+
+async function signIn2fa() {
+  const creds = await login_2fa(twoFactorCode.value, twoFactorFlow.value).catch(handleError)
+
+  if (creds && creds.session) {
+    props.callback()
+    modal.value.hide()
+  }
+}
+
+async function signIn() {
+  const creds = await login_pass(username.value, password.value, turnstileToken.value).catch(
+    handleError,
+  )
+  window.turnstile.reset(widgetId.value)
+
+  if (creds && creds.type === 'two_factor_required') {
+    twoFactorFlow.value = creds.flow
+  } else if (creds && creds.session) {
+    props.callback()
+    modal.value.hide()
+  }
+}
+
+async function createAccount() {
+  if (password.value !== confirmPassword.value) {
+    const notifs = useNotifications()
+    notifs.addNotification({
+      title: 'An error occurred',
+      text: 'Passwords do not match!',
+      type: 'error',
+    })
+    return
+  }
+
+  const creds = await create_account(
+    username.value,
+    email.value,
+    password.value,
+    turnstileToken.value,
+    subscribe.value,
+  ).catch(handleError)
+  window.turnstile.reset(widgetId.value)
+
+  if (creds && creds.session) {
+    props.callback()
+    modal.value.hide()
+  }
+}
+</script>
+
+<template>
+  <Modal ref="modal" :on-hide="removeWidget">
+    <Card>
+      <template v-if="twoFactorFlow">
+        <h1>Enter two-factor code</h1>
+        <p>Please enter a two-factor code to proceed.</p>
+        <input v-model="twoFactorCode" maxlength="11" type="text" placeholder="Enter code..." />
+      </template>
+      <template v-else>
+        <h1 v-if="loggingIn">Login to Modrinth</h1>
+        <h1 v-else>Create an account</h1>
+        <div class="button-grid">
+          <Button class="discord" large @click="signInOauth('discord')">
+            <DiscordIcon />
+            Discord
+          </Button>
+          <Button class="github" large @click="signInOauth('github')">
+            <GithubIcon />
+            Github
+          </Button>
+          <Button class="white" large @click="signInOauth('microsoft')">
+            <MicrosoftIcon />
+            Microsoft
+          </Button>
+          <Button class="google" large @click="signInOauth('google')">
+            <GoogleIcon />
+            Google
+          </Button>
+          <Button class="white" large @click="signInOauth('steam')">
+            <SteamIcon />
+            Steam
+          </Button>
+          <Button class="gitlab" large @click="signInOauth('gitlab')">
+            <GitLabIcon />
+            GitLab
+          </Button>
+        </div>
+        <div class="divider">
+          <hr />
+          <p>Or</p>
+        </div>
+        <div v-if="!loggingIn" class="iconified-input username">
+          <MailIcon />
+          <input v-model="email" type="text" placeholder="Email" />
+        </div>
+        <div class="iconified-input username">
+          <UserIcon />
+          <input
+            v-model="username"
+            type="text"
+            :placeholder="loggingIn ? 'Email or username' : 'Username'"
+          />
+        </div>
+        <div class="iconified-input" :class="{ username: !loggingIn }">
+          <LockIcon />
+          <input v-model="password" type="password" placeholder="Password" />
+        </div>
+        <div v-if="!loggingIn" class="iconified-input username">
+          <LockIcon />
+          <input v-model="confirmPassword" type="password" placeholder="Confirm password" />
+        </div>
+        <div class="turnstile">
+          <div id="turnstile-container"></div>
+          <div id="turnstile-container-2"></div>
+        </div>
+        <Checkbox
+          v-if="!loggingIn"
+          v-model="subscribe"
+          class="subscribe-btn"
+          label="Subscribe to updates about Modrinth"
+        />
+        <div class="link-row">
+          <a v-if="loggingIn" class="button-base" @click="loggingIn = false"> Create account </a>
+          <a v-else class="button-base" @click="loggingIn = true">Sign in</a>
+          <a class="button-base" href="https://modrinth.com/auth/reset-password">
+            Forgot password?
+          </a>
+        </div>
+      </template>
+      <div class="button-row">
+        <Button class="transparent" large>Close</Button>
+        <Button v-if="twoFactorCode" color="primary" large @click="signIn2fa"> Login </Button>
+        <Button
+          v-else-if="loggingIn"
+          color="primary"
+          large
+          @click="signIn"
+          :disabled="!turnstileToken"
+        >
+          Login
+        </Button>
+        <Button v-else color="primary" large @click="createAccount" :disabled="!turnstileToken">
+          Create account
+        </Button>
+      </div>
+    </Card>
+  </Modal>
+</template>
+
+<style scoped lang="scss">
+:deep(.modal-container) {
+  .modal-body {
+    width: auto;
+
+    .content {
+      background: none;
+    }
+  }
+}
+
+.card {
+  width: 25rem;
+}
+
+.button-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: var(--gap-md);
+
+  .btn {
+    width: 100%;
+    justify-content: center;
+  }
+
+  .discord {
+    background-color: #5865f2;
+    color: var(--color-contrast);
+  }
+
+  .github {
+    background-color: #8740f1;
+    color: var(--color-contrast);
+  }
+
+  .white {
+    background-color: var(--color-contrast);
+    color: var(--color-accent-contrast);
+  }
+
+  .google {
+    background-color: #4285f4;
+    color: var(--color-contrast);
+  }
+
+  .gitlab {
+    background-color: #fc6d26;
+    color: var(--color-contrast);
+  }
+}
+
+.divider {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: var(--gap-md) 0;
+
+  p {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-color: var(--color-raised-bg);
+    padding: 0 1rem;
+    margin: 0;
+  }
+
+  hr {
+    border: none;
+    width: 100%;
+    border-top: 2px solid var(--color-button-bg);
+  }
+}
+
+.iconified-input {
+  width: 100%;
+
+  input {
+    width: 100%;
+    flex-basis: auto;
+  }
+}
+
+.username {
+  margin-bottom: var(--gap-sm);
+}
+
+.link-row {
+  display: flex;
+  justify-content: space-between;
+  margin: var(--gap-md) 0;
+
+  a {
+    color: var(--color-blue);
+    text-decoration: underline;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
+
+.button-row {
+  display: flex;
+  justify-content: space-between;
+
+  .btn {
+    flex-basis: auto;
+  }
+
+  .transparent {
+    padding: var(--gap-md) 0;
+  }
+}
+
+:deep(.checkbox) {
+  border: none;
+}
+
+.turnstile {
+  display: flex;
+  justify-content: center;
+  overflow: hidden;
+  border-radius: var(--radius-md);
+  border: 2px solid var(--color-button-bg);
+  height: 66px;
+  margin-top: var(--gap-md);
+
+  iframe {
+    margin: -1px;
+    min-width: calc(100% + 2px);
+  }
+}
+</style>
--- a/apps/app-frontend/src/helpers/ads.js
+++ b/apps/app-frontend/src/helpers/ads.js
@@ -1,21 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-
-export async function init_ads_window(overrideShown = false) {
-  return await invoke('plugin:ads|init_ads_window', { overrideShown, dpr: window.devicePixelRatio })
-}
-
-export async function show_ads_window() {
-  return await invoke('plugin:ads|show_ads_window', { dpr: window.devicePixelRatio })
-}
-
-export async function hide_ads_window(reset) {
-  return await invoke('plugin:ads|hide_ads_window', { reset })
-}
-
-export async function record_ads_click() {
-  return await invoke('plugin:ads|record_ads_click')
-}
-
-export async function open_ads_link(path, origin) {
-  return await invoke('plugin:ads|open_link', { path, origin })
-}
--- a/apps/app-frontend/src/helpers/events.js
+++ b/apps/app-frontend/src/helpers/events.js
@@ -93,7 +93,3 @@ export async function command_listener(callback) {
 export async function warning_listener(callback) {
  return await listen('warning', (event) => callback(event.payload))
 }
-
-export async function friend_listener(callback) {
-  return await listen('friend', (event) => callback(event.payload))
-}
--- a/apps/app-frontend/src/helpers/friends.js
+++ b/apps/app-frontend/src/helpers/friends.js
@@ -1,17 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-
-export async function friends() {
-  return await invoke('plugin:friends|friends')
-}
-
-export async function friend_statuses() {
-  return await invoke('plugin:friends|friend_statuses')
-}
-
-export async function add_friend(userId) {
-  return await invoke('plugin:friends|add_friend', { userId })
-}
-
-export async function remove_friend(userId) {
-  return await invoke('plugin:friends|remove_friend', { userId })
-}
--- a/apps/app-frontend/src/helpers/mr_auth.js
+++ b/apps/app-frontend/src/helpers/mr_auth.js
@@ -5,8 +5,26 @@
 */
 import { invoke } from '@tauri-apps/api/core'

-export async function login() {
-  return await invoke('plugin:mr-auth|modrinth_login')
+export async function login(provider) {
+  return await invoke('modrinth_auth_login', { provider })
+}
+
+export async function login_pass(username, password, challenge) {
+  return await invoke('plugin:mr-auth|login_pass', { username, password, challenge })
+}
+
+export async function login_2fa(code, flow) {
+  return await invoke('plugin:mr-auth|login_2fa', { code, flow })
+}
+
+export async function create_account(username, email, password, challenge, signUpNewsletter) {
+  return await invoke('plugin:mr-auth|create_account', {
+    username,
+    email,
+    password,
+    challenge,
+    signUpNewsletter,
+  })
 }

 export async function logout() {
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -1,110 +0,0 @@
-import type { ModrinthId } from '@modrinth/utils'
-
-type GameInstance = {
-  path: string
-  install_stage: InstallStage
-
-  name: string
-  icon_path?: string
-
-  game_version: string
-  loader: InstanceLoader
-  loader_version?: string
-
-  groups: string[]
-
-  linked_data?: LinkedData
-
-  created: Date
-  modified: Date
-  last_played?: Date
-
-  submitted_time_played: number
-  recent_time_played: number
-
-  java_path?: string
-  extra_launch_args?: string[]
-  custom_env_vars?: [string, string][]
-
-  memory?: MemorySettings
-  force_fullscreen?: boolean
-  game_resolution?: [number, number]
-  hooks: Hooks
-}
-
-type InstallStage = 'installed' | 'installing' | 'pack_installing' | 'not_installed'
-
-type LinkedData = {
-  project_id: ModrinthId
-  version_id: ModrinthId
-
-  locked: boolean
-}
-
-type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
-
-type MemorySettings = {
-  maximum: number
-}
-
-type WindowSize = {
-  width: number
-  height: number
-}
-
-type Hooks = {
-  pre_launch?: string
-  wrapper?: string
-  post_exit?: string
-}
-
-type Manifest = {
-  gameVersions: ManifestGameVersion[]
-}
-
-type ManifestGameVersion = {
-  id: string
-  stable: boolean
-  loaders: ManifestLoaderVersion[]
-}
-
-type ManifestLoaderVersion = {
-  id: string
-  url: string
-  stable: boolean
-}
-
-type AppSettings = {
-  max_concurrent_downloads: number
-  max_concurrent_writes: number
-
-  theme: 'dark' | 'light' | 'oled'
-  default_page: 'Home' | 'Library'
-  collapsed_navigation: boolean
-  advanced_rendering: boolean
-  native_decorations: boolean
-
-  telemetry: boolean
-  discord_rpc: boolean
-  developer_mode: boolean
-  personalized_ads: boolean
-
-  onboarded: boolean
-
-  extra_launch_args: string[]
-  custom_env_vars: [string, string][]
-  memory: MemorySettings
-  force_fullscreen: boolean
-  game_resolution: [number, number]
-  hide_on_process_start: boolean
-  hooks: Hooks
-
-  custom_dir?: string
-  prev_custom_dir?: string
-  migrated: boolean
-}
-
-export type InstanceSettingsTabProps = {
-  instance: GameInstance
-  offline?: boolean
-}
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -33,10 +33,6 @@ export async function highlightModInProfile(profilePath, projectPath) {
  return await highlightInFolder(fullPath)
 }

-export async function restartApp() {
-  return await invoke('restart_app')
-}
-
 export const releaseColor = (releaseType) => {
  switch (releaseType) {
    case 'release':
@@ -49,3 +45,17 @@ export const releaseColor = (releaseType) => {
      return ''
  }
 }
+
+export function debounce(fn, wait) {
+  let timer
+  return function (...args) {
+    if (timer) {
+      clearTimeout(timer) // clear any pre-existing timer
+    }
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const context = this // get the current context
+    timer = setTimeout(() => {
+      fn.apply(context, args) // call the function if time expires
+    }, wait)
+  }
+}
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1,320 +0,0 @@
-{
-  "app.settings.developer-mode-enabled": {
-    "message": "Developer mode enabled."
-  },
-  "app.settings.tabs.appearance": {
-    "message": "Appearance"
-  },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Default instance options"
-  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Feature flags"
-  },
-  "app.settings.tabs.java-installations": {
-    "message": "Java installations"
-  },
-  "app.settings.tabs.privacy": {
-    "message": "Privacy"
-  },
-  "app.settings.tabs.resource-management": {
-    "message": "Resource management"
-  },
-  "instance.filter.updates-available": {
-    "message": "Updates available"
-  },
-  "instance.settings.tabs.general": {
-    "message": "General"
-  },
-  "instance.settings.tabs.general.delete": {
-    "message": "Delete instance"
-  },
-  "instance.settings.tabs.general.delete.button": {
-    "message": "Delete instance"
-  },
-  "instance.settings.tabs.general.delete.description": {
-    "message": "Permanently deletes an instance from your device, including your worlds, configs, and all installed content. Be careful, as once you delete a instance there is no way to recover it."
-  },
-  "instance.settings.tabs.general.deleting.button": {
-    "message": "Deleting..."
-  },
-  "instance.settings.tabs.general.duplicate-button": {
-    "message": "Duplicate"
-  },
-  "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
-    "message": "Cannot duplicate while installing."
-  },
-  "instance.settings.tabs.general.duplicate-instance": {
-    "message": "Duplicate instance"
-  },
-  "instance.settings.tabs.general.duplicate-instance.description": {
-    "message": "Creates a copy of this instance, including worlds, configs, mods, etc."
-  },
-  "instance.settings.tabs.general.edit-icon": {
-    "message": "Edit icon"
-  },
-  "instance.settings.tabs.general.edit-icon.remove": {
-    "message": "Remove icon"
-  },
-  "instance.settings.tabs.general.edit-icon.replace": {
-    "message": "Replace icon"
-  },
-  "instance.settings.tabs.general.edit-icon.select": {
-    "message": "Select icon"
-  },
-  "instance.settings.tabs.general.library-groups": {
-    "message": "Library groups"
-  },
-  "instance.settings.tabs.general.library-groups.create": {
-    "message": "Create new group"
-  },
-  "instance.settings.tabs.general.library-groups.description": {
-    "message": "Library groups allow you to organize your instances into different sections in your library."
-  },
-  "instance.settings.tabs.general.library-groups.enter-name": {
-    "message": "Enter group name"
-  },
-  "instance.settings.tabs.general.name": {
-    "message": "Name"
-  },
-  "instance.settings.tabs.hooks": {
-    "message": "Launch hooks"
-  },
-  "instance.settings.tabs.hooks.custom-hooks": {
-    "message": "Custom launch hooks"
-  },
-  "instance.settings.tabs.hooks.description": {
-    "message": "Hooks allow advanced users to run certain system commands before and after launching the game."
-  },
-  "instance.settings.tabs.hooks.post-exit": {
-    "message": "Post-exit"
-  },
-  "instance.settings.tabs.hooks.post-exit.description": {
-    "message": "Ran after the game closes."
-  },
-  "instance.settings.tabs.hooks.post-exit.enter": {
-    "message": "Enter post-exit command..."
-  },
-  "instance.settings.tabs.hooks.pre-launch": {
-    "message": "Pre-launch"
-  },
-  "instance.settings.tabs.hooks.pre-launch.description": {
-    "message": "Ran before the instance is launched."
-  },
-  "instance.settings.tabs.hooks.pre-launch.enter": {
-    "message": "Enter pre-launch command..."
-  },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Game launch hooks"
-  },
-  "instance.settings.tabs.hooks.wrapper": {
-    "message": "Wrapper"
-  },
-  "instance.settings.tabs.hooks.wrapper.description": {
-    "message": "Wrapper command for launching Minecraft."
-  },
-  "instance.settings.tabs.hooks.wrapper.enter": {
-    "message": "Enter wrapper command..."
-  },
-  "instance.settings.tabs.installation": {
-    "message": "Installation"
-  },
-  "instance.settings.tabs.installation.change-version.already-installed.modded": {
-    "message": "{platform} {version} for Minecraft {game_version} already installed"
-  },
-  "instance.settings.tabs.installation.change-version.already-installed.vanilla": {
-    "message": "Vanilla {game_version} already installed"
-  },
-  "instance.settings.tabs.installation.change-version.button": {
-    "message": "Change version"
-  },
-  "instance.settings.tabs.installation.change-version.button.install": {
-    "message": "Install"
-  },
-  "instance.settings.tabs.installation.change-version.button.installing": {
-    "message": "Installing"
-  },
-  "instance.settings.tabs.installation.change-version.cannot-while-fetching": {
-    "message": "Fetching modpack versions"
-  },
-  "instance.settings.tabs.installation.change-version.in-progress": {
-    "message": "Installing new version"
-  },
-  "instance.settings.tabs.installation.currently-installed": {
-    "message": "Currently installed"
-  },
-  "instance.settings.tabs.installation.debug-information": {
-    "message": "Debug information:"
-  },
-  "instance.settings.tabs.installation.fetching-modpack-details": {
-    "message": "Fetching modpack details"
-  },
-  "instance.settings.tabs.installation.game-version": {
-    "message": "Game version"
-  },
-  "instance.settings.tabs.installation.install": {
-    "message": "Install"
-  },
-  "instance.settings.tabs.installation.install.in-progress": {
-    "message": "Installation in progress"
-  },
-  "instance.settings.tabs.installation.loader-version": {
-    "message": "{loader} version"
-  },
-  "instance.settings.tabs.installation.minecraft-version": {
-    "message": "Minecraft {version}"
-  },
-  "instance.settings.tabs.installation.no-connection": {
-    "message": "Cannot fetch linked modpack details. Please check your internet connection."
-  },
-  "instance.settings.tabs.installation.no-loader-versions": {
-    "message": "{loader} is not available for Minecraft {version}. Try another mod loader."
-  },
-  "instance.settings.tabs.installation.no-modpack-found": {
-    "message": "This instance is linked to a modpack, but the modpack could not be found on Modrinth."
-  },
-  "instance.settings.tabs.installation.platform": {
-    "message": "Platform"
-  },
-  "instance.settings.tabs.installation.reinstall.button": {
-    "message": "Reinstall modpack"
-  },
-  "instance.settings.tabs.installation.reinstall.button.reinstalling": {
-    "message": "Reinstalling modpack"
-  },
-  "instance.settings.tabs.installation.reinstall.confirm.description": {
-    "message": "Reinstalling will reset all installed or modified content to what is provided by the modpack, removing any mods or content you have added on top of the original installation. This may fix unexpected behavior if changes have been made to the instance, but if your worlds now depend on additional installed content, it may break existing worlds."
-  },
-  "instance.settings.tabs.installation.reinstall.confirm.title": {
-    "message": "Are you sure you want to reinstall this instance?"
-  },
-  "instance.settings.tabs.installation.reinstall.description": {
-    "message": "Resets the instance's content to its original state, removing any mods or content you have added on top of the original modpack."
-  },
-  "instance.settings.tabs.installation.reinstall.title": {
-    "message": "Reinstall modpack"
-  },
-  "instance.settings.tabs.installation.repair.button": {
-    "message": "Repair"
-  },
-  "instance.settings.tabs.installation.repair.button.repairing": {
-    "message": "Repairing"
-  },
-  "instance.settings.tabs.installation.repair.confirm.description": {
-    "message": "Repairing reinstalls Minecraft dependencies and checks for corruption. This may resolve issues if your game is not launching due to launcher-related errors, but will not resolve issues or crashes related to installed mods."
-  },
-  "instance.settings.tabs.installation.repair.confirm.title": {
-    "message": "Repair instance?"
-  },
-  "instance.settings.tabs.installation.repair.in-progress": {
-    "message": "Repair in progress"
-  },
-  "instance.settings.tabs.installation.reset-selections": {
-    "message": "Reset to current"
-  },
-  "instance.settings.tabs.installation.show-all-versions": {
-    "message": "Show all versions"
-  },
-  "instance.settings.tabs.installation.tooltip.action.change-version": {
-    "message": "change version"
-  },
-  "instance.settings.tabs.installation.tooltip.action.install": {
-    "message": "install"
-  },
-  "instance.settings.tabs.installation.tooltip.action.reinstall": {
-    "message": "reinstall"
-  },
-  "instance.settings.tabs.installation.tooltip.action.repair": {
-    "message": "repair"
-  },
-  "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
-    "message": "Cannot {action} while installing"
-  },
-  "instance.settings.tabs.installation.tooltip.cannot-while-offline": {
-    "message": "Cannot {action} while offline"
-  },
-  "instance.settings.tabs.installation.tooltip.cannot-while-repairing": {
-    "message": "Cannot {action} while repairing"
-  },
-  "instance.settings.tabs.installation.unknown-version": {
-    "message": "(unknown version)"
-  },
-  "instance.settings.tabs.installation.unlink.button": {
-    "message": "Unlink instance"
-  },
-  "instance.settings.tabs.installation.unlink.confirm.description": {
-    "message": "If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal."
-  },
-  "instance.settings.tabs.installation.unlink.confirm.title": {
-    "message": "Are you sure you want to unlink this instance?"
-  },
-  "instance.settings.tabs.installation.unlink.description": {
-    "message": "This instance is linked to a modpack, which means mods can't be updated and you can't change the mod loader or Minecraft version. Unlinking will permanently disconnect this instance from the modpack."
-  },
-  "instance.settings.tabs.installation.unlink.title": {
-    "message": "Unlink from modpack"
-  },
-  "instance.settings.tabs.java": {
-    "message": "Java and memory"
-  },
-  "instance.settings.tabs.java.environment-variables": {
-    "message": "Environment variables"
-  },
-  "instance.settings.tabs.java.hooks": {
-    "message": "Hooks"
-  },
-  "instance.settings.tabs.java.java-arguments": {
-    "message": "Java arguments"
-  },
-  "instance.settings.tabs.java.java-installation": {
-    "message": "Java installation"
-  },
-  "instance.settings.tabs.java.java-memory": {
-    "message": "Memory allocated"
-  },
-  "instance.settings.tabs.window": {
-    "message": "Window"
-  },
-  "instance.settings.tabs.window.custom-window-settings": {
-    "message": "Custom window settings"
-  },
-  "instance.settings.tabs.window.fullscreen": {
-    "message": "Fullscreen"
-  },
-  "instance.settings.tabs.window.fullscreen.description": {
-    "message": "Make the game start in full screen when launched (using options.txt)."
-  },
-  "instance.settings.tabs.window.height": {
-    "message": "Height"
-  },
-  "instance.settings.tabs.window.height.description": {
-    "message": "The height of the game window when launched."
-  },
-  "instance.settings.tabs.window.height.enter": {
-    "message": "Enter height..."
-  },
-  "instance.settings.tabs.window.width": {
-    "message": "Width"
-  },
-  "instance.settings.tabs.window.width.description": {
-    "message": "The width of the game window when launched."
-  },
-  "instance.settings.tabs.window.width.enter": {
-    "message": "Enter width..."
-  },
-  "instance.settings.title": {
-    "message": "Settings"
-  },
-  "search.filter.locked.instance": {
-    "message": "Provided by the instance"
-  },
-  "search.filter.locked.instance-game-version.title": {
-    "message": "Game version is provided by the instance"
-  },
-  "search.filter.locked.instance-loader.title": {
-    "message": "Loader is provided by the instance"
-  },
-  "search.filter.locked.instance.sync": {
-    "message": "Sync with instance"
-  }
-}
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -37,16 +37,7 @@ Sentry.init({

 app.use(router)
 app.use(pinia)
-app.use(FloatingVue, {
-  themes: {
-    'ribbit-popout': {
-      $extend: 'dropdown',
-      placement: 'bottom-end',
-      instantMove: true,
-      distance: 8,
-    },
-  },
-})
+app.use(FloatingVue)
 app.use(VIntlPlugin)

 app.mount('#app')
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -31,21 +31,19 @@ window.addEventListener('online', () => {
 const getInstances = async () => {
  const profiles = await list().catch(handleError)

-  recentInstances.value = profiles
-    .filter((x) => x.last_played)
-    .sort((a, b) => {
-      const dateA = dayjs(a.last_played)
-      const dateB = dayjs(b.last_played)
+  recentInstances.value = profiles.sort((a, b) => {
+    const dateA = dayjs(a.last_played ?? 0)
+    const dateB = dayjs(b.last_played ?? 0)

-      if (dateA.isSame(dateB)) {
-        return a.name.localeCompare(b.name)
-      }
+    if (dateA.isSame(dateB)) {
+      return a.name.localeCompare(b.name)
+    }

-      return dateB - dateA
-    })
+    return dateB - dateA
+  })

-  const filters = []
-  for (const instance of profiles) {
+  let filters = []
+  for (const instance of recentInstances.value) {
    if (instance.linked_data && instance.linked_data.project_id) {
      filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)
    }
@@ -101,28 +99,25 @@ onUnmounted(() => {
 </script>

 <template>
-  <div class="p-6 flex flex-col gap-2">
-    <h1 v-if="recentInstances" class="m-0 text-2xl">Welcome back!</h1>
-    <h1 v-else class="m-0 text-2xl">Welcome to Modrinth App!</h1>
+  <div class="page-container">
    <RowDisplay
      v-if="total > 0"
      :instances="[
        {
-          label: 'Recently played',
+          label: 'Jump back in',
          route: '/library',
          instances: recentInstances,
          instance: true,
          downloaded: true,
-          compact: true,
        },
        {
-          label: 'Discover a modpack',
+          label: 'Popular packs',
          route: '/browse/modpack',
          instances: featuredModpacks,
          downloaded: false,
        },
        {
-          label: 'Discover mods',
+          label: 'Popular mods',
          route: '/browse/mod',
          instances: featuredMods,
          downloaded: false,
@@ -132,3 +127,13 @@ onUnmounted(() => {
    />
  </div>
 </template>
+
+<style lang="scss" scoped>
+.page-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+}
+</style>
--- a/apps/app-frontend/src/pages/library/Index.vue
+++ b/apps/app-frontend/src/pages/library/Index.vue
@@ -1,15 +1,15 @@
 <script setup>
 import { onUnmounted, ref, shallowRef } from 'vue'
+import GridDisplay from '@/components/GridDisplay.vue'
 import { list } from '@/helpers/profile.js'
 import { useRoute } from 'vue-router'
-import { useBreadcrumbs } from '@/store/breadcrumbs.js'
+import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { profile_listener } from '@/helpers/events.js'
 import { handleError } from '@/store/notifications.js'
 import { Button } from '@modrinth/ui'
 import { PlusIcon } from '@modrinth/assets'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { NewInstanceImage } from '@/assets/icons'
-import NavTabs from '@/components/ui/NavTabs.vue'

 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
@@ -35,31 +35,17 @@ onUnmounted(() => {
 </script>

 <template>
-  <div class="p-6 flex flex-col gap-3">
-    <h1 class="m-0 text-2xl hidden">Library</h1>
-    <NavTabs
-      :links="[
-        { label: 'All instances', href: `/library` },
-        { label: 'Downloaded', href: `/library/downloaded` },
-        { label: 'Custom', href: `/library/custom` },
-        { label: 'Shared with me', href: `/library/shared`, shown: false },
-        { label: 'Saved', href: `/library/saved`, shown: false },
-      ]"
-    />
-    <template v-if="instances.length > 0">
-      <RouterView :instances="instances" />
-    </template>
-    <div v-else class="no-instance">
-      <div class="icon">
-        <NewInstanceImage />
-      </div>
-      <h3>No instances found</h3>
-      <Button color="primary" :disabled="offline" @click="$refs.installationModal.show()">
-        <PlusIcon />
-        Create new instance
-      </Button>
-      <InstanceCreationModal ref="installationModal" />
+  <GridDisplay v-if="instances.length > 0" label="Instances" :instances="instances" />
+  <div v-else class="no-instance">
+    <div class="icon">
+      <NewInstanceImage />
    </div>
+    <h3>No instances found</h3>
+    <Button color="primary" :disabled="offline" @click="$refs.installationModal.show()">
+      <PlusIcon />
+      Create new instance
+    </Button>
+    <InstanceCreationModal ref="installationModal" />
  </div>
 </template>

--- a/apps/app-frontend/src/pages/Settings.vue
+++ b/apps/app-frontend/src/pages/Settings.vue
@@ -0,0 +1,604 @@
+<script setup>
+import { ref, watch } from 'vue'
+import { LogOutIcon, LogInIcon, BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
+import { Card, Slider, DropdownSelect, Toggle, ConfirmModal, Button } from '@modrinth/ui'
+import { handleError, useTheming } from '@/store/state'
+import { get, set } from '@/helpers/settings'
+import { get_java_versions, get_max_memory, set_java_version } from '@/helpers/jre'
+import { get as getCreds, logout } from '@/helpers/mr_auth.js'
+import JavaSelector from '@/components/ui/JavaSelector.vue'
+import ModrinthLoginScreen from '@/components/ui/tutorial/ModrinthLoginScreen.vue'
+import { optOutAnalytics, optInAnalytics } from '@/helpers/analytics'
+import { open } from '@tauri-apps/plugin-dialog'
+import { getOS } from '@/helpers/utils.js'
+import { getVersion } from '@tauri-apps/api/app'
+import { get_user, purge_cache_types } from '@/helpers/cache.js'
+
+const pageOptions = ['Home', 'Library']
+
+const themeStore = useTheming()
+
+const version = await getVersion()
+
+const accessSettings = async () => {
+  const settings = await get()
+
+  settings.launchArgs = settings.extra_launch_args.join(' ')
+  settings.envVars = settings.custom_env_vars.map((x) => x.join('=')).join(' ')
+
+  return settings
+}
+
+const fetchSettings = await accessSettings().catch(handleError)
+
+const settings = ref(fetchSettings)
+
+const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
+
+watch(
+  settings,
+  async (oldSettings, newSettings) => {
+    if (oldSettings.loaded_config_dir !== newSettings.loaded_config_dir) {
+      return
+    }
+
+    const setSettings = JSON.parse(JSON.stringify(newSettings))
+
+    if (setSettings.telemetry) {
+      optInAnalytics()
+    } else {
+      optOutAnalytics()
+    }
+
+    setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
+    setSettings.custom_env_vars = setSettings.envVars
+      .trim()
+      .split(/\s+/)
+      .filter(Boolean)
+      .map((x) => x.split('=').filter(Boolean))
+
+    if (!setSettings.hooks.pre_launch) {
+      setSettings.hooks.pre_launch = null
+    }
+    if (!setSettings.hooks.wrapper) {
+      setSettings.hooks.wrapper = null
+    }
+    if (!setSettings.hooks.post_exit) {
+      setSettings.hooks.post_exit = null
+    }
+
+    if (!setSettings.custom_dir) {
+      setSettings.custom_dir = null
+    }
+
+    await set(setSettings)
+  },
+  { deep: true },
+)
+
+const javaVersions = ref(await get_java_versions().catch(handleError))
+async function updateJavaVersion(version) {
+  if (version?.path === '') {
+    version.path = undefined
+  }
+
+  if (version?.path) {
+    version.path = version.path.replace('java.exe', 'javaw.exe')
+  }
+
+  await set_java_version(version).catch(handleError)
+}
+
+async function fetchCredentials() {
+  const creds = await getCreds().catch(handleError)
+  if (creds && creds.user_id) {
+    creds.user = await get_user(creds.user_id).catch(handleError)
+  }
+  credentials.value = creds
+}
+
+const credentials = ref()
+await fetchCredentials()
+
+const loginScreenModal = ref()
+
+async function logOut() {
+  await logout().catch(handleError)
+  await fetchCredentials()
+}
+
+async function signInAfter() {
+  await fetchCredentials()
+}
+
+async function findLauncherDir() {
+  const newDir = await open({
+    multiple: false,
+    directory: true,
+    title: 'Select a new app directory',
+  })
+
+  if (newDir) {
+    settings.value.custom_dir = newDir
+  }
+}
+
+async function purgeCache() {
+  await purge_cache_types([
+    'project',
+    'version',
+    'user',
+    'team',
+    'organization',
+    'loader_manifest',
+    'minecraft_manifest',
+    'categories',
+    'report_types',
+    'loaders',
+    'game_versions',
+    'donation_platforms',
+    'file_update',
+    'search_results',
+  ]).catch(handleError)
+}
+</script>
+
+<template>
+  <div class="settings-page">
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">General settings</span>
+        </h3>
+      </div>
+      <ModrinthLoginScreen ref="loginScreenModal" :callback="signInAfter" />
+      <div class="adjacent-input">
+        <label for="sign-in">
+          <span class="label__title">Manage account</span>
+          <span v-if="credentials" class="label__description">
+            You are currently logged in as {{ credentials.user.username }}.
+          </span>
+          <span v-else> Sign in to your Modrinth account. </span>
+        </label>
+        <button v-if="credentials" id="sign-in" class="btn" @click="logOut">
+          <LogOutIcon />
+          Sign out
+        </button>
+        <button v-else id="sign-in" class="btn" @click="$refs.loginScreenModal.show()">
+          <LogInIcon />
+          Sign in
+        </button>
+      </div>
+      <ConfirmModal
+        ref="purgeCacheConfirmModal"
+        title="Are you sure you want to purge the cache?"
+        description="If you proceed, your entire cache will be purged. This may slow down the app temporarily."
+        :has-to-type="false"
+        proceed-label="Purge cache"
+        :noblur="!themeStore.advancedRendering"
+        @proceed="purgeCache"
+      />
+      <div class="adjacent-input">
+        <label for="purge-cache">
+          <span class="label__title">App cache</span>
+          <span class="label__description">
+            The Modrinth app stores a cache of data to speed up loading. This can be purged to force
+            the app to reload data. <br />
+            This may slow down the app temporarily.
+          </span>
+        </label>
+        <button id="purge-cache" class="btn" @click="$refs.purgeCacheConfirmModal.show()">
+          <TrashIcon />
+          Purge cache
+        </button>
+      </div>
+      <label for="appDir">
+        <span class="label__title">App directory</span>
+        <span class="label__description">
+          The directory where the launcher stores all of its files. Changes will be applied after
+          restarting the launcher.
+        </span>
+      </label>
+      <div class="app-directory">
+        <div class="iconified-input">
+          <BoxIcon />
+          <input id="appDir" v-model="settings.custom_dir" type="text" class="input" />
+          <Button class="r-btn" @click="findLauncherDir">
+            <FolderSearchIcon />
+          </Button>
+        </div>
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">Display</span>
+        </h3>
+      </div>
+      <div class="adjacent-input">
+        <label for="theme">
+          <span class="label__title">Color theme</span>
+          <span class="label__description">Change the global launcher color theme.</span>
+        </label>
+        <DropdownSelect
+          id="theme"
+          name="Theme dropdown"
+          :options="themeStore.themeOptions"
+          :default-value="settings.theme"
+          :model-value="settings.theme"
+          class="theme-dropdown"
+          @change="
+            (e) => {
+              themeStore.setThemeState(e.option.toLowerCase())
+              settings.theme = themeStore.selectedTheme
+            }
+          "
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="advanced-rendering">
+          <span class="label__title">Advanced rendering</span>
+          <span class="label__description">
+            Enables advanced rendering such as blur effects that may cause performance issues
+            without hardware-accelerated rendering.
+          </span>
+        </label>
+        <Toggle
+          id="advanced-rendering"
+          :model-value="themeStore.advancedRendering"
+          :checked="themeStore.advancedRendering"
+          @update:model-value="
+            (e) => {
+              themeStore.advancedRendering = e
+              settings.advanced_rendering = themeStore.advancedRendering
+            }
+          "
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="minimize-launcher">
+          <span class="label__title">Minimize launcher</span>
+          <span class="label__description"
+            >Minimize the launcher when a Minecraft process starts.</span
+          >
+        </label>
+        <Toggle
+          id="minimize-launcher"
+          :model-value="settings.hide_on_process_start"
+          :checked="settings.hide_on_process_start"
+          @update:model-value="
+            (e) => {
+              settings.hide_on_process_start = e
+            }
+          "
+        />
+      </div>
+      <div v-if="getOS() != 'MacOS'" class="adjacent-input">
+        <label for="native-decorations">
+          <span class="label__title">Native decorations</span>
+          <span class="label__description">Use system window frame (app restart required).</span>
+        </label>
+        <Toggle
+          id="native-decorations"
+          :model-value="settings.native_decorations"
+          :checked="settings.native_decorations"
+          @update:model-value="
+            (e) => {
+              settings.native_decorations = e
+            }
+          "
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="opening-page">
+          <span class="label__title">Default landing page</span>
+          <span class="label__description">Change the page to which the launcher opens on.</span>
+        </label>
+        <DropdownSelect
+          id="opening-page"
+          name="Opening page dropdown"
+          :options="pageOptions"
+          :default-value="settings.default_page"
+          :model-value="settings.default_page"
+          class="opening-page"
+          @change="
+            (e) => {
+              settings.default_page = e.option
+            }
+          "
+        />
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">Resource management</span>
+        </h3>
+      </div>
+
+      <div class="adjacent-input">
+        <label for="max-downloads">
+          <span class="label__title">Maximum concurrent downloads</span>
+          <span class="label__description">
+            The maximum amount of files the launcher can download at the same time. Set this to a
+            lower value if you have a poor internet connection. (app restart required to take
+            effect)
+          </span>
+        </label>
+        <Slider
+          id="max-downloads"
+          v-model="settings.max_concurrent_downloads"
+          :min="1"
+          :max="10"
+          :step="1"
+        />
+      </div>
+
+      <div class="adjacent-input">
+        <label for="max-writes">
+          <span class="label__title">Maximum concurrent writes</span>
+          <span class="label__description">
+            The maximum amount of files the launcher can write to the disk at once. Set this to a
+            lower value if you are frequently getting I/O errors. (app restart required to take
+            effect)
+          </span>
+        </label>
+        <Slider
+          id="max-writes"
+          v-model="settings.max_concurrent_writes"
+          :min="1"
+          :max="50"
+          :step="1"
+        />
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">Privacy</span>
+        </h3>
+      </div>
+      <div class="adjacent-input">
+        <label for="opt-out-analytics">
+          <span class="label__title">Telemetry</span>
+          <span class="label__description">
+            Modrinth collects anonymized analytics and usage data to improve our user experience and
+            customize your experience. By disabling this option, you opt out and your data will no
+            longer be collected.
+          </span>
+        </label>
+        <Toggle
+          id="opt-out-analytics"
+          :model-value="settings.telemetry"
+          :checked="settings.telemetry"
+          @update:model-value="
+            (e) => {
+              settings.telemetry = e
+            }
+          "
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="disable-discord-rpc">
+          <span class="label__title">Discord RPC</span>
+          <span class="label__description">
+            Manages the Discord Rich Presence integration. Disabling this will cause 'Modrinth' to
+            no longer show up as a game or app you are using on your Discord profile. This does not
+            disable any instance-specific Discord Rich Presence integrations, such as those added by
+            mods. (app restart required to take effect)
+          </span>
+        </label>
+        <Toggle
+          id="disable-discord-rpc"
+          v-model="settings.discord_rpc"
+          :checked="settings.discord_rpc"
+        />
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">Java settings</span>
+        </h3>
+      </div>
+      <template v-for="version in [21, 17, 8]">
+        <label :for="'java-' + version">
+          <span class="label__title">Java {{ version }} location</span>
+        </label>
+        <JavaSelector
+          :id="'java-selector-' + version"
+          v-model="javaVersions[version]"
+          :version="version"
+          @update:model-value="updateJavaVersion"
+        />
+      </template>
+      <hr class="card-divider" />
+      <label for="java-args">
+        <span class="label__title">Java arguments</span>
+      </label>
+      <input
+        id="java-args"
+        v-model="settings.launchArgs"
+        autocomplete="off"
+        type="text"
+        class="installation-input"
+        placeholder="Enter java arguments..."
+      />
+      <label for="env-vars">
+        <span class="label__title">Environmental variables</span>
+      </label>
+      <input
+        id="env-vars"
+        v-model="settings.envVars"
+        autocomplete="off"
+        type="text"
+        class="installation-input"
+        placeholder="Enter environmental variables..."
+      />
+      <hr class="card-divider" />
+      <div class="adjacent-input">
+        <label for="max-memory">
+          <span class="label__title">Java memory</span>
+          <span class="label__description">
+            The memory allocated to each instance when it is ran.
+          </span>
+        </label>
+        <Slider
+          id="max-memory"
+          v-model="settings.memory.maximum"
+          :min="8"
+          :max="maxMemory"
+          :step="64"
+          unit="mb"
+        />
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">Hooks</span>
+        </h3>
+      </div>
+      <div class="adjacent-input">
+        <label for="pre-launch">
+          <span class="label__title">Pre launch</span>
+          <span class="label__description"> Ran before the instance is launched. </span>
+        </label>
+        <input
+          id="pre-launch"
+          v-model="settings.hooks.pre_launch"
+          autocomplete="off"
+          type="text"
+          placeholder="Enter pre-launch command..."
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="wrapper">
+          <span class="label__title">Wrapper</span>
+          <span class="label__description"> Wrapper command for launching Minecraft. </span>
+        </label>
+        <input
+          id="wrapper"
+          v-model="settings.hooks.wrapper"
+          autocomplete="off"
+          type="text"
+          placeholder="Enter wrapper command..."
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="post-exit">
+          <span class="label__title">Post exit</span>
+          <span class="label__description"> Ran after the game closes. </span>
+        </label>
+        <input
+          id="post-exit"
+          v-model="settings.hooks.post_exit"
+          autocomplete="off"
+          type="text"
+          placeholder="Enter post-exit command..."
+        />
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">Window size</span>
+        </h3>
+      </div>
+      <div class="adjacent-input">
+        <label for="fullscreen">
+          <span class="label__title">Fullscreen</span>
+          <span class="label__description">
+            Overwrites the options.txt file to start in full screen when launched.
+          </span>
+        </label>
+        <Toggle
+          id="fullscreen"
+          :model-value="settings.force_fullscreen"
+          :checked="settings.force_fullscreen"
+          @update:model-value="
+            (e) => {
+              settings.force_fullscreen = e
+            }
+          "
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="width">
+          <span class="label__title">Width</span>
+          <span class="label__description"> The width of the game window when launched. </span>
+        </label>
+        <input
+          id="width"
+          v-model="settings.game_resolution[0]"
+          :disabled="settings.force_fullscreen"
+          autocomplete="off"
+          type="number"
+          placeholder="Enter width..."
+        />
+      </div>
+      <div class="adjacent-input">
+        <label for="height">
+          <span class="label__title">Height</span>
+          <span class="label__description"> The height of the game window when launched. </span>
+        </label>
+        <input
+          id="height"
+          v-model="settings.game_resolution[1]"
+          :disabled="settings.force_fullscreen"
+          autocomplete="off"
+          type="number"
+          class="input"
+          placeholder="Enter height..."
+        />
+      </div>
+    </Card>
+    <Card>
+      <div class="label">
+        <h3>
+          <span class="label__title size-card-header">About</span>
+        </h3>
+      </div>
+      <div>
+        <label>
+          <span class="label__title">App version</span>
+          <span class="label__description">Modrinth App v{{ version }} </span>
+        </label>
+      </div>
+    </Card>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.settings-page {
+  margin: 1rem;
+}
+
+.installation-input {
+  width: 100% !important;
+  flex-grow: 1;
+}
+
+.theme-dropdown {
+  text-transform: capitalize;
+}
+
+.card-divider {
+  margin: 1rem 0;
+}
+
+.app-directory {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: var(--gap-sm);
+
+  .iconified-input {
+    flex-grow: 1;
+
+    input {
+      flex-basis: auto;
+    }
+  }
+}
+</style>
--- a/apps/app-frontend/src/pages/index.js
+++ b/apps/app-frontend/src/pages/index.js
@@ -1,4 +1,6 @@
 import Index from './Index.vue'
 import Browse from './Browse.vue'
+import Library from './Library.vue'
+import Settings from './Settings.vue'

-export { Index, Browse }
+export { Index, Browse, Library, Settings }
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -1,129 +1,98 @@
 <template>
-  <div
-    class="p-6 pr-2 pb-4"
-    @contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
-  >
-    <ExportModal ref="exportModal" :instance="instance" />
-    <InstanceSettingsModal ref="settingsModal" :instance="instance" :offline="offline" />
-    <ContentPageHeader>
-      <template #icon>
-        <Avatar :src="icon" :alt="instance.name" size="96px" :tint-by="instance.path" />
-      </template>
-      <template #title>
-        {{ instance.name }}
-      </template>
-      <template #summary> </template>
-      <template #stats>
-        <div
-          class="flex items-center gap-2 font-semibold transform capitalize border-0 border-solid border-divider pr-4 md:border-r"
-        >
-          <GameIcon class="h-6 w-6 text-secondary" />
-          {{ instance.loader }} {{ instance.game_version }}
+  <div class="instance-container">
+    <div class="side-cards">
+      <Card class="instance-card" @contextmenu.prevent.stop="handleRightClick">
+        <Avatar size="lg" :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null" />
+        <div class="instance-info">
+          <h2 class="name">{{ instance.name }}</h2>
+          <span class="metadata"> {{ instance.loader }} {{ instance.game_version }} </span>
        </div>
-        <div class="flex items-center gap-2 font-semibold">
-          <TimerIcon class="h-6 w-6 text-secondary" />
-          <template v-if="timePlayed > 0">
-            {{ timePlayedHumanized }}
-          </template>
-          <template v-else> Never played </template>
-        </div>
-      </template>
-      <template #actions>
-        <div class="flex gap-2">
-          <ButtonStyled v-if="instance.install_stage !== 'installed'" color="brand" size="large">
-            <button disabled>Installing...</button>
-          </ButtonStyled>
-          <ButtonStyled v-else-if="playing === true" color="red" size="large">
-            <button @click="stopInstance('InstancePage')">
-              <StopCircleIcon />
-              Stop
-            </button>
-          </ButtonStyled>
-          <ButtonStyled
+        <span class="button-group">
+          <Button v-if="instance.install_stage !== 'installed'" disabled class="instance-button">
+            Installing...
+          </Button>
+          <Button
+            v-else-if="playing === true"
+            color="danger"
+            class="instance-button"
+            @click="stopInstance('InstancePage')"
+          >
+            <StopCircleIcon />
+            Stop
+          </Button>
+          <Button
            v-else-if="playing === false && loading === false"
-            color="brand"
-            size="large"
+            color="primary"
+            class="instance-button"
+            @click="startInstance('InstancePage')"
          >
-            <button @click="startInstance('InstancePage')">
-              <PlayIcon />
-              Play
-            </button>
-          </ButtonStyled>
-          <ButtonStyled
+            <PlayIcon />
+            Play
+          </Button>
+          <Button
            v-else-if="loading === true && playing === false"
-            color="brand"
-            size="large"
+            disabled
+            class="instance-button"
          >
-            <button disabled>Loading...</button>
-          </ButtonStyled>
-          <ButtonStyled size="large" circular>
-            <button v-tooltip="'Instance settings'" @click="settingsModal.show()">
-              <SettingsIcon />
-            </button>
-          </ButtonStyled>
-          <ButtonStyled size="large" type="transparent" circular>
-            <OverflowMenu
-              :options="[
-                {
-                  id: 'open-folder',
-                  action: () => showProfileInFolder(instance.path),
-                },
-                {
-                  id: 'export-mrpack',
-                  action: () => $refs.exportModal.show(),
-                },
-              ]"
-            >
-              <MoreVerticalIcon />
-              <template #share-instance> <UserPlusIcon /> Share instance </template>
-              <template #host-a-server> <ServerIcon /> Create a server </template>
-              <template #open-folder> <FolderOpenIcon /> Open folder </template>
-              <template #export-mrpack> <PackageIcon /> Export modpack </template>
-            </OverflowMenu>
-          </ButtonStyled>
+            Loading...
+          </Button>
+          <Button
+            v-tooltip="'Open instance folder'"
+            class="instance-button"
+            @click="showProfileInFolder(instance.path)"
+          >
+            <FolderOpenIcon />
+            Folder
+          </Button>
+        </span>
+        <hr class="card-divider" />
+        <div class="pages-list">
+          <RouterLink :to="`/instance/${encodeURIComponent($route.params.id)}/`" class="btn">
+            <BoxIcon />
+            Content
+          </RouterLink>
+          <RouterLink :to="`/instance/${encodeURIComponent($route.params.id)}/logs`" class="btn">
+            <FileIcon />
+            Logs
+          </RouterLink>
+          <RouterLink :to="`/instance/${encodeURIComponent($route.params.id)}/options`" class="btn">
+            <SettingsIcon />
+            Options
+          </RouterLink>
        </div>
-      </template>
-    </ContentPageHeader>
-  </div>
-  <div class="px-6">
-    <NavTabs :links="tabs" />
-  </div>
-  <div class="p-6 pt-4">
-    <RouterView v-slot="{ Component }" :key="instance.path">
-      <template v-if="Component">
-        <Suspense
-          :key="instance.path"
-          @pending="loadingBar.startLoading()"
-          @resolve="loadingBar.stopLoading()"
-        >
-          <component
-            :is="Component"
-            :instance="instance"
-            :options="options"
-            :offline="offline"
-            :playing="playing"
-            :versions="modrinthVersions"
-            :installed="instance.install_stage !== 'installed'"
-          ></component>
-          <template #fallback>
-            <LoadingIndicator />
-          </template>
-        </Suspense>
-      </template>
-    </RouterView>
+      </Card>
+    </div>
+    <div class="content">
+      <PromotionWrapper />
+      <RouterView v-slot="{ Component }">
+        <template v-if="Component">
+          <Suspense @pending="loadingBar.startLoading()" @resolve="loadingBar.stopLoading()">
+            <component
+              :is="Component"
+              :instance="instance"
+              :options="options"
+              :offline="offline"
+              :playing="playing"
+              :versions="modrinthVersions"
+              :installed="instance.install_stage !== 'installed'"
+            ></component>
+          </Suspense>
+        </template>
+      </RouterView>
+    </div>
  </div>
  <ContextMenu ref="options" @option-clicked="handleOptionsClick">
    <template #play> <PlayIcon /> Play </template>
    <template #stop> <StopCircleIcon /> Stop </template>
-    <template #add_content> <PlusIcon /> Add content </template>
+    <template #add_content> <PlusIcon /> Add Content </template>
    <template #edit> <EditIcon /> Edit </template>
-    <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
-    <template #open_folder> <ClipboardCopyIcon /> Open folder </template>
-    <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
-    <template #open_link> <ClipboardCopyIcon /> Open in Modrinth <ExternalIcon /> </template>
+    <template #copy_path> <ClipboardCopyIcon /> Copy Path </template>
+    <template #open_folder> <ClipboardCopyIcon /> Open Folder </template>
+    <template #copy_link> <ClipboardCopyIcon /> Copy Link </template>
+    <template #open_link> <ClipboardCopyIcon /> Open In Modrinth <ExternalIcon /> </template>
    <template #copy_names><EditIcon />Copy names</template>
    <template #copy_slugs><HashIcon />Copy slugs</template>
-    <template #copy_links><GlobeIcon />Copy links</template>
+    <template #copy_links><GlobeIcon />Copy Links</template>
    <template #toggle><EditIcon />Toggle selected</template>
    <template #disable><XIcon />Disable selected</template>
    <template #enable><CheckCircleIcon />Enable selected</template>
@@ -135,18 +104,11 @@
  </ContextMenu>
 </template>
 <script setup>
+import { Button, Avatar, Card } from '@modrinth/ui'
 import {
-  Avatar,
-  ContentPageHeader,
-  ButtonStyled,
-  OverflowMenu,
-  LoadingIndicator,
-} from '@modrinth/ui'
-import {
-  UserPlusIcon,
-  ServerIcon,
-  PackageIcon,
+  BoxIcon,
  SettingsIcon,
+  FileIcon,
  PlayIcon,
  StopCircleIcon,
  EditIcon,
@@ -160,94 +122,28 @@ import {
  XIcon,
  CheckCircleIcon,
  UpdatedIcon,
-  MoreVerticalIcon,
-  GameIcon,
-  TimerIcon,
 } from '@modrinth/assets'
-import { get, get_full_path, kill, run } from '@/helpers/profile'
+import { get, kill, run } from '@/helpers/profile'
 import { get_by_profile_path } from '@/helpers/process'
 import { process_listener, profile_listener } from '@/helpers/events'
 import { useRoute, useRouter } from 'vue-router'
-import { ref, onUnmounted, computed, watch } from 'vue'
+import { ref, onUnmounted } from 'vue'
 import { handleError, useBreadcrumbs, useLoading } from '@/store/state'
 import { showProfileInFolder } from '@/helpers/utils.js'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
-import NavTabs from '@/components/ui/NavTabs.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { handleSevereError } from '@/store/error.js'
 import { get_project, get_version_many } from '@/helpers/cache.js'
 import dayjs from 'dayjs'
-import duration from 'dayjs/plugin/duration'
-import relativeTime from 'dayjs/plugin/relativeTime'
-import ExportModal from '@/components/ui/ExportModal.vue'
-import InstanceSettingsModal from '@/components/ui/modal/InstanceSettingsModal.vue'
-
-dayjs.extend(duration)
-dayjs.extend(relativeTime)
+import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'

 const route = useRoute()

 const router = useRouter()
 const breadcrumbs = useBreadcrumbs()

-const offline = ref(!navigator.onLine)
-window.addEventListener('offline', () => {
-  offline.value = true
-})
-window.addEventListener('online', () => {
-  offline.value = false
-})
-
-const instance = ref()
-const modrinthVersions = ref([])
-const playing = ref(false)
-const loading = ref(false)
-
-async function fetchInstance() {
-  instance.value = await get(route.params.id).catch(handleError)
-
-  if (!offline.value && instance.value.linked_data && instance.value.linked_data.project_id) {
-    get_project(instance.value.linked_data.project_id, 'must_revalidate')
-      .catch(handleError)
-      .then((project) => {
-        if (project && project.versions) {
-          get_version_many(project.versions, 'must_revalidate')
-            .catch(handleError)
-            .then((versions) => {
-              modrinthVersions.value = versions.sort(
-                (a, b) => dayjs(b.date_published) - dayjs(a.date_published),
-              )
-            })
-        }
-      })
-  }
-
-  const runningProcesses = await get_by_profile_path(route.params.id).catch(handleError)
-
-  playing.value = runningProcesses.length > 0
-}
-
-await fetchInstance()
-watch(
-  () => route.params.id,
-  async () => {
-    if (route.params.id && route.path.startsWith('/instance')) {
-      await fetchInstance()
-    }
-  },
-)
-
-const tabs = computed(() => [
-  {
-    label: 'Content',
-    href: `/instance/${encodeURIComponent(route.params.id)}`,
-  },
-  {
-    label: 'Logs',
-    href: `/instance/${encodeURIComponent(route.params.id)}/logs`,
-  },
-])
+const instance = ref(await get(route.params.id).catch(handleError))

 breadcrumbs.setName(
  'Instance',
@@ -262,8 +158,18 @@ breadcrumbs.setContext({
  query: route.query,
 })

+const offline = ref(!navigator.onLine)
+window.addEventListener('offline', () => {
+  offline.value = true
+})
+window.addEventListener('online', () => {
+  offline.value = false
+})
+
 const loadingBar = useLoading()

+const playing = ref(false)
+const loading = ref(false)
 const options = ref(null)

 const startInstance = async (context) => {
@@ -283,6 +189,32 @@ const startInstance = async (context) => {
  })
 }

+const checkProcess = async () => {
+  const runningProcesses = await get_by_profile_path(route.params.id).catch(handleError)
+
+  playing.value = runningProcesses.length > 0
+}
+
+// Get information on associated modrinth versions, if any
+const modrinthVersions = ref([])
+if (!offline.value && instance.value.linked_data && instance.value.linked_data.project_id) {
+  get_project(instance.value.linked_data.project_id, 'must_revalidate')
+    .catch(handleError)
+    .then((project) => {
+      if (project && project.versions) {
+        get_version_many(project.versions, 'must_revalidate')
+          .catch(handleError)
+          .then((versions) => {
+            modrinthVersions.value = versions.sort(
+              (a, b) => dayjs(b.date_published) - dayjs(a.date_published),
+            )
+          })
+      }
+    })
+}
+
+await checkProcess()
+
 const stopInstance = async (context) => {
  playing.value = false
  await kill(route.params.id).catch(handleError)
@@ -346,11 +278,9 @@ const handleOptionsClick = async (args) => {
    case 'open_folder':
      await showProfileInFolder(instance.value.path)
      break
-    case 'copy_path': {
-      const fullPath = await get_full_path(instance.value.path)
-      await navigator.clipboard.writeText(fullPath)
+    case 'copy_path':
+      await navigator.clipboard.writeText(instance.value.path)
      break
-    }
  }
 }

@@ -367,35 +297,7 @@ const unlistenProfiles = await profile_listener(async (event) => {
 })

 const unlistenProcesses = await process_listener((e) => {
-  if (e.event === 'finished' && e.profile_path_id === route.params.id) {
-    playing.value = false
-  }
-})
-
-const icon = computed(() =>
-  instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : null,
-)
-
-const settingsModal = ref()
-
-const timePlayed = computed(() => {
-  return instance.value.recent_time_played + instance.value.submitted_time_played
-})
-
-const timePlayedHumanized = computed(() => {
-  const duration = dayjs.duration(timePlayed.value, 'seconds')
-  const hours = Math.floor(duration.asHours())
-  if (hours >= 1) {
-    return hours + ' hour' + (hours > 1 ? 's' : '')
-  }
-
-  const minutes = Math.floor(duration.asMinutes())
-  if (minutes >= 1) {
-    return minutes + ' minute' + (minutes > 1 ? 's' : '')
-  }
-
-  const seconds = Math.floor(duration.asSeconds())
-  return seconds + ' second' + (seconds > 1 ? 's' : '')
+  if (e.event === 'finished' && e.profile_path_id === route.params.id) playing.value = false
 })

 onUnmounted(() => {
@@ -409,6 +311,7 @@ onUnmounted(() => {
  display: flex;
  flex-direction: column;
  gap: 1rem;
+  width: 17rem;
 }

 Button {
@@ -422,13 +325,12 @@ Button {
 }

 .side-cards {
-  position: fixed;
-  width: 300px;
+  position: absolute;
  display: flex;
  flex-direction: column;
-
-  min-height: calc(100vh - 3.25rem);
-  max-height: calc(100vh - 3.25rem);
+  padding: 1rem;
+  min-height: calc(100% - 3.25rem);
+  max-height: calc(100% - 3.25rem);
  overflow-y: auto;
  -ms-overflow-style: none;
  scrollbar-width: none;
@@ -472,7 +374,10 @@ Button {
  overflow: auto;
  gap: 1rem;
  min-height: 100%;
-  padding: 1rem;
+}
+
+.content {
+  margin-left: 19rem;
 }

 .instance-info {
@@ -546,10 +451,10 @@ Button {
 }

 .content {
-  margin: 0 1rem 0.5rem 20rem;
-  width: calc(100% - 20rem);
+  width: 100%;
  display: flex;
  flex-direction: column;
+  padding: 1rem 1rem 0 0;
  overflow: auto;
 }

--- a/apps/app-frontend/src/pages/instance/Logs.vue
+++ b/apps/app-frontend/src/pages/instance/Logs.vue
@@ -76,7 +76,7 @@
        </div>
      </RecycleScroller>
    </div>
-    <ShareModalWrapper
+    <ShareModal
      ref="shareModal"
      header="Share Log"
      share-title="Instance Log"
@@ -89,7 +89,7 @@

 <script setup>
 import { CheckIcon, ClipboardCopyIcon, ShareIcon, TrashIcon } from '@modrinth/assets'
-import { Button, Card, Checkbox, DropdownSelect } from '@modrinth/ui'
+import { Button, Card, ShareModal, Checkbox, DropdownSelect } from '@modrinth/ui'
 import {
  delete_logs_by_filename,
  get_logs,
@@ -107,7 +107,6 @@ import { handleError } from '@/store/notifications.js'
 import { ofetch } from 'ofetch'
 import { RecycleScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'

 dayjs.extend(isToday)
 dayjs.extend(isYesterday)
@@ -296,7 +295,7 @@ if (logs.value.length > 1 && !props.playing) {

 const deleteLog = async () => {
  if (logs.value[selectedLogIndex.value] && selectedLogIndex.value !== 0) {
-    const deleteIndex = selectedLogIndex.value
+    let deleteIndex = selectedLogIndex.value
    selectedLogIndex.value = deleteIndex - 1
    await delete_logs_by_filename(
      props.instance.path,
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
--- a/apps/app-frontend/src/pages/instance/Options.vue
+++ b/apps/app-frontend/src/pages/instance/Options.vue
--- a/apps/app-frontend/src/pages/instance/index.js
+++ b/apps/app-frontend/src/pages/instance/index.js
@@ -1,5 +1,6 @@
 import Index from './Index.vue'
 import Mods from './Mods.vue'
+import Options from './Options.vue'
 import Logs from './Logs.vue'

-export { Index, Mods, Logs }
+export { Index, Mods, Options, Logs }
--- a/apps/app-frontend/src/pages/library/Custom.vue
+++ b/apps/app-frontend/src/pages/library/Custom.vue
@@ -1,17 +0,0 @@
-<script setup>
-import GridDisplay from '@/components/GridDisplay.vue'
-
-defineProps({
-  instances: {
-    type: Array,
-    required: true,
-  },
-})
-</script>
-<template>
-  <GridDisplay
-    v-if="instances.length > 0"
-    label="Instances"
-    :instances="instances.filter((i) => !i.linked_data)"
-  />
-</template>
--- a/apps/app-frontend/src/pages/library/Downloaded.vue
+++ b/apps/app-frontend/src/pages/library/Downloaded.vue
@@ -1,17 +0,0 @@
-<script setup>
-import GridDisplay from '@/components/GridDisplay.vue'
-
-defineProps({
-  instances: {
-    type: Array,
-    required: true,
-  },
-})
-</script>
-<template>
-  <GridDisplay
-    v-if="instances.length > 0"
-    label="Instances"
-    :instances="instances.filter((i) => i.linked_data)"
-  />
-</template>
--- a/apps/app-frontend/src/pages/library/Overview.vue
+++ b/apps/app-frontend/src/pages/library/Overview.vue
@@ -1,13 +0,0 @@
-<script setup>
-import GridDisplay from '@/components/GridDisplay.vue'
-
-defineProps({
-  instances: {
-    type: Array,
-    required: true,
-  },
-})
-</script>
-<template>
-  <GridDisplay v-if="instances.length > 0" label="Instances" :instances="instances" />
-</template>
--- a/apps/app-frontend/src/pages/library/index.js
+++ b/apps/app-frontend/src/pages/library/index.js
@@ -1,6 +0,0 @@
-import Index from './Index.vue'
-import Overview from './Overview.vue'
-import Downloaded from './Downloaded.vue'
-import Custom from './Custom.vue'
-
-export { Index, Overview, Downloaded, Custom }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jakob	75f9fa5daf	Added confirm for checking discussion threads Signed-off-by: Jakob <minenash@protonmail.com>	2024-08-28 01:17:31 -04:00
Jakob	c9d34feab7	fixed tag in web bug report Signed-off-by: Jakob <minenash@protonmail.com>	2024-08-28 01:12:55 -04:00