diff --git a/.cargo/config.toml b/.cargo/config.toml
index a52d5a685..7c929d5fb 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,6 +1,6 @@
-# Windows has stack overflows when calling from Tauri, so we increase compiler size
+# Windows has stack overflows when calling from Tauri, so we increase the default stack size used by the compiler
 [target.'cfg(windows)']
 rustflags = ["-C", "link-args=/STACK:16777220"]
 
 [build]
-rustflags = ["--cfg", "tokio_unstable"]
\ No newline at end of file
+rustflags = ["--cfg", "tokio_unstable"]
diff --git a/.github/workflows/theseus-release.yml b/.github/workflows/theseus-release.yml
index a234fb8d7..354cb6c86 100644
--- a/.github/workflows/theseus-release.yml
+++ b/.github/workflows/theseus-release.yml
@@ -33,16 +33,16 @@ jobs:
 
       - name: Rust setup (mac)
         if: startsWith(matrix.platform, 'macos')
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          components: rustfmt, clippy
-          targets: aarch64-apple-darwin, x86_64-apple-darwin
+          rustflags: ''
+          target: x86_64-apple-darwin
 
       - name: Rust setup
         if: "!startsWith(matrix.platform, 'macos')"
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          components: rustfmt, clippy
+          rustflags: ''
 
       - name: Setup rust cache
         uses: actions/cache@v4
@@ -73,10 +73,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-rust-target-
 
-      - name: Use Node.js
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: .nvmrc
 
       - name: Install pnpm via corepack
         shell: bash
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddfb..7ddfc9ed4 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..ba331903d
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+20.19.2
diff --git a/Cargo.lock b/Cargo.lock
index 01c43b4b5..16c56b3a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -103,7 +103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -141,7 +141,7 @@ dependencies = [
  "parse-size",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -259,7 +259,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -302,9 +302,9 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
@@ -341,9 +341,12 @@ dependencies = [
 
 [[package]]
 name = "aligned-vec"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
 
 [[package]]
 name = "alloc-no-stdlib"
@@ -383,9 +386,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -398,33 +401,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.8"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
@@ -454,7 +457,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -551,12 +554,12 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.23"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
+checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4"
 dependencies = [
  "brotli 8.0.1",
- "bzip2",
+ "bzip2 0.6.0",
  "deflate64",
  "flate2",
  "futures-core",
@@ -625,9 +628,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc"
 dependencies = [
  "async-channel 2.3.1",
  "async-io",
@@ -638,7 +641,7 @@ dependencies = [
  "cfg-if",
  "event-listener 5.4.0",
  "futures-lite 2.6.0",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "tracing",
 ]
 
@@ -650,14 +653,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d"
 dependencies = [
  "async-io",
  "async-lock",
@@ -665,7 +668,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.59.0",
@@ -690,7 +693,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -731,7 +734,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -827,7 +830,7 @@ checksum = "07a9b245ba0739fc90935094c29adbaee3f977218b5fb95e822e261cda7f56a3"
 dependencies = [
  "http 1.3.1",
  "log",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "serde",
  "serde_json",
  "url",
@@ -836,9 +839,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "av1-grain"
@@ -983,9 +986,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.7.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
 [[package]]
 name = "bit-set"
@@ -1110,7 +1113,7 @@ dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1172,9 +1175,9 @@ checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
 
 [[package]]
 name = "bytecheck"
@@ -1200,9 +1203,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.23.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 
 [[package]]
 name = "byteorder"
@@ -1243,6 +1246,15 @@ dependencies = [
  "bzip2-sys",
 ]
 
+[[package]]
+name = "bzip2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bea8dcd42434048e4f7a304411d9273a411f647446c1234a65ce0554923f4cff"
+dependencies = [
+ "libbz2-rs-sys",
+]
+
 [[package]]
 name = "bzip2-sys"
 version = "0.1.13+1.0.8"
@@ -1280,9 +1292,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.9"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
 dependencies = [
  "serde",
 ]
@@ -1322,9 +1334,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.24"
+version = "1.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
 dependencies = [
  "jobserver",
  "libc",
@@ -1369,9 +1381,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "cfg_aliases"
@@ -1379,6 +1391,17 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chardetng"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea"
+dependencies = [
+ "cfg-if",
+ "encoding_rs",
+ "memchr",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.41"
@@ -1412,9 +1435,9 @@ checksum = "93a719913643003b84bd13022b4b7e703c09342cd03b679c4641c7d2e50dc34d"
 
 [[package]]
 name = "clap"
-version = "4.5.38"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1422,9 +1445,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.38"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1434,27 +1457,27 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "clickhouse"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9894248c4c5a4402f76a56c273836a0c32547ec8a68166aedee7e01b7b8d102"
+checksum = "9a9a81a1dffadd762ee662635ce409232258ce9beebd7cc0fa227df0b5e7efc0"
 dependencies = [
  "bstr",
  "bytes",
@@ -1486,7 +1509,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1506,9 +1529,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "combine"
@@ -1542,7 +1565,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
- "unicode-width 0.2.0",
+ "unicode-width 0.2.1",
  "windows-sys 0.59.0",
 ]
 
@@ -1837,7 +1860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1868,7 +1891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1928,7 +1951,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1939,7 +1962,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2038,7 +2061,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2059,7 +2082,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2069,7 +2092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2082,7 +2105,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2102,7 +2125,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "unicode-xid",
 ]
 
@@ -2146,7 +2169,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users 0.5.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2211,7 +2234,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2228,13 +2251,13 @@ dependencies = [
 
 [[package]]
 name = "dlopen2_derive"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
+checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2355,16 +2378,16 @@ checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
 
 [[package]]
 name = "embed-resource"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbc6e0d8e0c03a655b53ca813f0463d2c956bc4db8138dbc89f120b066551e3"
+checksum = "0963f530273dc3022ab2bdc3fcd6d488e850256f2284a82b7413cb9481ee85dd"
 dependencies = [
  "cc",
  "memchr",
  "rustc_version",
  "toml",
  "vswhom",
- "winreg 0.52.0",
+ "winreg 0.55.0",
 ]
 
 [[package]]
@@ -2403,14 +2426,14 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "enumflags2"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -2418,13 +2441,13 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2446,7 +2469,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2474,6 +2497,26 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.103",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -2634,9 +2677,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "libz-rs-sys",
@@ -2693,7 +2736,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2854,7 +2897,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -3036,7 +3079,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -3136,7 +3179,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -3226,7 +3269,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -3304,9 +3347,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -3319,7 +3362,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -3349,15 +3392,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -3627,14 +3664,14 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.6"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
  "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
@@ -3674,22 +3711,28 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
+checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http 1.3.1",
  "http-body 1.0.1",
  "hyper 1.6.0",
+ "ipnet",
  "libc",
+ "percent-encoding",
  "pin-project-lite",
  "socket2",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
@@ -3864,9 +3907,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
+checksum = "14d75c7014ddab93c232bc6bb9f64790d3dfd1d605199acd4b40b6d69e691e9f"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -3902,7 +3945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "serde",
 ]
 
@@ -3915,7 +3958,7 @@ dependencies = [
  "console",
  "number_prefix",
  "portable-atomic",
- "unicode-width 0.2.0",
+ "unicode-width 0.2.1",
  "web-time",
 ]
 
@@ -3993,7 +4036,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4020,6 +4063,16 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763"
 
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -4035,7 +4088,7 @@ version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi 0.5.1",
+ "hermit-abi",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -4375,7 +4428,7 @@ dependencies = [
  "webp",
  "woothee",
  "yaserde",
- "zip 3.0.0",
+ "zip",
  "zxcvbn",
 ]
 
@@ -4402,9 +4455,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "lettre"
-version = "0.11.16"
+version = "0.11.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2"
+checksum = "cb2a0354e9ece2fcdcf9fa53417f6de587230c0c248068eb058fa26c4a753179"
 dependencies = [
  "base64 0.22.1",
  "chumsky",
@@ -4419,7 +4472,7 @@ dependencies = [
  "nom 8.0.0",
  "percent-encoding",
  "quoted_printable",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-native-certs 0.8.1",
  "socket2",
  "tokio",
@@ -4451,10 +4504,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.172"
+name = "libbz2-rs-sys"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "775bf80d5878ab7c2b1080b5351a48b2f737d9f6f8b383574eebcc22be0dfccb"
+
+[[package]]
+name = "libc"
+version = "0.2.174"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -4516,9 +4575,9 @@ dependencies = [
 
 [[package]]
 name = "libz-rs-sys"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
 dependencies = [
  "zlib-rs",
 ]
@@ -4560,9 +4619,9 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -4604,9 +4663,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "lz4_flex"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
+checksum = "2c592ad9fbc1b7838633b3ae55ce69b17d01150c72fcef229fbb819d39ee51ee"
 
 [[package]]
 name = "mac"
@@ -4683,7 +4742,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4722,7 +4781,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4754,9 +4813,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memoffset"
@@ -4806,9 +4865,9 @@ checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -4822,7 +4881,7 @@ checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
  "windows-sys 0.59.0",
 ]
 
@@ -5119,7 +5178,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5175,11 +5234,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -5201,7 +5260,7 @@ dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5501,9 +5560,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.9.1",
  "cfg-if",
@@ -5522,7 +5581,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5533,9 +5592,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -5571,11 +5630,12 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9"
+checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
 dependencies = [
  "log",
+ "plist",
  "serde",
  "windows-sys 0.52.0",
 ]
@@ -5645,9 +5705,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -5655,9 +5715,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -5814,7 +5874,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5861,7 +5921,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5916,13 +5976,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plist"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d"
+checksum = "3d77244ce2d584cd84f6a15f86195b8c9b2a0dfbfd817c09e0464244091a58ed"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.9.0",
- "quick-xml 0.32.0",
+ "quick-xml 0.37.5",
  "serde",
  "time",
 ]
@@ -5948,7 +6008,7 @@ checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.5.1",
+ "hermit-abi",
  "pin-project-lite",
  "rustix 1.0.7",
  "tracing",
@@ -5957,9 +6017,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
@@ -6054,7 +6114,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml_edit 0.22.26",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -6100,7 +6160,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -6156,7 +6216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
 dependencies = [
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -6196,7 +6256,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -6329,7 +6389,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "socket2",
  "thiserror 2.0.12",
  "tokio",
@@ -6349,7 +6409,7 @@ dependencies = [
  "rand 0.9.1",
  "ring",
  "rustc-hash",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.12",
@@ -6389,9 +6449,9 @@ checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "r2d2"
@@ -6622,9 +6682,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
 dependencies = [
  "bitflags 2.9.1",
 ]
@@ -6651,6 +6711,26 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.103",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -6718,9 +6798,9 @@ checksum = "51743d3e274e2b18df81c4dc6caf8a5b8e15dbe799e0dca05c7617380094e884"
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.12.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
@@ -6734,38 +6814,34 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.6",
+ "hyper-rustls 0.27.7",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-native-certs 0.8.1",
- "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration",
  "tokio",
  "tokio-rustls 0.26.2",
  "tokio-util",
  "tower 0.5.2",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 0.26.11",
- "windows-registry 0.4.0",
+ "webpki-roots 1.0.0",
 ]
 
 [[package]]
@@ -6938,9 +7014,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.37.1"
+version = "1.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
+checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d"
 dependencies = [
  "arrayvec",
  "borsh",
@@ -6959,7 +7035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6268b74858287e1a062271b988a0c534bf85bbeb567fe09331bf40ed78113d5"
 dependencies = [
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -6976,9 +7052,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
 name = "rustc-hash"
@@ -7035,9 +7111,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
 dependencies = [
  "log",
  "once_cell",
@@ -7055,7 +7131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 1.0.4",
+ "rustls-pemfile",
  "schannel",
  "security-framework 2.11.1",
 ]
@@ -7081,15 +7157,6 @@ dependencies = [
  "base64 0.21.7",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "rustls-pki-types"
 version = "1.12.0"
@@ -7202,6 +7269,18 @@ dependencies = [
  "uuid 1.17.0",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "schemars_derive"
 version = "0.8.22"
@@ -7211,7 +7290,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7250,7 +7329,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7340,7 +7419,7 @@ checksum = "a505499b38861edd82b5a688fa06ba4ba5875bb832adeeeba22b7b23fc4bc39a"
 dependencies = [
  "httpdate",
  "reqwest",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
@@ -7473,9 +7552,9 @@ dependencies = [
 
 [[package]]
 name = "serde-xml-rs"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176b7ff880ab6ead7a020e773e9c096467fe347615a3e22ac29300cbdef67a5d"
+checksum = "53630160a98edebde0123eb4dfd0fce6adff091b2305db3154a9e920206eb510"
 dependencies = [
  "log",
  "serde",
@@ -7510,7 +7589,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7521,7 +7600,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7596,14 +7675,14 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -7617,7 +7696,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7634,15 +7713,16 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.9.0",
+ "schemars 0.9.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -7652,14 +7732,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7791,18 +7871,15 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 dependencies = [
  "serde",
 ]
@@ -7954,7 +8031,7 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "hashlink",
  "indexmap 2.9.0",
  "log",
@@ -7962,7 +8039,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "rust_decimal",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "serde",
  "serde_json",
  "sha2",
@@ -7985,7 +8062,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -8008,7 +8085,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.101",
+ "syn 2.0.103",
  "tokio",
  "url",
 ]
@@ -8209,7 +8286,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -8220,7 +8297,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -8253,9 +8330,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8279,7 +8356,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -8293,9 +8370,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.35.1"
+version = "0.35.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79251336d17c72d9762b8b54be4befe38d2db56fbbc0241396d70f173c39d47a"
+checksum = "3c3ffa3e4ff2b324a57f7aeb3c349656c7b127c3c189520251a648102a92496e"
 dependencies = [
  "libc",
  "memchr",
@@ -8392,7 +8469,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -8483,7 +8560,7 @@ dependencies = [
  "heck 0.5.0",
  "json-patch 3.0.1",
  "quote",
- "schemars",
+ "schemars 0.8.22",
  "semver",
  "serde",
  "serde_json",
@@ -8512,7 +8589,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "syn 2.0.101",
+ "syn 2.0.103",
  "tauri-utils",
  "thiserror 2.0.12",
  "time",
@@ -8530,7 +8607,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "tauri-codegen",
  "tauri-utils",
 ]
@@ -8544,7 +8621,7 @@ dependencies = [
  "anyhow",
  "glob",
  "plist",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "serde_json",
  "tauri-utils",
@@ -8568,7 +8645,7 @@ dependencies = [
  "thiserror 2.0.12",
  "tracing",
  "url",
- "windows-registry 0.5.2",
+ "windows-registry",
  "windows-result",
 ]
 
@@ -8600,7 +8677,7 @@ dependencies = [
  "dunce",
  "glob",
  "percent-encoding",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "serde_json",
  "serde_repr",
@@ -8614,16 +8691,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.2.7"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66644b71a31ec1a8a52c4a16575edd28cf763c87cf4a7da24c884122b5c77097"
+checksum = "2c8983f50326d34437142a6d560b5c3426e91324297519b6eeb32ed0a1d1e0f2"
 dependencies = [
  "dunce",
  "glob",
  "objc2-app-kit",
  "objc2-foundation 0.3.1",
  "open",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "serde_json",
  "tauri",
@@ -8636,9 +8713,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-os"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "424f19432397850c2ddd42aa58078630c15287bbce3866eb1d90e7dbee680637"
+checksum = "9009b6d2de65fe56bbcd31c3fe79ad03299d43f7a1b2841209f92bc8235d3efb"
 dependencies = [
  "gethostname",
  "log",
@@ -8669,9 +8746,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-updater"
-version = "2.7.1"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f05c38afd77a4b8fd98e8fb6f1cdbb5fbb8a46ba181eb2758b05321e3c6209"
+checksum = "b068673e9037376ca9906f99b00ae5f9e6eb62f456f900b4435c38d57cfa73e4"
 dependencies = [
  "base64 0.22.1",
  "dirs",
@@ -8695,15 +8772,15 @@ dependencies = [
  "time",
  "tokio",
  "url",
- "windows-sys 0.59.0",
- "zip 2.4.2",
+ "windows-sys 0.60.2",
+ "zip",
 ]
 
 [[package]]
 name = "tauri-plugin-window-state"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27a3fe49de72adbe0d84aee33c89a0b059722cd0b42aaeab29eaaee7f7535cd"
+checksum = "136e5ce5e61edc8eeeaca70080811bbdcdd890cac9c4070cb4db9cc3de1da449"
 dependencies = [
  "bitflags 2.9.1",
  "log",
@@ -8786,7 +8863,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "schemars",
+ "schemars 0.8.22",
  "semver",
  "serde",
  "serde-untagged",
@@ -8859,6 +8936,7 @@ dependencies = [
  "async_zip",
  "base64 0.22.1",
  "bytes",
+ "chardetng",
  "chrono",
  "daedalus",
  "dashmap",
@@ -8866,6 +8944,7 @@ dependencies = [
  "discord-rich-presence",
  "dunce",
  "either",
+ "encoding_rs",
  "enumset",
  "flate2",
  "fs4",
@@ -8884,6 +8963,7 @@ dependencies = [
  "serde",
  "serde_ini",
  "serde_json",
+ "serde_with",
  "sha1_smol",
  "sha2",
  "sqlx",
@@ -8900,7 +8980,7 @@ dependencies = [
  "uuid 1.17.0",
  "whoami",
  "winreg 0.55.0",
- "zip 3.0.0",
+ "zip",
 ]
 
 [[package]]
@@ -8977,7 +9057,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -8988,17 +9068,16 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -9135,7 +9214,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -9164,7 +9243,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "tokio",
 ]
 
@@ -9195,21 +9274,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.22"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.26",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.9"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
@@ -9238,23 +9317,23 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.26"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap 2.9.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "toml_write",
- "winnow 0.7.10",
+ "winnow 0.7.11",
 ]
 
 [[package]]
 name = "toml_write"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "tonic"
@@ -9335,6 +9414,24 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags 2.9.1",
+ "bytes",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "iri-string",
+ "pin-project-lite",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -9374,20 +9471,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -9479,7 +9576,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.9.1",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pki-types",
  "sha1",
  "thiserror 2.0.12",
@@ -9606,9 +9703,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
 
 [[package]]
 name = "unicode-xid"
@@ -9631,7 +9728,7 @@ dependencies = [
  "base64 0.22.1",
  "log",
  "once_cell",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pki-types",
  "url",
  "webpki-roots 0.26.11",
@@ -9709,9 +9806,9 @@ dependencies = [
 
 [[package]]
 name = "v_frame"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2"
 dependencies = [
  "aligned-vec",
  "num-traits",
@@ -9751,7 +9848,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -9847,9 +9944,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
@@ -9888,7 +9985,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "wasm-bindgen-shared",
 ]
 
@@ -9923,7 +10020,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10063,7 +10160,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -10170,9 +10267,9 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.61.1"
+version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
  "windows-collections",
  "windows-core",
@@ -10200,7 +10297,7 @@ dependencies = [
  "windows-interface",
  "windows-link",
  "windows-result",
- "windows-strings 0.4.2",
+ "windows-strings",
 ]
 
 [[package]]
@@ -10222,7 +10319,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -10233,14 +10330,14 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-numerics"
@@ -10252,17 +10349,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-registry"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
-dependencies = [
- "windows-result",
- "windows-strings 0.3.1",
- "windows-targets 0.53.0",
-]
-
 [[package]]
 name = "windows-registry"
 version = "0.5.2"
@@ -10271,7 +10357,7 @@ checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
 dependencies = [
  "windows-link",
  "windows-result",
- "windows-strings 0.4.2",
+ "windows-strings",
 ]
 
 [[package]]
@@ -10283,15 +10369,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -10337,6 +10414,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -10385,9 +10471,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
 dependencies = [
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
@@ -10608,9 +10694,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
 dependencies = [
  "memchr",
 ]
@@ -10625,16 +10711,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "winreg"
 version = "0.55.0"
@@ -10786,7 +10862,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_tokenstream",
- "syn 2.0.101",
+ "syn 2.0.103",
  "xml-rs",
 ]
 
@@ -10821,7 +10897,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "synstructure",
 ]
 
@@ -10853,7 +10929,7 @@ dependencies = [
  "tracing",
  "uds_windows",
  "windows-sys 0.59.0",
- "winnow 0.7.10",
+ "winnow 0.7.11",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -10868,7 +10944,7 @@ dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -10882,28 +10958,28 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
 dependencies = [
  "serde",
  "static_assertions",
- "winnow 0.7.10",
+ "winnow 0.7.11",
  "zvariant",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -10923,7 +10999,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "synstructure",
 ]
 
@@ -10963,32 +11039,17 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "zip"
-version = "2.4.2"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
+checksum = "af7dcdb4229c0e79c2531a24de7726a0e980417a74fb4d030a35f535665439a0"
 dependencies = [
  "arbitrary",
- "crc32fast",
- "crossbeam-utils",
- "displaydoc",
- "indexmap 2.9.0",
- "memchr",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "zip"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308"
-dependencies = [
- "arbitrary",
- "bzip2",
+ "bzip2 0.5.2",
  "crc32fast",
  "deflate64",
  "flate2",
@@ -11000,9 +11061,9 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
 
 [[package]]
 name = "zopfli"
@@ -11061,9 +11122,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.14"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
+checksum = "0f6fe2e33d02a98ee64423802e16df3de99c43e5cf5ff983767e1128b394c8ac"
 dependencies = [
  "zune-core",
 ]
@@ -11078,7 +11139,7 @@ dependencies = [
  "enumflags2",
  "serde",
  "url",
- "winnow 0.7.10",
+ "winnow 0.7.11",
  "zvariant_derive",
  "zvariant_utils",
 ]
@@ -11092,7 +11153,7 @@ dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "zvariant_utils",
 ]
 
@@ -11106,8 +11167,8 @@ dependencies = [
  "quote",
  "serde",
  "static_assertions",
- "syn 2.0.101",
- "winnow 0.7.10",
+ "syn 2.0.103",
+ "winnow 0.7.11",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d9087574e..b612f75ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,9 @@ members = [
   "packages/daedalus",
 ]
 
+[workspace.package]
+edition = "2024"
+
 [workspace.dependencies]
 actix-cors = "0.7.1"
 actix-files = "0.6.6"
@@ -21,7 +24,8 @@ actix-web-prom = "0.10.0"
 actix-ws = "0.3.0"
 argon2 = { version = "0.5.3", features = ["std"] }
 ariadne = { path = "packages/ariadne" }
-async-compression = { version = "0.4.23", default-features = false }
+async_zip = "0.0.17"
+async-compression = { version = "0.4.24", default-features = false }
 async-recursion = "1.1.1"
 async-stripe = { version = "0.41.0", default-features = false, features = [
   "runtime-tokio-hyper-rustls",
@@ -31,14 +35,14 @@ async-tungstenite = { version = "0.29.1", default-features = false, features = [
   "futures-03-sink",
 ] }
 async-walkdir = "2.1.0"
-async_zip = "0.0.17"
 base64 = "0.22.1"
-bitflags = "2.9.0"
+bitflags = "2.9.1"
 bytes = "1.10.1"
 censor = "0.3.0"
+chardetng = "0.1.17"
 chrono = "0.4.41"
-clap = "4.5.38"
-clickhouse = "0.13.2"
+clap = "4.5.40"
+clickhouse = "0.13.3"
 color-thief = "0.2.2"
 console-subscriber = "0.4.1"
 daedalus = { path = "packages/daedalus" }
@@ -50,8 +54,9 @@ dotenv-build = "0.1.1"
 dotenvy = "0.15.7"
 dunce = "1.0.5"
 either = "1.15.0"
+encoding_rs = "0.8.35"
 enumset = "1.1.6"
-flate2 = "1.1.1"
+flate2 = "1.1.2"
 fs4 = { version = "0.13.1", default-features = false }
 futures = { version = "0.3.31", default-features = false }
 futures-util = "0.3.31"
@@ -59,7 +64,7 @@ hex = "0.4.3"
 hickory-resolver = "0.25.2"
 hmac = "0.12.1"
 hyper-tls = "0.6.0"
-hyper-util = "0.1.11"
+hyper-util = "0.1.14"
 iana-time-zone = "0.1.63"
 image = { version = "0.25.6", default-features = false, features = ["rayon"] }
 indexmap = "2.9.0"
@@ -67,7 +72,7 @@ indicatif = "0.17.11"
 itertools = "0.14.0"
 jemalloc_pprof = "0.7.0"
 json-patch = { version = "4.0.0", default-features = false }
-lettre = { version = "0.11.16", default-features = false, features = [
+lettre = { version = "0.11.17", default-features = false, features = [
   "builder",
   "hostname",
   "pool",
@@ -89,19 +94,19 @@ quartz_nbt = "0.2.9"
 quick-xml = "0.37.5"
 rand = "=0.8.5"  # Locked on 0.8 until argon2 and p256 update to 0.9
 rand_chacha = "=0.3.1"  # Locked on 0.3 until we can update rand to 0.9
-redis = "0.31.0"
+redis = "=0.31.0"  # Locked on 0.31 until deadpool-redis updates to 0.32
 regex = "1.11.1"
-reqwest = { version = "0.12.15", default-features = false }
-rust-s3 = { version = "0.35.1", default-features = false, features = [
-  "fail-on-err",
-  "tags",
-  "tokio-rustls-tls",
-] }
+reqwest = { version = "0.12.19", default-features = false }
 rust_decimal = { version = "1.37.1", features = [
   "serde-with-float",
   "serde-with-str",
 ] }
 rust_iso3166 = "0.1.14"
+rust-s3 = { version = "0.35.1", default-features = false, features = [
+  "fail-on-err",
+  "tags",
+  "tokio-rustls-tls",
+] }
 rusty-money = "0.4.1"
 sentry = { version = "0.38.1", default-features = false, features = [
   "backtrace",
@@ -113,26 +118,26 @@ sentry = { version = "0.38.1", default-features = false, features = [
 ] }
 sentry-actix = "0.38.1"
 serde = "1.0.219"
-serde-xml-rs = "0.8.0"  # Also an XML (de)serializer, consider dropping yaserde in favor of this
 serde_bytes = "0.11.17"
 serde_cbor = "0.11.2"
 serde_ini = "0.2.0"
 serde_json = "1.0.140"
 serde_with = "3.12.0"
+serde-xml-rs = "0.8.1"  # Also an XML (de)serializer, consider dropping yaserde in favor of this
 sha1 = "0.10.6"
 sha1_smol = { version = "1.0.1", features = ["std"] }
 sha2 = "0.10.9"
 spdx = "0.10.8"
-sqlx = { version = "0.8.5", default-features = false }
-sysinfo = { version = "0.35.1", default-features = false }
+sqlx = { version = "0.8.6", default-features = false }
+sysinfo = { version = "0.35.2", default-features = false }
 tar = "0.4.44"
 tauri = "2.5.1"
 tauri-build = "2.2.0"
-tauri-plugin-deep-link = "2.2.1"
-tauri-plugin-dialog = "2.2.1"
-tauri-plugin-opener = "2.2.6"
+tauri-plugin-deep-link = "2.3.0"
+tauri-plugin-dialog = "2.2.2"
+tauri-plugin-opener = "2.2.7"
 tauri-plugin-os = "2.2.1"
-tauri-plugin-single-instance = "2.2.3"
+tauri-plugin-single-instance = "2.2.4"
 tauri-plugin-updater = { version = "2.7.1", default-features = false, features = [
   "rustls-tls",
   "zip",
@@ -143,7 +148,7 @@ theseus = { path = "packages/app-lib" }
 thiserror = "2.0.12"
 tikv-jemalloc-ctl = "0.6.0"
 tikv-jemallocator = "0.6.0"
-tokio = "1.45.0"
+tokio = "1.45.1"
 tokio-stream = "0.1.17"
 tokio-util = "0.7.15"
 totp-rs = "5.7.0"
@@ -153,14 +158,14 @@ tracing-error = "0.2.1"
 tracing-subscriber = "0.3.19"
 url = "2.5.4"
 urlencoding = "2.1.3"
-uuid = "1.16.0"
+uuid = "1.17.0"
 validator = "0.20.0"
 webp = { version = "0.3.0", default-features = false }
 whoami = "1.6.0"
 winreg = "0.55.0"
 woothee = "0.13.0"
 yaserde = "0.12.0"
-zip = { version = "3.0.0", default-features = false, features = [
+zip = { version = "4.0.0", default-features = false, features = [
   "bzip2",
   "deflate",
   "deflate64",
@@ -168,6 +173,44 @@ zip = { version = "3.0.0", default-features = false, features = [
 ] }
 zxcvbn = "3.1.0"
 
+[workspace.lints.clippy]
+bool_to_int_with_if = "warn"
+borrow_as_ptr = "warn"
+cfg_not_test = "warn"
+clear_with_drain = "warn"
+cloned_instead_of_copied = "warn"
+collection_is_never_read = "warn"
+dbg_macro = "warn"
+default_trait_access = "warn"
+explicit_iter_loop = "warn"
+filter_map_next = "warn"
+flat_map_option = "warn"
+format_push_string = "warn"
+get_unwrap = "warn"
+large_include_file = "warn"
+large_stack_arrays = "warn"
+manual_assert = "warn"
+manual_instant_elapsed = "warn"
+manual_is_variant_and = "warn"
+manual_let_else = "warn"
+map_unwrap_or = "warn"
+match_bool = "warn"
+needless_collect = "warn"
+negative_feature_names = "warn"
+non_std_lazy_statics = "warn"
+pathbuf_init_then_push = "warn"
+read_zero_byte_vec = "warn"
+redundant_clone = "warn"
+redundant_feature_names = "warn"
+redundant_type_annotations = "warn"
+todo = "warn"
+unnested_or_patterns = "warn"
+wildcard_dependencies = "warn"
+
+[workspace.lints.rust]
+# Turn warnings into errors by default
+warnings = "deny"
+
 [patch.crates-io]
 wry = { git = "https://github.com/modrinth/wry", rev = "cafdaa9" }
 
diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json
index fa6d8f926..5f4cf3b01 100644
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -9,18 +9,19 @@
     "tsc:check": "vue-tsc --noEmit",
     "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"
+    "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",
+    "test": "vue-tsc --noEmit"
   },
   "dependencies": {
+    "@geometrically/minecraft-motd-parser": "^1.1.4",
     "@modrinth/assets": "workspace:*",
     "@modrinth/ui": "workspace:*",
     "@modrinth/utils": "workspace:*",
     "@sentry/vue": "^8.27.0",
-    "@geometrically/minecraft-motd-parser": "^1.1.4",
     "@tauri-apps/api": "^2.5.0",
     "@tauri-apps/plugin-dialog": "^2.2.1",
-    "@tauri-apps/plugin-os": "^2.2.1",
     "@tauri-apps/plugin-opener": "^2.2.6",
+    "@tauri-apps/plugin-os": "^2.2.1",
     "@tauri-apps/plugin-updater": "^2.7.1",
     "@tauri-apps/plugin-window-state": "^2.2.2",
     "@vintl/vintl": "^4.4.1",
@@ -39,11 +40,12 @@
     "@eslint/compat": "^1.1.1",
     "@formatjs/cli": "^6.2.12",
     "@nuxt/eslint-config": "^0.5.6",
+    "@taijased/vue-render-tracker": "^1.0.7",
     "@vitejs/plugin-vue": "^5.0.4",
     "autoprefixer": "^10.4.19",
     "eslint": "^9.9.1",
     "eslint-config-custom": "workspace:*",
-    "eslint-plugin-turbo": "^2.1.1",
+    "eslint-plugin-turbo": "^2.5.4",
     "postcss": "^8.4.39",
     "prettier": "^3.2.5",
     "sass": "^1.74.1",
@@ -51,8 +53,7 @@
     "tsconfig": "workspace:*",
     "typescript": "^5.5.4",
     "vite": "^5.4.6",
-    "vue-tsc": "^2.1.6",
-    "@taijased/vue-render-tracker": "^1.0.7"
+    "vue-tsc": "^2.1.6"
   },
   "packageManager": "pnpm@9.4.0",
   "web-types": "../../web-types.json"
diff --git a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
index 13be55ce4..c7de8bece 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -25,9 +25,8 @@ const editProfileObject = computed(() => {
     hooks?: Hooks
   } = {}
 
-  if (overrideHooks.value) {
-    editProfile.hooks = hooks.value
-  }
+  // When hooks are not overridden per-instance, we want to clear them
+  editProfile.hooks = overrideHooks.value ? hooks.value : {}
 
   return editProfile
 })
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
index 3516a3b1f..f30aca810 100644
--- a/apps/app-frontend/src/components/ui/world/WorldItem.vue
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -1,12 +1,8 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
-import type { ServerStatus, ServerWorld, World } from '@/helpers/worlds.ts'
-import {
-  set_world_display_status,
-  getWorldIdentifier,
-  showWorldInFolder,
-} from '@/helpers/worlds.ts'
-import { formatNumber } from '@modrinth/utils'
+import type { ServerStatus, ServerWorld, SingleplayerWorld, World } from '@/helpers/worlds.ts'
+import { set_world_display_status, getWorldIdentifier } from '@/helpers/worlds.ts'
+import { formatNumber, getPingLevel } from '@modrinth/utils'
 import {
   useRelativeTime,
   Avatar,
@@ -49,6 +45,7 @@ const router = useRouter()
 
 const emit = defineEmits<{
   (e: 'play' | 'play-instance' | 'update' | 'stop' | 'refresh' | 'edit' | 'delete'): void
+  (e: 'open-folder', world: SingleplayerWorld): void
 }>()
 
 const props = withDefaults(
@@ -108,20 +105,6 @@ const serverIncompatible = computed(
     props.serverStatus.version.protocol !== props.currentProtocol,
 )
 
-function getPingLevel(ping: number) {
-  if (ping < 150) {
-    return 5
-  } else if (ping < 300) {
-    return 4
-  } else if (ping < 600) {
-    return 3
-  } else if (ping < 1000) {
-    return 2
-  } else {
-    return 1
-  }
-}
-
 const locked = computed(() => props.world.type === 'singleplayer' && props.world.locked)
 
 const messages = defineMessages({
@@ -394,8 +377,7 @@ const messages = defineMessages({
               {
                 id: 'open-folder',
                 shown: world.type === 'singleplayer',
-                action: () =>
-                  world.type === 'singleplayer' ? showWorldInFolder(instancePath, world.path) : {},
+                action: () => (world.type === 'singleplayer' ? emit('open-folder', world) : {}),
               },
               {
                 divider: true,
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
index 19f5ecb2b..5a01d93ec 100644
--- a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
@@ -56,6 +56,7 @@ function show(world: SingleplayerWorld) {
   icon.value = world.icon
   displayStatus.value = world.display_status
   hideFromHome.value = world.display_status === 'hidden'
+  removeIcon.value = false
   modal.value.show()
 }
 
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 65bfbf68f..8b6d63bfa 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -32,7 +32,11 @@
         <template #actions>
           <div class="flex gap-2">
             <ButtonStyled
-              v-if="instance.install_stage.includes('installing')"
+              v-if="
+                ['installing', 'pack_installing', 'minecraft_installing'].includes(
+                  instance.install_stage,
+                )
+              "
               color="brand"
               size="large"
             >
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue
index 500efe135..8490269e3 100644
--- a/apps/app-frontend/src/pages/instance/Worlds.vue
+++ b/apps/app-frontend/src/pages/instance/Worlds.vue
@@ -86,6 +86,7 @@
             world.type === 'server' ? editServerModal?.show(world) : editWorldModal?.show(world)
         "
         @delete="() => promptToRemoveWorld(world)"
+        @open-folder="(world: SingleplayerWorld) => showWorldInFolder(instance.path, world.path)"
       />
     </div>
   </div>
@@ -151,6 +152,7 @@ import {
   hasQuickPlaySupport,
   refreshWorlds,
   handleDefaultProfileUpdateEvent,
+  showWorldInFolder,
 } from '@/helpers/worlds.ts'
 import AddServerModal from '@/components/ui/world/modal/AddServerModal.vue'
 import EditServerModal from '@/components/ui/world/modal/EditServerModal.vue'
diff --git a/apps/app-playground/Cargo.toml b/apps/app-playground/Cargo.toml
index 7f2e4288a..691c9d3b7 100644
--- a/apps/app-playground/Cargo.toml
+++ b/apps/app-playground/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "theseus_playground"
 version = "0.0.0"
-edition = "2024"
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -9,3 +9,6 @@ edition = "2024"
 theseus = { workspace = true, features = ["cli"] }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 enumset.workspace = true
+
+[lints]
+workspace = true
diff --git a/apps/app-playground/package.json b/apps/app-playground/package.json
index 0d76eaed8..342b3cecb 100644
--- a/apps/app-playground/package.json
+++ b/apps/app-playground/package.json
@@ -2,9 +2,9 @@
   "name": "@modrinth/app-playground",
   "scripts": {
     "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix",
+    "lint": "cargo fmt --check && cargo clippy --all-targets",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
     "dev": "cargo run",
-    "test": "cargo test"
+    "test": "cargo nextest run --all-targets --no-fail-fast"
   }
 }
diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
index d05c3f308..6601ece6b 100644
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -4,8 +4,7 @@ version = "0.9.5"
 description = "The Modrinth App is a desktop application for managing your Minecraft mods"
 license = "GPL-3.0-only"
 repository = "https://github.com/modrinth/code/apps/app/"
-edition = "2024"
-build = "build.rs"
+edition.workspace = true
 
 [build-dependencies]
 tauri-build = { workspace = true, features = ["codegen"] }
@@ -17,7 +16,7 @@ serde_json.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_with.workspace = true
 
-tauri = { workspace = true, features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
+tauri = { workspace = true, features = ["devtools", "macos-private-api", "protocol-asset"] }
 tauri-plugin-window-state.workspace = true
 tauri-plugin-deep-link.workspace = true
 tauri-plugin-os.workspace = true
@@ -56,3 +55,6 @@ default = ["custom-protocol"]
 # DO NOT remove this
 custom-protocol = ["tauri/custom-protocol"]
 updater = []
+
+[lints]
+workspace = true
diff --git a/apps/app/package.json b/apps/app/package.json
index 794bf7e0b..43f017203 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@modrinth/app",
   "scripts": {
-    "build": "tauri build",
     "tauri": "tauri",
+    "build": "tauri build",
     "dev": "tauri dev",
-    "test": "cargo test",
-    "lint": "cargo fmt --check && cargo clippy --all-targets -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix"
+    "test": "cargo nextest run --all-targets --no-fail-fast",
+    "lint": "cargo fmt --check && cargo clippy --all-targets",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt"
   },
   "devDependencies": {
     "@tauri-apps/cli": "2.5.0"
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
index 7a3a98970..dfe645096 100644
--- a/apps/app/src/api/utils.rs
+++ b/apps/app/src/api/utils.rs
@@ -44,6 +44,7 @@ pub fn get_os() -> OS {
     let os = OS::MacOS;
     os
 }
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[allow(clippy::enum_variant_names)]
 pub enum OS {
diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs
index f72f738b8..544ce05d6 100644
--- a/apps/app/src/api/worlds.rs
+++ b/apps/app/src/api/worlds.rs
@@ -43,7 +43,7 @@ pub async fn get_recent_worlds<R: Runtime>(
         display_statuses.unwrap_or(EnumSet::all()),
     )
     .await?;
-    for world in result.iter_mut() {
+    for world in &mut result {
         adapt_world_icon(&app_handle, &mut world.world);
     }
     Ok(result)
@@ -55,7 +55,7 @@ pub async fn get_profile_worlds<R: Runtime>(
     path: &str,
 ) -> Result<Vec<World>> {
     let mut result = worlds::get_profile_worlds(path).await?;
-    for world in result.iter_mut() {
+    for world in &mut result {
         adapt_world_icon(&app_handle, world);
     }
     Ok(result)
diff --git a/apps/app/src/macos/deep_link.rs b/apps/app/src/macos/deep_link.rs
index e2c66ac15..08a9bc756 100644
--- a/apps/app/src/macos/deep_link.rs
+++ b/apps/app/src/macos/deep_link.rs
@@ -11,7 +11,8 @@ pub fn get_or_init_payload<R: Runtime, M: Manager<R>>(
     manager: &M,
 ) -> InitialPayload {
     let initial_payload = manager.try_state::<InitialPayload>();
-    let mtx = if let Some(initial_payload) = initial_payload {
+
+    if let Some(initial_payload) = initial_payload {
         initial_payload.inner().clone()
     } else {
         tracing::info!("No initial payload found, creating new");
@@ -22,7 +23,5 @@ pub fn get_or_init_payload<R: Runtime, M: Manager<R>>(
         manager.manage(payload.clone());
 
         payload
-    };
-
-    mtx
+    }
 }
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 9c0f9eeef..bb3d4de89 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -210,7 +210,7 @@ fn main() {
             {
                 let payload = macos::deep_link::get_or_init_payload(app);
 
-                let mtx_copy = payload.payload.clone();
+                let mtx_copy = payload.payload;
                 app.listen("deep-link://new-url", move |url| {
                     let mtx_copy_copy = mtx_copy.clone();
                     let request = url.payload().to_owned();
@@ -242,7 +242,6 @@ fn main() {
                 tauri::async_runtime::spawn(api::utils::handle_command(
                     payload,
                 ));
-                dbg!(url);
             });
 
             #[cfg(not(target_os = "linux"))]
@@ -285,22 +284,22 @@ fn main() {
 
     match app {
         Ok(app) => {
-            #[allow(unused_variables)]
             app.run(|app, event| {
+                #[cfg(not(target_os = "macos"))]
+                drop((app, event));
                 #[cfg(target_os = "macos")]
                 if let tauri::RunEvent::Opened { urls } = event {
                     tracing::info!("Handling webview open {urls:?}");
 
                     let file = urls
                         .into_iter()
-                        .filter_map(|url| url.to_file_path().ok())
-                        .next();
+                        .find_map(|url| url.to_file_path().ok());
 
                     if let Some(file) = file {
                         let payload =
                             macos::deep_link::get_or_init_payload(app);
 
-                        let mtx_copy = payload.payload.clone();
+                        let mtx_copy = payload.payload;
                         let request = file.to_string_lossy().to_string();
                         tauri::async_runtime::spawn(async move {
                             let mut payload = mtx_copy.lock().await;
diff --git a/apps/app/turbo.jsonc b/apps/app/turbo.jsonc
new file mode 100644
index 000000000..7cdf6bd4b
--- /dev/null
+++ b/apps/app/turbo.jsonc
@@ -0,0 +1,14 @@
+{
+  "$schema": "../../node_modules/turbo/schema.json",
+  "extends": ["//"],
+  "tasks": {
+    // Running Clippy and tests on a Tauri application requires
+    // the frontend to be built at least once first
+    "lint": {
+      "dependsOn": ["@modrinth/app-frontend#build"]
+    },
+    "test": {
+      "dependsOn": ["@modrinth/app-frontend#build"]
+    }
+  }
+}
diff --git a/apps/daedalus_client/.env.example b/apps/daedalus_client/.env.local
similarity index 100%
rename from apps/daedalus_client/.env.example
rename to apps/daedalus_client/.env.local
diff --git a/apps/daedalus_client/Cargo.toml b/apps/daedalus_client/Cargo.toml
index cb2a646cd..ffec1a471 100644
--- a/apps/daedalus_client/Cargo.toml
+++ b/apps/daedalus_client/Cargo.toml
@@ -2,7 +2,7 @@
 name = "daedalus_client"
 version = "0.2.2"
 authors = ["Jai A <jai@modrinth.com>"]
-edition = "2024"
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -28,3 +28,6 @@ tracing-error.workspace = true
 
 tracing.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
+
+[lints]
+workspace = true
diff --git a/apps/daedalus_client/Dockerfile b/apps/daedalus_client/Dockerfile
index 5e5930e29..f7ca3db47 100644
--- a/apps/daedalus_client/Dockerfile
+++ b/apps/daedalus_client/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.86.0 AS build
+FROM rust:1.87.0 AS build
 ENV PKG_CONFIG_ALLOW_CROSS=1
 
 WORKDIR /usr/src/daedalus
diff --git a/apps/daedalus_client/package.json b/apps/daedalus_client/package.json
index 1f48075b1..f75b9d768 100644
--- a/apps/daedalus_client/package.json
+++ b/apps/daedalus_client/package.json
@@ -2,10 +2,10 @@
   "name": "@modrinth/daedalus_client",
   "scripts": {
     "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix",
+    "lint": "cargo fmt --check && cargo clippy --all-targets",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
     "dev": "cargo run",
-    "test": "cargo test"
+    "test": "cargo nextest run --all-targets --no-fail-fast"
   },
   "dependencies": {
     "@modrinth/daedalus": "workspace:*"
diff --git a/apps/daedalus_client/src/minecraft.rs b/apps/daedalus_client/src/minecraft.rs
index c2ee6e2d4..f90cf6ddd 100644
--- a/apps/daedalus_client/src/minecraft.rs
+++ b/apps/daedalus_client/src/minecraft.rs
@@ -52,8 +52,7 @@ pub async fn fetch(
                     if modrinth_version
                         .original_sha1
                         .as_ref()
-                        .map(|x| x == &version.sha1)
-                        .unwrap_or(false)
+                        .is_some_and(|x| x == &version.sha1)
                     {
                         existing_versions.push(modrinth_version);
                     } else {
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 8ce3806e6..274ddd55c 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
-    "build": "astro check && astro build",
+    "lint": "astro check",
+    "build": "astro build",
     "preview": "astro preview",
     "astro": "astro"
   },
@@ -18,4 +19,4 @@
     "starlight-openapi": "^0.14.0",
     "typescript": "^5.8.2"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/docs/src/content/docs/contributing/labrinth.md b/apps/docs/src/content/docs/contributing/labrinth.md
index 8ce0ac881..155e854cb 100644
--- a/apps/docs/src/content/docs/contributing/labrinth.md
+++ b/apps/docs/src/content/docs/contributing/labrinth.md
@@ -7,7 +7,7 @@ This project is part of our [monorepo](https://github.com/modrinth/code). You ca
 
 [labrinth] is the Rust-based backend serving Modrinth's API with the help of the [Actix](https://actix.rs) framework. To get started with a labrinth instance, install docker, docker-compose (which comes with Docker), and [Rust]. The initial startup can be done simply with the command `docker-compose up`, or with `docker compose up` (Compose V2 and later). That will deploy a PostgreSQL database on port 5432 and a MeiliSearch instance on port 7700. To run the API itself, you'll need to use the `cargo run` command, this will deploy the API on port 8000.
 
-To get a basic configuration, copy the `.env.example` file to `.env`. Now, you'll have to install the sqlx CLI, which can be done with cargo:
+To get a basic configuration, copy the `.env.local` file to `.env`. Now, you'll have to install the sqlx CLI, which can be done with cargo:
 
 ```bash
 cargo install --git https://github.com/launchbadge/sqlx sqlx-cli --no-default-features --features postgres,rustls
diff --git a/apps/frontend/.env.example b/apps/frontend/.env.example
deleted file mode 100644
index 43ceb1d53..000000000
--- a/apps/frontend/.env.example
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE_URL=https://api.modrinth.com/v2/
-BROWSER_BASE_URL=https://api.modrinth.com/v2/
-PYRO_BASE_URL=https://archon.modrinth.com/
diff --git a/apps/frontend/.env.local b/apps/frontend/.env.local
new file mode 100644
index 000000000..29aad1d10
--- /dev/null
+++ b/apps/frontend/.env.local
@@ -0,0 +1,4 @@
+BASE_URL=http://127.0.0.1:8000/v2/
+BROWSER_BASE_URL=http://127.0.0.1:8000/v2/
+PYRO_BASE_URL=https://staging-archon.modrinth.com
+PROD_OVERRIDE=true
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index c04ddc418..c3b53219a 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -10,7 +10,8 @@
     "postinstall": "nuxi prepare",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace"
+    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
+    "test": "nuxi build"
   },
   "devDependencies": {
     "@formatjs/cli": "^6.2.12",
diff --git a/apps/frontend/src/components/ui/Avatar.vue b/apps/frontend/src/components/ui/Avatar.vue
deleted file mode 100644
index 6216aa5d8..000000000
--- a/apps/frontend/src/components/ui/Avatar.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <OmorphiaAvatar
-    :src="src"
-    :alt="alt"
-    :size="size"
-    :circle="circle"
-    :no-shadow="noShadow"
-    :loading="loading"
-    :raised="raised"
-  />
-</template>
-
-<script setup>
-import { Avatar as OmorphiaAvatar } from "@modrinth/ui";
-
-const props = defineProps({
-  src: {
-    type: String,
-    default: null,
-  },
-  alt: {
-    type: String,
-    default: "",
-  },
-  size: {
-    type: String,
-    default: "2rem",
-  },
-  circle: {
-    type: Boolean,
-    default: false,
-  },
-  noShadow: {
-    type: Boolean,
-    default: false,
-  },
-  loading: {
-    type: String,
-    default: "eager",
-  },
-  raised: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>
diff --git a/apps/frontend/src/components/ui/Badge.vue b/apps/frontend/src/components/ui/Badge.vue
deleted file mode 100644
index 1ebb84510..000000000
--- a/apps/frontend/src/components/ui/Badge.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <span
-    :class="
-      'badge flex items-center gap-1 font-semibold text-secondary ' + color + ' type--' + type
-    "
-  >
-    <template v-if="color"> <span class="circle" /> {{ capitalizeString(type) }}</template>
-
-    <!-- User roles -->
-    <template v-else-if="type === 'admin'"> <ModrinthIcon /> Modrinth Team</template>
-    <template v-else-if="type === 'moderator'"> <ModeratorIcon /> Moderator</template>
-    <template v-else-if="type === 'creator'"><CreatorIcon /> Creator</template>
-    <template v-else-if="type === 'plus'"><PlusIcon /> Modrinth Plus</template>
-
-    <!-- Project statuses -->
-    <template v-else-if="type === 'approved'"><GlobeIcon /> Public</template>
-    <template v-else-if="type === 'approved-general'"><CheckIcon /> Approved</template>
-    <template v-else-if="type === 'unlisted' || type === 'withheld'"
-      ><LinkIcon /> Unlisted</template
-    >
-    <template v-else-if="type === 'private'"><LockIcon /> Private</template>
-    <template v-else-if="type === 'scheduled'"> <CalendarIcon /> Scheduled</template>
-    <template v-else-if="type === 'draft'"><DraftIcon /> Draft</template>
-    <template v-else-if="type === 'archived'"> <ArchiveIcon /> Archived</template>
-    <template v-else-if="type === 'rejected'"><CrossIcon /> Rejected</template>
-    <template v-else-if="type === 'processing'"> <ProcessingIcon /> Under review</template>
-
-    <!-- Team members -->
-    <template v-else-if="type === 'accepted'"><CheckIcon /> Accepted</template>
-    <template v-else-if="type === 'pending'"> <ProcessingIcon /> Pending </template>
-
-    <!-- Transaction statuses -->
-    <template v-else-if="type === 'success'"><CheckIcon /> Success</template>
-
-    <!-- Report status -->
-    <template v-else-if="type === 'closed'"> <CloseIcon /> Closed</template>
-
-    <!-- Other -->
-    <template v-else> <span class="circle" /> {{ capitalizeString(type) }} </template>
-  </span>
-</template>
-
-<script setup>
-import {
-  GlobeIcon,
-  LinkIcon,
-  ModrinthIcon,
-  PlusIcon,
-  ScaleIcon as ModeratorIcon,
-  BoxIcon as CreatorIcon,
-  FileTextIcon as DraftIcon,
-  XIcon as CrossIcon,
-  ArchiveIcon,
-  UpdatedIcon as ProcessingIcon,
-  CheckIcon,
-  LockIcon,
-  CalendarIcon,
-  XCircleIcon as CloseIcon,
-} from "@modrinth/assets";
-import { capitalizeString } from "@modrinth/utils";
-
-defineProps({
-  type: {
-    type: String,
-    required: true,
-  },
-  color: {
-    type: String,
-    default: "",
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.badge {
-  .circle {
-    width: 0.5rem;
-    height: 0.5rem;
-    border-radius: 50%;
-    display: inline-block;
-    margin-right: 0.25rem;
-    background-color: var(--badge-color);
-  }
-
-  svg {
-    vertical-align: -15%;
-    width: 1em;
-    height: 1em;
-  }
-
-  &.type--closed,
-  &.type--withheld,
-  &.type--rejected,
-  &.red {
-    --badge-color: var(--color-red);
-  }
-
-  &.type--pending,
-  &.type--moderator,
-  &.type--processing,
-  &.type--scheduled,
-  &.orange {
-    --badge-color: var(--color-orange);
-  }
-
-  &.type--accepted,
-  &.type--admin,
-  &.type--success,
-  &.type--approved-general,
-  &.green {
-    --badge-color: var(--color-green);
-  }
-
-  &.type--creator,
-  &.blue {
-    --badge-color: var(--color-blue);
-  }
-
-  &.type--unlisted,
-  &.type--plus,
-  &.purple {
-    --badge-color: var(--color-purple);
-  }
-
-  &.type--private,
-  &.type--approved,
-  &.gray {
-    --badge-color: var(--color-secondary);
-  }
-}
-</style>
diff --git a/apps/frontend/src/components/ui/CopyCode.vue b/apps/frontend/src/components/ui/CopyCode.vue
deleted file mode 100644
index 98cb14c06..000000000
--- a/apps/frontend/src/components/ui/CopyCode.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <button class="code" :class="{ copied }" title="Copy code to clipboard" @click="copyText">
-    <span>{{ text }}</span>
-    <CheckIcon v-if="copied" />
-    <ClipboardCopyIcon v-else />
-  </button>
-</template>
-
-<script>
-import { CheckIcon, ClipboardCopyIcon } from "@modrinth/assets";
-
-export default {
-  components: {
-    CheckIcon,
-    ClipboardCopyIcon,
-  },
-  props: {
-    text: {
-      type: String,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      copied: false,
-    };
-  },
-  methods: {
-    async copyText() {
-      await navigator.clipboard.writeText(this.text);
-      this.copied = true;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.code {
-  color: var(--color-text);
-  display: inline-flex;
-  grid-gap: 0.5rem;
-  font-family: var(--mono-font);
-  font-size: var(--font-size-sm);
-  margin: 0;
-  padding: 0.25rem 0.5rem;
-  background-color: var(--color-code-bg);
-  width: fit-content;
-  border-radius: 10px;
-  user-select: text;
-  transition:
-    opacity 0.5s ease-in-out,
-    filter 0.2s ease-in-out,
-    transform 0.05s ease-in-out,
-    outline 0.2s ease-in-out;
-
-  span {
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  svg {
-    width: 1em;
-    height: 1em;
-  }
-
-  &:hover {
-    filter: brightness(0.85);
-  }
-
-  &:active {
-    transform: scale(0.95);
-    filter: brightness(0.8);
-  }
-}
-</style>
diff --git a/apps/frontend/src/components/ui/ModerationChecklist.vue b/apps/frontend/src/components/ui/ModerationChecklist.vue
index c4fabfa3b..fa692949f 100644
--- a/apps/frontend/src/components/ui/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/ModerationChecklist.vue
@@ -654,11 +654,11 @@ For a brief rundown of how this works:
         {
           name: "Insufficient",
           resultingMessage: `## Insufficient Gallery Images
-        We ask that projects like yours show off their content using images in the Gallery, or optionally in the Description, in order to effectively and clearly inform users of its content per section 2.1 of [Modrinth's content rules](https://modrinth.com/legal/rules#general-expectations).
-        Keep in mind that you should:
-        - Set a featured image that best represents your project.
-        - Ensure all your images have titles that accurately label the image, and optionally, details on the contents of the image in the images Description.
-        - Upload any relevant images in your Description to your Gallery tab for best results.`,
+We ask that projects like yours show off their content using images in the Gallery, or optionally in the Description, in order to effectively and clearly inform users of its content per section 2.1 of [Modrinth's content rules](https://modrinth.com/legal/rules#general-expectations).
+Keep in mind that you should:
+- Set a featured image that best represents your project.
+- Ensure all your images have titles that accurately label the image, and optionally, details on the contents of the image in the images Description.
+- Upload any relevant images in your Description to your Gallery tab for best results.`,
         },
         {
           name: "Not relevant",
diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue
index 1da769a34..4a293684a 100644
--- a/apps/frontend/src/components/ui/NotificationItem.vue
+++ b/apps/frontend/src/components/ui/NotificationItem.vue
@@ -104,13 +104,13 @@
         </nuxt-link>
         <template v-if="tags.rejectedStatuses.includes(notification.body.new_status)">
           has been
-          <Badge :type="notification.body.new_status" />
+          <ProjectStatusBadge :status="notification.body.new_status" />
         </template>
         <template v-else>
           updated from
-          <Badge :type="notification.body.old_status" />
+          <ProjectStatusBadge :status="notification.body.old_status" />
           to
-          <Badge :type="notification.body.new_status" />
+          <ProjectStatusBadge :status="notification.body.new_status" />
         </template>
         by the moderators.
       </template>
@@ -331,16 +331,13 @@ import {
   XIcon,
   ExternalIcon,
 } from "@modrinth/assets";
-import { useRelativeTime } from "@modrinth/ui";
+import { Avatar, ProjectStatusBadge, CopyCode, useRelativeTime } from "@modrinth/ui";
 import ThreadSummary from "~/components/ui/thread/ThreadSummary.vue";
 import { getProjectLink, getVersionLink } from "~/helpers/projects.js";
 import { getUserLink } from "~/helpers/users.js";
 import { acceptTeamInvite, removeSelfFromTeam } from "~/helpers/teams.js";
 import { markAsRead } from "~/helpers/notifications.ts";
 import DoubleIcon from "~/components/ui/DoubleIcon.vue";
-import Avatar from "~/components/ui/Avatar.vue";
-import Badge from "~/components/ui/Badge.vue";
-import CopyCode from "~/components/ui/CopyCode.vue";
 import Categories from "~/components/ui/search/Categories.vue";
 
 const app = useNuxtApp();
diff --git a/apps/frontend/src/components/ui/OptionGroup.vue b/apps/frontend/src/components/ui/OptionGroup.vue
new file mode 100644
index 000000000..f00cd3270
--- /dev/null
+++ b/apps/frontend/src/components/ui/OptionGroup.vue
@@ -0,0 +1,128 @@
+<template>
+  <nav
+    ref="scrollContainer"
+    class="card-shadow experimental-styles-within relative flex w-fit overflow-x-auto rounded-full bg-bg-raised p-1 text-sm font-bold"
+  >
+    <button
+      v-for="(option, index) in options"
+      :key="`option-group-${index}`"
+      ref="optionButtons"
+      class="button-animation z-[1] flex flex-row items-center gap-2 rounded-full bg-transparent px-4 py-2 font-semibold"
+      :class="{
+        'text-button-textSelected': modelValue === option,
+        'text-primary': modelValue !== option,
+      }"
+      @click="setOption(option)"
+    >
+      <slot :option="option" :selected="modelValue === option" />
+    </button>
+    <div
+      class="navtabs-transition pointer-events-none absolute h-[calc(100%-0.5rem)] overflow-hidden rounded-full bg-button-bgSelected p-1"
+      :style="{
+        left: sliderLeftPx,
+        top: sliderTopPx,
+        right: sliderRightPx,
+        bottom: sliderBottomPx,
+        opacity: initialized ? 1 : 0,
+      }"
+      aria-hidden="true"
+    ></div>
+  </nav>
+</template>
+
+<script setup lang="ts" generic="T">
+import { ref, computed, onMounted } from "vue";
+
+const modelValue = defineModel<T>({ required: true });
+
+const props = defineProps<{
+  options: T[];
+}>();
+
+const scrollContainer = ref<HTMLElement | null>(null);
+
+const sliderLeft = ref(4);
+const sliderTop = ref(4);
+const sliderRight = ref(4);
+const sliderBottom = ref(4);
+
+const sliderLeftPx = computed(() => `${sliderLeft.value}px`);
+const sliderTopPx = computed(() => `${sliderTop.value}px`);
+const sliderRightPx = computed(() => `${sliderRight.value}px`);
+const sliderBottomPx = computed(() => `${sliderBottom.value}px`);
+
+const optionButtons = ref();
+
+const initialized = ref(false);
+
+function setOption(option: T) {
+  modelValue.value = option;
+}
+
+watch(modelValue, () => {
+  startAnimation(props.options.indexOf(modelValue.value));
+});
+
+function startAnimation(index: number) {
+  const el = optionButtons.value[index];
+
+  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);
+    }
+  }
+  initialized.value = true;
+}
+
+onMounted(() => {
+  startAnimation(props.options.indexOf(modelValue.value));
+});
+</script>
+
+<style scoped>
+.navtabs-transition {
+  transition:
+    all 150ms cubic-bezier(0.4, 0, 0.2, 1),
+    opacity 250ms cubic-bezier(0.5, 0, 0.2, 1) 50ms;
+}
+
+.card-shadow {
+  box-shadow: var(--shadow-card);
+}
+</style>
diff --git a/apps/frontend/src/components/ui/Pagination.vue b/apps/frontend/src/components/ui/Pagination.vue
deleted file mode 100644
index 99fb555ca..000000000
--- a/apps/frontend/src/components/ui/Pagination.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<template>
-  <div v-if="count > 1" class="columns paginates">
-    <a
-      :class="{ disabled: page === 1 }"
-      :tabindex="page === 1 ? -1 : 0"
-      class="left-arrow paginate has-icon"
-      aria-label="Previous Page"
-      :href="linkFunction(page - 1)"
-      @click.prevent="page !== 1 ? switchPage(page - 1) : null"
-    >
-      <LeftArrowIcon />
-    </a>
-    <div
-      v-for="(item, index) in pages"
-      :key="'page-' + item + '-' + index"
-      :class="{
-        'page-number': page !== item,
-        shrink: item > 99,
-      }"
-      class="page-number-container"
-    >
-      <div v-if="item === '-'" class="has-icon">
-        <GapIcon />
-      </div>
-      <a
-        v-else
-        :class="{
-          'page-number current': page === item,
-          shrink: item > 99,
-        }"
-        :href="linkFunction(item)"
-        @click.prevent="page !== item ? switchPage(item) : null"
-      >
-        {{ item }}
-      </a>
-    </div>
-
-    <a
-      :class="{
-        disabled: page === pages[pages.length - 1],
-      }"
-      :tabindex="page === pages[pages.length - 1] ? -1 : 0"
-      class="right-arrow paginate has-icon"
-      aria-label="Next Page"
-      :href="linkFunction(page + 1)"
-      @click.prevent="page !== pages[pages.length - 1] ? switchPage(page + 1) : null"
-    >
-      <RightArrowIcon />
-    </a>
-  </div>
-</template>
-
-<script>
-import { GapIcon, LeftArrowIcon, RightArrowIcon } from "@modrinth/assets";
-
-export default {
-  components: {
-    GapIcon,
-    LeftArrowIcon,
-    RightArrowIcon,
-  },
-  props: {
-    page: {
-      type: Number,
-      default: 1,
-    },
-    count: {
-      type: Number,
-      default: 1,
-    },
-    linkFunction: {
-      type: Function,
-      default() {
-        return () => "/";
-      },
-    },
-  },
-  emits: ["switch-page"],
-  computed: {
-    pages() {
-      let pages = [];
-
-      if (this.count > 7) {
-        if (this.page + 3 >= this.count) {
-          pages = [
-            1,
-            "-",
-            this.count - 4,
-            this.count - 3,
-            this.count - 2,
-            this.count - 1,
-            this.count,
-          ];
-        } else if (this.page > 5) {
-          pages = [1, "-", this.page - 1, this.page, this.page + 1, "-", this.count];
-        } else {
-          pages = [1, 2, 3, 4, 5, "-", this.count];
-        }
-      } else {
-        pages = Array.from({ length: this.count }, (_, i) => i + 1);
-      }
-
-      return pages;
-    },
-  },
-  methods: {
-    switchPage(newPage) {
-      this.$emit("switch-page", newPage);
-      if (newPage !== null && newPage !== "" && !isNaN(newPage)) {
-        this.$emit("switch-page", Math.min(Math.max(newPage, 1), this.count));
-      }
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-a {
-  position: relative;
-  color: var(--color-button-text);
-  box-shadow: var(--shadow-raised), var(--shadow-inset);
-
-  padding: 0.5rem 1rem;
-  margin: 0;
-  border-radius: 2rem;
-  background: var(--color-raised-bg);
-
-  transition:
-    opacity 0.5s ease-in-out,
-    filter 0.2s ease-in-out,
-    transform 0.05s ease-in-out,
-    outline 0.2s ease-in-out;
-
-  &.page-number.current {
-    background: var(--color-brand);
-    color: var(--color-brand-inverted);
-    cursor: default;
-    outline: 2px solid transparent;
-  }
-
-  &.paginate.disabled {
-    background-color: transparent;
-    cursor: not-allowed;
-    filter: grayscale(50%);
-    opacity: 0.5;
-  }
-}
-
-.has-icon {
-  display: flex;
-  align-items: center;
-
-  svg {
-    width: 1em;
-  }
-}
-
-.page-number-container,
-a,
-.has-icon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.paginates {
-  height: 2em;
-  margin: 0.5rem 0;
-
-  > div,
-  .has-icon {
-    margin: 0 0.3em;
-  }
-}
-
-.left-arrow {
-  margin-left: auto !important;
-}
-
-.right-arrow {
-  margin-right: auto !important;
-}
-
-@media screen and (max-width: 400px) {
-  .paginates {
-    font-size: 80%;
-  }
-}
-
-@media screen and (max-width: 530px) {
-  a {
-    width: 2.5rem;
-    padding: 0.5rem 0;
-  }
-}
-</style>
diff --git a/apps/frontend/src/components/ui/ProjectCard.vue b/apps/frontend/src/components/ui/ProjectCard.vue
index fbb147c2a..1be6f86c4 100644
--- a/apps/frontend/src/components/ui/ProjectCard.vue
+++ b/apps/frontend/src/components/ui/ProjectCard.vue
@@ -29,7 +29,7 @@
           {{ author }}
         </nuxt-link>
       </p>
-      <Badge v-if="status && status !== 'approved'" :type="status" class="status" />
+      <ProjectStatusBadge v-if="status && status !== 'approved'" :status="status" class="status" />
     </div>
     <p class="description">
       {{ description }}
@@ -91,18 +91,16 @@
 
 <script>
 import { CalendarIcon, UpdatedIcon, DownloadIcon, HeartIcon } from "@modrinth/assets";
+import { Avatar, ProjectStatusBadge, useRelativeTime } from "@modrinth/ui";
 import Categories from "~/components/ui/search/Categories.vue";
-import Badge from "~/components/ui/Badge.vue";
 import EnvironmentIndicator from "~/components/ui/EnvironmentIndicator.vue";
-import Avatar from "~/components/ui/Avatar.vue";
-import { useRelativeTime } from "@modrinth/ui";
 
 export default {
   components: {
+    ProjectStatusBadge,
     EnvironmentIndicator,
     Avatar,
     Categories,
-    Badge,
     CalendarIcon,
     UpdatedIcon,
     DownloadIcon,
diff --git a/apps/frontend/src/components/ui/charts/Chart.client.vue b/apps/frontend/src/components/ui/charts/Chart.client.vue
index 9f0c636d5..9769c64b2 100644
--- a/apps/frontend/src/components/ui/charts/Chart.client.vue
+++ b/apps/frontend/src/components/ui/charts/Chart.client.vue
@@ -133,7 +133,7 @@ function generateTooltip({ series, seriesIndex, dataPointIndex, w }, props) {
       props,
     );
   } else {
-    const returnTopN = 5;
+    const returnTopN = 15;
 
     const listEntries = series
       .map((value, index) => [
diff --git a/apps/frontend/src/components/ui/report/ReportInfo.vue b/apps/frontend/src/components/ui/report/ReportInfo.vue
index 924ad8f9d..42d36e30d 100644
--- a/apps/frontend/src/components/ui/report/ReportInfo.vue
+++ b/apps/frontend/src/components/ui/report/ReportInfo.vue
@@ -104,12 +104,9 @@
 
 <script setup>
 import { ReportIcon, UnknownIcon, VersionIcon } from "@modrinth/assets";
+import { Avatar, Badge, CopyCode, useRelativeTime } from "@modrinth/ui";
 import { renderHighlightedString } from "~/helpers/highlight.js";
-import { useRelativeTime } from "@modrinth/ui";
-import Avatar from "~/components/ui/Avatar.vue";
-import Badge from "~/components/ui/Badge.vue";
 import ThreadSummary from "~/components/ui/thread/ThreadSummary.vue";
-import CopyCode from "~/components/ui/CopyCode.vue";
 
 const formatRelativeTime = useRelativeTime();
 
diff --git a/apps/frontend/src/components/ui/report/ReportsList.vue b/apps/frontend/src/components/ui/report/ReportsList.vue
index f2fe1b5d3..09e1f4f89 100644
--- a/apps/frontend/src/components/ui/report/ReportsList.vue
+++ b/apps/frontend/src/components/ui/report/ReportsList.vue
@@ -18,6 +18,7 @@
 <script setup>
 import ReportInfo from "~/components/ui/report/ReportInfo.vue";
 import { addReportMessage } from "~/helpers/threads.js";
+import { asEncodedJsonArray, fetchSegmented } from "~/utils/fetch-helpers.ts";
 
 defineProps({
   moderation: {
@@ -53,13 +54,13 @@ const threadIds = [
 
 const [{ data: users }, { data: versions }, { data: threads }] = await Promise.all([
   await useAsyncData(`users?ids=${JSON.stringify(userIds)}`, () =>
-    useBaseFetch(`users?ids=${encodeURIComponent(JSON.stringify(userIds))}`),
+    fetchSegmented(userIds, (ids) => `users?ids=${asEncodedJsonArray(ids)}`),
   ),
   await useAsyncData(`versions?ids=${JSON.stringify(versionIds)}`, () =>
-    useBaseFetch(`versions?ids=${encodeURIComponent(JSON.stringify(versionIds))}`),
+    fetchSegmented(versionIds, (ids) => `versions?ids=${asEncodedJsonArray(ids)}`),
   ),
   await useAsyncData(`threads?ids=${JSON.stringify(threadIds)}`, () =>
-    useBaseFetch(`threads?ids=${encodeURIComponent(JSON.stringify(threadIds))}`),
+    fetchSegmented(threadIds, (ids) => `threads?ids=${asEncodedJsonArray(ids)}`),
   ),
 ]);
 
@@ -70,7 +71,7 @@ const versionProjects = versions.value.map((version) => version.project_id);
 const projectIds = [...new Set(reportedProjects.concat(versionProjects))];
 
 const { data: projects } = await useAsyncData(`projects?ids=${JSON.stringify(projectIds)}`, () =>
-  useBaseFetch(`projects?ids=${encodeURIComponent(JSON.stringify(projectIds))}`),
+  fetchSegmented(projectIds, (ids) => `projects?ids=${asEncodedJsonArray(ids)}`),
 );
 
 reports.value = rawReports.map((report) => {
diff --git a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue b/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
index f055b4b0d..427142a58 100644
--- a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
@@ -45,9 +45,11 @@
 import { ref, nextTick, computed } from "vue";
 import { ButtonStyled, NewModal } from "@modrinth/ui";
 import { IssuesIcon, PlusIcon, XIcon } from "@modrinth/assets";
+import { ModrinthServersFetchError, type ServerBackup } from "@modrinth/utils";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const modal = ref<InstanceType<typeof NewModal>>();
@@ -64,7 +66,7 @@ const trimmedName = computed(() => backupName.value.trim());
 const nameExists = computed(() => {
   if (!props.server.backups?.data) return false;
   return props.server.backups.data.some(
-    (backup) => backup.name.trim().toLowerCase() === trimmedName.value.toLowerCase(),
+    (backup: ServerBackup) => backup.name.trim().toLowerCase() === trimmedName.value.toLowerCase(),
   );
 });
 
@@ -98,7 +100,7 @@ const createBackup = async () => {
     hideModal();
     await props.server.refresh();
   } catch (error) {
-    if (error instanceof PyroFetchError && error.statusCode === 429) {
+    if (error instanceof ModrinthServersFetchError && error?.statusCode === 429) {
       isRateLimited.value = true;
       addNotification({
         type: "error",
diff --git a/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue b/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
index 632919c61..35b5bfc78 100644
--- a/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
@@ -20,13 +20,9 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { ConfirmModal } from "@modrinth/ui";
-import type { Server } from "~/composables/pyroServers";
+import type { Backup } from "@modrinth/utils";
 import BackupItem from "~/components/ui/servers/BackupItem.vue";
 
-defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
-}>();
-
 const emit = defineEmits<{
   (e: "delete", backup: Backup | undefined): void;
 }>();
diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
index 3b2ee84be..7d1401d7f 100644
--- a/apps/frontend/src/components/ui/servers/BackupItem.vue
+++ b/apps/frontend/src/components/ui/servers/BackupItem.vue
@@ -17,7 +17,7 @@ import {
 import { ButtonStyled, commonMessages, OverflowMenu, ProgressBar } from "@modrinth/ui";
 import { defineMessages, useVIntl } from "@vintl/vintl";
 import { ref } from "vue";
-import type { Backup } from "~/composables/pyroServers.ts";
+import type { Backup } from "@modrinth/utils";
 
 const flags = useFeatureFlags();
 const { formatMessage } = useVIntl();
diff --git a/apps/frontend/src/components/ui/servers/BackupRenameModal.vue b/apps/frontend/src/components/ui/servers/BackupRenameModal.vue
index 221576248..d5db4ba32 100644
--- a/apps/frontend/src/components/ui/servers/BackupRenameModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupRenameModal.vue
@@ -48,10 +48,11 @@
 import { ref, nextTick, computed } from "vue";
 import { ButtonStyled, NewModal } from "@modrinth/ui";
 import { SpinnerIcon, SaveIcon, XIcon, IssuesIcon } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
+import type { Backup } from "@modrinth/utils";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const modal = ref<InstanceType<typeof NewModal>>();
@@ -70,7 +71,7 @@ const nameExists = computed(() => {
   }
 
   return props.server.backups.data.some(
-    (backup) => backup.name.trim().toLowerCase() === trimmedName.value.toLowerCase(),
+    (backup: Backup) => backup.name.trim().toLowerCase() === trimmedName.value.toLowerCase(),
   );
 });
 
diff --git a/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue b/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
index 18bcd72d0..b77c5f4c7 100644
--- a/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
@@ -19,11 +19,12 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { ConfirmModal, NewModal } from "@modrinth/ui";
-import type { Server } from "~/composables/pyroServers";
+import type { Backup } from "@modrinth/utils";
 import BackupItem from "~/components/ui/servers/BackupItem.vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const modal = ref<InstanceType<typeof NewModal>>();
diff --git a/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue b/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue
index a92c8b618..fe4c32bbc 100644
--- a/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupSettingsModal.vue
@@ -59,10 +59,10 @@
 import { ButtonStyled, NewModal } from "@modrinth/ui";
 import { XIcon, SaveIcon } from "@modrinth/assets";
 import { ref, computed } from "vue";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["backups"]>;
+  server: ModrinthServer;
 }>();
 
 const modal = ref<InstanceType<typeof NewModal>>();
diff --git a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
index 3f310fec4..778c5bc8b 100644
--- a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
+++ b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
@@ -239,7 +239,7 @@ import {
 import { Admonition, ButtonStyled, NewModal } from "@modrinth/ui";
 import TagItem from "@modrinth/ui/src/components/base/TagItem.vue";
 import { ref, computed } from "vue";
-import { formatCategory, formatVersionsForDisplay, type Version } from "@modrinth/utils";
+import { formatCategory, formatVersionsForDisplay, type Mod, type Version } from "@modrinth/utils";
 import Accordion from "~/components/ui/Accordion.vue";
 import Checkbox from "~/components/ui/Checkbox.vue";
 import ContentVersionFilter, {
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue b/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
index 14d8ca346..adc22fbf4 100644
--- a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
+++ b/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
@@ -99,7 +99,7 @@
 import { FolderOpenIcon, CheckCircleIcon, XCircleIcon } from "@modrinth/assets";
 import { ButtonStyled } from "@modrinth/ui";
 import { ref, computed, watch, nextTick } from "vue";
-import type { FSModule } from "~/composables/pyroServers.ts";
+import { FSModule } from "~/composables/servers/modules/fs.ts";
 
 interface UploadItem {
   file: File;
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue b/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
index 6703bada3..88a729581 100644
--- a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
+++ b/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
@@ -75,13 +75,14 @@
 <script setup lang="ts">
 import { ExternalIcon, SpinnerIcon, DownloadIcon, XIcon } from "@modrinth/assets";
 import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
+import { ModrinthServersFetchError } from "@modrinth/utils";
 import { ref, computed, nextTick } from "vue";
-import { handleError, type Server } from "~/composables/pyroServers.ts";
+import { handleError, ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const cf = ref(false);
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const modal = ref<typeof NewModal>();
@@ -110,24 +111,18 @@ const handleSubmit = async () => {
   if (!error.value) {
     // hide();
     try {
-      const dry = await props.server.fs?.extractFile(trimmedUrl.value, true, true);
+      const dry = await props.server.fs.extractFile(trimmedUrl.value, true, true);
 
       if (!cf.value || dry.modpack_name) {
-        await props.server.fs?.extractFile(trimmedUrl.value, true, false, true);
+        await props.server.fs.extractFile(trimmedUrl.value, true, false, true);
         hide();
       } else {
         submitted.value = false;
         handleError(
-          new ServersError(
+          new ModrinthServersFetchError(
             "Could not find CurseForge modpack at that URL.",
-            undefined,
-            undefined,
-            undefined,
-            {
-              context: "Error installing modpack",
-              error: `url: ${url.value}`,
-              description: "Could not find CurseForge modpack at that URL.",
-            },
+            404,
+            new Error(`No modpack found at ${url.value}`),
           ),
         );
       }
diff --git a/apps/frontend/src/components/ui/servers/LoaderSelector.vue b/apps/frontend/src/components/ui/servers/LoaderSelector.vue
index ec37299a3..b5f526555 100644
--- a/apps/frontend/src/components/ui/servers/LoaderSelector.vue
+++ b/apps/frontend/src/components/ui/servers/LoaderSelector.vue
@@ -63,6 +63,7 @@ const props = defineProps<{
     loader: string | null;
     loader_version: string | null;
   };
+  ignoreCurrentInstallation?: boolean;
   isInstalling?: boolean;
 }>();
 
diff --git a/apps/frontend/src/components/ui/servers/OverviewLoading.vue b/apps/frontend/src/components/ui/servers/OverviewLoading.vue
deleted file mode 100644
index a3d5135f1..000000000
--- a/apps/frontend/src/components/ui/servers/OverviewLoading.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <div
-    aria-hidden="true"
-    style="font-variant-numeric: tabular-nums"
-    class="pointer-events-none h-full w-full select-none"
-  >
-    <div class="flex flex-col gap-6">
-      <div class="flex flex-row items-center gap-6">
-        <div
-          class="relative max-h-[156px] min-h-[156px] w-full overflow-hidden rounded-2xl bg-bg-raised p-8"
-        >
-          <div class="relative z-10 -ml-3 w-fit rounded-xl px-3 py-1">
-            <div class="-mb-0.5 mt-0.5 flex flex-row items-center gap-2">
-              <h2 class="m-0 -ml-0.5 text-3xl font-extrabold text-contrast">0.00%</h2>
-              <h3 class="relative z-10 text-sm font-normal text-secondary">/ 100%</h3>
-            </div>
-            <h3 class="relative z-10 text-base font-normal text-secondary">CPU usage</h3>
-          </div>
-          <CPUIcon class="absolute right-10 top-10" />
-        </div>
-        <div
-          class="relative max-h-[156px] min-h-[156px] w-full overflow-hidden rounded-2xl bg-bg-raised p-8"
-        >
-          <div class="relative z-10 -ml-3 w-fit rounded-xl px-3 py-1">
-            <div class="-mb-0.5 mt-0.5 flex flex-row items-center gap-2">
-              <h2 class="m-0 -ml-0.5 text-3xl font-extrabold text-contrast">0.00%</h2>
-              <h3 class="relative z-10 text-sm font-normal text-secondary">/ 100%</h3>
-            </div>
-            <h3 class="relative z-10 text-base font-normal text-secondary">Memory usage</h3>
-          </div>
-          <DBIcon class="absolute right-10 top-10" />
-        </div>
-        <div
-          class="relative isolate min-h-[156px] w-full overflow-hidden rounded-2xl bg-bg-raised p-8 transition-transform duration-100 hover:scale-105 active:scale-100"
-        >
-          <div class="flex flex-row items-center gap-2">
-            <h2 class="m-0 -ml-0.5 mt-1 text-3xl font-extrabold text-contrast">0 B</h2>
-          </div>
-          <h3 class="relative z-10 text-base font-normal text-secondary">Storage usage</h3>
-          <FolderOpenIcon class="absolute right-10 top-10 size-8" />
-        </div>
-      </div>
-
-      <div
-        class="relative flex h-full w-full flex-col gap-3 overflow-hidden rounded-2xl bg-bg-raised p-8"
-      >
-        <div class="experimental-styles-within flex flex-row items-center">
-          <div class="flex flex-row items-center gap-4">
-            <h2 class="m-0 text-3xl font-extrabold text-contrast">Console</h2>
-          </div>
-        </div>
-        <div class="relative w-full">
-          <input type="text" placeholder="Search logs" class="h-12 !w-full !pl-10 !pr-48" />
-          <SearchIcon class="absolute left-4 top-1/2 -translate-y-1/2" />
-        </div>
-        <div
-          class="console relative h-full min-h-[516px] w-full overflow-hidden rounded-xl bg-bg text-sm"
-        ></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { CPUIcon, DBIcon, FolderOpenIcon, SearchIcon } from "@modrinth/assets";
-</script>
-
-<style scoped>
-html.light-mode .console {
-  background: var(--color-bg);
-}
-
-html.dark-mode .console {
-  background: black;
-}
-
-html.oled-mode .console {
-  background: black;
-}
-</style>
diff --git a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
index 78ce7a275..8b1632cd7 100644
--- a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
+++ b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
@@ -59,7 +59,7 @@
 
       <template v-else>
         <ButtonStyled v-if="showStopButton" type="transparent">
-          <button :disabled="!canTakeAction" @click="initiateAction('stop')">
+          <button :disabled="!canTakeAction" @click="initiateAction('Stop')">
             <div class="flex gap-1">
               <StopCircleIcon class="h-5 w-5" />
               <span>{{ isStoppingState ? "Stopping..." : "Stop" }}</span>
@@ -120,14 +120,12 @@ import {
 import { ButtonStyled, NewModal } from "@modrinth/ui";
 import { useRouter } from "vue-router";
 import { useStorage } from "@vueuse/core";
-
-type ServerAction = "start" | "stop" | "restart" | "kill";
-type ServerState = "stopped" | "starting" | "running" | "stopping" | "restarting";
+import type { PowerAction as ServerPowerAction, ServerState } from "@modrinth/utils";
 
 const flags = useFeatureFlags();
 
 interface PowerAction {
-  action: ServerAction;
+  action: ServerPowerAction;
   nextState: ServerState;
 }
 
@@ -142,7 +140,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: "action", action: ServerAction): void;
+  (e: "action", action: ServerPowerAction): void;
 }>();
 
 const router = useRouter();
@@ -170,7 +168,7 @@ const isStoppingState = computed(() => serverState.value === "stopping");
 const showStopButton = computed(() => isRunning.value || isStoppingState.value);
 
 const primaryActionText = computed(() => {
-  const states: Record<ServerState, string> = {
+  const states: Partial<Record<ServerState, string>> = {
     starting: "Starting...",
     restarting: "Restarting...",
     running: "Restart",
@@ -193,7 +191,7 @@ const menuOptions = computed(() => [
           id: "kill",
           label: "Kill server",
           icon: SlashIcon,
-          action: () => initiateAction("kill"),
+          action: () => initiateAction("Kill"),
         },
       ]),
   {
@@ -221,17 +219,17 @@ async function copyId() {
   await navigator.clipboard.writeText(serverId as string);
 }
 
-function initiateAction(action: ServerAction) {
+function initiateAction(action: ServerPowerAction) {
   if (!canTakeAction.value) return;
 
-  const stateMap: Record<ServerAction, ServerState> = {
-    start: "starting",
-    stop: "stopping",
-    restart: "restarting",
-    kill: "stopping",
+  const stateMap: Record<ServerPowerAction, ServerState> = {
+    Start: "starting",
+    Stop: "stopping",
+    Restart: "restarting",
+    Kill: "stopping",
   };
 
-  if (action === "start") {
+  if (action === "Start") {
     emit("action", action);
     serverState.value = stateMap[action];
     startingDelay.value = true;
@@ -249,7 +247,7 @@ function initiateAction(action: ServerAction) {
 }
 
 function handlePrimaryAction() {
-  initiateAction(isRunning.value ? "restart" : "start");
+  initiateAction(isRunning.value ? "Restart" : "Start");
 }
 
 function executePowerAction() {
@@ -263,7 +261,7 @@ function executePowerAction() {
     userPreferences.value.powerDontAskAgain = true;
   }
 
-  if (action === "start") {
+  if (action === "Start") {
     startingDelay.value = true;
     setTimeout(() => (startingDelay.value = false), 5000);
   }
diff --git a/apps/frontend/src/components/ui/servers/PanelServerStatus.vue b/apps/frontend/src/components/ui/servers/PanelServerStatus.vue
index 9f6674b0b..fb7a1fcf7 100644
--- a/apps/frontend/src/components/ui/servers/PanelServerStatus.vue
+++ b/apps/frontend/src/components/ui/servers/PanelServerStatus.vue
@@ -40,7 +40,7 @@
 
 <script setup lang="ts">
 import { ref } from "vue";
-import type { ServerState } from "~/types/servers";
+import type { ServerState } from "@modrinth/utils";
 
 const STATUS_CLASSES = {
   running: { main: "bg-brand", bg: "bg-bg-green" },
@@ -49,7 +49,7 @@ const STATUS_CLASSES = {
   unknown: { main: "", bg: "" },
 } as const;
 
-const STATUS_TEXTS = {
+const STATUS_TEXTS: Partial<Record<ServerState, string>> = {
   running: "Running",
   stopped: "",
   crashed: "Crashed",
@@ -63,7 +63,10 @@ defineProps<{
 const isExpanded = ref(false);
 
 function getStatusClass(state: ServerState) {
-  return STATUS_CLASSES[state] ?? STATUS_CLASSES.unknown;
+  if (state in STATUS_CLASSES) {
+    return STATUS_CLASSES[state as keyof typeof STATUS_CLASSES];
+  }
+  return STATUS_CLASSES.unknown;
 }
 
 function getStatusText(state: ServerState) {
diff --git a/apps/frontend/src/components/ui/servers/PanelTerminal.vue b/apps/frontend/src/components/ui/servers/PanelTerminal.vue
index 02d7edb90..d3c7c457e 100644
--- a/apps/frontend/src/components/ui/servers/PanelTerminal.vue
+++ b/apps/frontend/src/components/ui/servers/PanelTerminal.vue
@@ -7,16 +7,17 @@
           type="text"
           placeholder="Search logs"
           class="h-12 !w-full !pl-10 !pr-48"
+          :disabled="loading"
           @keydown.escape="clearSearch"
         />
         <SearchIcon class="absolute left-4 top-1/2 -translate-y-1/2" />
-        <ButtonStyled v-if="searchInput" @click="clearSearch">
+        <ButtonStyled v-if="searchInput && !loading" @click="clearSearch">
           <button class="absolute right-2 top-1/2 -translate-y-1/2">
             <XIcon class="h-5 w-5" />
           </button>
         </ButtonStyled>
         <span
-          v-if="pyroConsole.filteredOutput.value.length && searchInput"
+          v-if="pyroConsole.filteredOutput.value.length && searchInput && !loading"
           class="pointer-events-none absolute right-12 top-1/2 -translate-y-1/2 select-none whitespace-pre text-sm"
         >
           {{ pyroConsole.filteredOutput.value.length }}
@@ -29,11 +30,13 @@
       :class="[
         'terminal-font console relative z-[1] flex h-full w-full flex-col items-center justify-between overflow-hidden rounded-t-xl px-1 text-sm transition-transform duration-300',
         { 'scale-fullscreen screen-fixed inset-0 z-50 !rounded-none': isFullScreen },
+        { 'pointer-events-none': loading },
       ]"
+      :aria-hidden="loading"
       tabindex="-1"
     >
       <div
-        v-if="cosmetics.advancedRendering"
+        v-if="cosmetics.advancedRendering && !loading"
         class="progressive-gradient pointer-events-none absolute -bottom-6 left-0 z-[2] h-[10rem] w-full overflow-hidden rounded-xl"
         :style="`--transparency: ${Math.max(0, lerp(100, 0, bottomThreshold * 8))}%`"
         aria-hidden="true"
@@ -47,7 +50,7 @@
         />
       </div>
       <div
-        v-else
+        v-else-if="!loading"
         class="pointer-events-none absolute bottom-0 left-0 right-0 z-[2] h-[196px] w-full"
         :style="
           bottomThreshold > 0
@@ -79,6 +82,7 @@
       </div>
       <div data-pyro-terminal-scroll-root class="relative h-full w-full">
         <div
+          v-if="!loading"
           ref="scrollbarTrack"
           data-pyro-terminal-scrollbar-track
           class="absolute -right-1 bottom-16 top-4 z-[4] w-4 overflow-hidden"
@@ -118,7 +122,12 @@
           class="scrollbar-none absolute left-0 top-0 h-full w-full select-text overflow-x-auto overflow-y-auto py-6 pb-[72px]"
           @scroll.passive="() => handleListScroll()"
         >
-          <div data-pyro-terminal-virtual-height-watcher :style="{ height: `${totalHeight}px` }">
+          <div v-if="loading" class="h-full w-full" />
+          <div
+            v-else
+            data-pyro-terminal-virtual-height-watcher
+            :style="{ height: `${totalHeight}px` }"
+          >
             <ul
               class="m-0 list-none p-0"
               data-pyro-terminal-virtual-list
@@ -205,6 +214,7 @@
         <slot />
       </div>
       <button
+        v-if="!loading"
         data-pyro-fullscreen
         :label="isFullScreen ? 'Exit full screen' : 'Enter full screen'"
         class="experimental-styles-within absolute right-4 top-4 z-[3] grid h-12 w-12 place-content-center rounded-full border-[1px] border-solid border-button-border bg-bg-raised text-contrast transition-all duration-200 hover:scale-110 active:scale-95"
@@ -217,7 +227,7 @@
 
       <Transition name="fade">
         <div
-          v-if="hasSelection || isSingleLineSelected"
+          v-if="(hasSelection || isSingleLineSelected) && !loading"
           class="absolute right-20 top-4 z-[3] flex flex-row items-center"
           :class="{ '!right-4': searchInput || hasSelection || isSingleLineSelected }"
         >
@@ -247,7 +257,7 @@
 
       <Transition name="scroll-to-bottom">
         <button
-          v-if="bottomThreshold > 0 && !isScrolledToBottom"
+          v-if="bottomThreshold > 0 && !isScrolledToBottom && !loading"
           data-pyro-scrolltobottom
           label="Scroll to bottom"
           class="scroll-to-bottom-btn experimental-styles-within absolute bottom-[4.5rem] right-4 z-[3] grid h-12 w-12 place-content-center rounded-full border-[1px] border-solid border-button-border bg-bg-raised text-contrast transition-all duration-200 hover:scale-110 active:scale-95"
@@ -291,13 +301,14 @@ import { useDebounceFn } from "@vueuse/core";
 import { NewModal } from "@modrinth/ui";
 import ButtonStyled from "@modrinth/ui/src/components/base/ButtonStyled.vue";
 import DOMPurify from "dompurify";
-import { usePyroConsole } from "~/store/console.ts";
+import { useModrinthServersConsole } from "~/store/console.ts";
 
 const { $cosmetics } = useNuxtApp();
 const cosmetics = $cosmetics;
 
 const props = defineProps<{
   fullScreen: boolean;
+  loading?: boolean;
 }>();
 
 const BUFFER_SIZE = 5;
@@ -307,8 +318,8 @@ const SEPARATOR_HEIGHT = 32;
 const SCROLL_END_DELAY = 150;
 const progressiveBlurIterations = ref(8);
 
-const pyroConsole = usePyroConsole();
-const consoleOutput = pyroConsole.output;
+const pyroConsole = useModrinthServersConsole();
+const consoleOutput = computed(() => (props.loading ? [] : pyroConsole.output.value));
 
 const scrollContainer = ref<HTMLElement | null>(null);
 
diff --git a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
index ed15a3b5c..853b83c6d 100644
--- a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
@@ -69,10 +69,11 @@
 <script setup lang="ts">
 import { ButtonStyled, NewModal } from "@modrinth/ui";
 import { DownloadIcon, XIcon } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServersFetchError } from "@modrinth/utils";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   project: any;
   versions: any[];
   currentVersion?: any;
@@ -98,8 +99,7 @@ const handleReinstall = async () => {
   try {
     const versionId = props.versions.find((v) => v.version_number === selectedVersion.value)?.id;
 
-    await props.server.general?.reinstall(
-      props.server.serverId,
+    await props.server.general.reinstall(
       false,
       props.project.id,
       versionId,
@@ -110,7 +110,7 @@ const handleReinstall = async () => {
     emit("reinstall");
     hide();
   } catch (error) {
-    if (error instanceof PyroFetchError && error.statusCode === 429) {
+    if (error instanceof ModrinthServersFetchError && error.statusCode === 429) {
       addNotification({
         group: "server",
         title: "Cannot reinstall server",
diff --git a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
index 5c4ebc3d9..38f4d7e0f 100644
--- a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
@@ -116,11 +116,12 @@
 <script setup lang="ts">
 import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
 import { UploadIcon, RightArrowIcon, XIcon, ServerIcon } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServersFetchError } from "@modrinth/utils";
 import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   backupInProgress?: BackupInProgressReason;
 }>();
 
@@ -175,7 +176,7 @@ const handleReinstall = async () => {
     window.scrollTo(0, 0);
     hide();
   } catch (error) {
-    if (error instanceof PyroFetchError && error.statusCode === 429) {
+    if (error instanceof ModrinthServersFetchError && error?.statusCode === 429) {
       addNotification({
         group: "server",
         title: "Cannot reinstall server",
diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index cdc71fa1f..1ed8a6147 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -127,7 +127,10 @@
           </div>
         </div>
 
-        <div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4">
+        <div
+          v-if="!initialSetup"
+          class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4"
+        >
           <div class="flex w-full flex-row items-center justify-between">
             <label class="w-full text-lg font-bold text-contrast" for="hard-reset">
               Erase all data
@@ -146,7 +149,10 @@
           <div class="font-bold">This does not affect your backups, which are stored off-site.</div>
         </div>
 
-        <BackupWarning :backup-link="`/servers/manage/${props.server?.serverId}/backups`" />
+        <BackupWarning
+          v-if="!initialSetup"
+          :backup-link="`/servers/manage/${props.server?.serverId}/backups`"
+        />
       </div>
 
       <div class="mt-4 flex justify-start gap-4">
@@ -194,9 +200,9 @@
 import { BackupWarning, ButtonStyled, NewModal, Toggle } from "@modrinth/ui";
 import { DropdownIcon, RightArrowIcon, ServerIcon, XIcon } from "@modrinth/assets";
 import { $fetch } from "ofetch";
-import type { Server } from "~/composables/pyroServers";
-import type { Loaders } from "~/types/servers";
+import { type Loaders, ModrinthServersFetchError } from "@modrinth/utils";
 import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const { formatMessage } = useVIntl();
 
@@ -214,9 +220,10 @@ type VersionMap = Record<string, LoaderVersion[]>;
 type VersionCache = Record<string, any>;
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   currentLoader: Loaders | undefined;
   backupInProgress?: BackupInProgressReason;
+  initialSetup?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -313,7 +320,7 @@ const selectedLoaderVersions = computed<string[]>(() => {
   const loader = selectedLoader.value.toLowerCase();
 
   if (loader === "paper") {
-    return paperVersions.value[selectedMCVersion.value].map((x) => `${x}`) || [];
+    return paperVersions.value[selectedMCVersion.value]?.map((x) => `${x}`) || [];
   }
 
   if (loader === "purpur") {
@@ -451,12 +458,11 @@ const handleReinstall = async () => {
 
   try {
     await props.server.general?.reinstall(
-      props.server.serverId,
       true,
       selectedLoader.value,
       selectedMCVersion.value,
       selectedLoader.value === "Vanilla" ? "" : selectedLoaderVersion.value,
-      hardReset.value,
+      props.initialSetup ? true : hardReset.value,
     );
 
     emit("reinstall", {
@@ -467,7 +473,7 @@ const handleReinstall = async () => {
 
     hide();
   } catch (error) {
-    if (error instanceof PyroFetchError && error.statusCode === 429) {
+    if (error instanceof ModrinthServersFetchError && (error as any)?.statusCode === 429) {
       addNotification({
         group: "server",
         title: "Cannot reinstall server",
diff --git a/apps/frontend/src/components/ui/servers/SaveBanner.vue b/apps/frontend/src/components/ui/servers/SaveBanner.vue
index 65508267e..13835f39b 100644
--- a/apps/frontend/src/components/ui/servers/SaveBanner.vue
+++ b/apps/frontend/src/components/ui/servers/SaveBanner.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import { ButtonStyled } from "@modrinth/ui";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
   isUpdating: boolean;
@@ -39,7 +39,7 @@ const props = defineProps<{
   save: () => void;
   reset: () => void;
   isVisible: boolean;
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const saveAndRestart = async () => {
diff --git a/apps/frontend/src/components/ui/servers/ServerInstallation.vue b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
new file mode 100644
index 000000000..636e33db8
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
@@ -0,0 +1,278 @@
+<template>
+  <LazyUiServersPlatformVersionSelectModal
+    ref="versionSelectModal"
+    :server="props.server"
+    :current-loader="ignoreCurrentInstallation ? undefined : (data?.loader as Loaders)"
+    :backup-in-progress="backupInProgress"
+    :initial-setup="ignoreCurrentInstallation"
+    @reinstall="emit('reinstall', $event)"
+  />
+
+  <LazyUiServersPlatformMrpackModal
+    ref="mrpackModal"
+    :server="props.server"
+    @reinstall="emit('reinstall', $event)"
+  />
+
+  <LazyUiServersPlatformChangeModpackVersionModal
+    ref="modpackVersionModal"
+    :server="props.server"
+    :project="data?.project"
+    :versions="Array.isArray(versions) ? versions : []"
+    :current-version="currentVersion"
+    :current-version-id="data?.upstream?.version_id"
+    :server-status="data?.status"
+    @reinstall="emit('reinstall')"
+  />
+
+  <div class="flex h-full w-full flex-col">
+    <div v-if="data && versions" class="flex w-full flex-col">
+      <div class="card flex flex-col gap-4">
+        <div class="flex select-none flex-col items-center justify-between gap-2 lg:flex-row">
+          <div class="flex flex-row items-center gap-2">
+            <h2 class="m-0 text-lg font-bold text-contrast">Modpack</h2>
+            <div
+              v-if="updateAvailable"
+              class="rounded-full bg-bg-orange px-2 py-1 text-xs font-medium text-orange"
+            >
+              <span>Update available</span>
+            </div>
+          </div>
+          <div v-if="data.upstream" class="flex gap-4">
+            <ButtonStyled>
+              <button
+                class="!w-full sm:!w-auto"
+                :disabled="isInstalling"
+                @click="mrpackModal.show()"
+              >
+                <UploadIcon class="size-4" /> Import .mrpack
+              </button>
+            </ButtonStyled>
+            <!-- dumb hack to make a button link not a link -->
+            <ButtonStyled>
+              <template v-if="isInstalling">
+                <button :disabled="isInstalling">
+                  <TransferIcon class="size-4" />
+                  Switch modpack
+                </button>
+              </template>
+              <nuxt-link v-else :to="`/modpacks?sid=${props.server.serverId}`">
+                <TransferIcon class="size-4" />
+                Switch modpack
+              </nuxt-link>
+            </ButtonStyled>
+          </div>
+        </div>
+        <div v-if="data.upstream" class="flex flex-col gap-2">
+          <div
+            v-if="versionsError || currentVersionError"
+            class="rounded-2xl border border-solid border-red p-4 text-contrast"
+          >
+            <p class="m-0 font-bold">Something went wrong while loading your modpack.</p>
+            <p class="m-0 mb-2 mt-1 text-sm">
+              {{ versionsError || currentVersionError }}
+            </p>
+            <ButtonStyled>
+              <button :disabled="isInstalling" @click="refreshData">Retry</button>
+            </ButtonStyled>
+          </div>
+
+          <NewProjectCard
+            v-if="!versionsError && !currentVersionError"
+            class="!cursor-default !bg-bg !filter-none"
+            :project="projectCardData"
+            :categories="data.project?.categories || []"
+          >
+            <template #actions>
+              <ButtonStyled color="brand">
+                <button :disabled="isInstalling" @click="modpackVersionModal.show()">
+                  <SettingsIcon class="size-4" />
+                  Change version
+                </button>
+              </ButtonStyled>
+            </template>
+          </NewProjectCard>
+        </div>
+        <div v-else class="flex w-full flex-col items-center gap-2 sm:w-fit sm:flex-row">
+          <ButtonStyled>
+            <nuxt-link
+              v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
+              :class="{ disabled: backupInProgress }"
+              class="!w-full sm:!w-auto"
+              :to="`/modpacks?sid=${props.server.serverId}`"
+            >
+              <CompassIcon class="size-4" /> Find a modpack
+            </nuxt-link>
+          </ButtonStyled>
+          <span class="hidden sm:block">or</span>
+          <ButtonStyled>
+            <button
+              v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
+              :disabled="!!backupInProgress"
+              class="!w-full sm:!w-auto"
+              @click="mrpackModal.show()"
+            >
+              <UploadIcon class="size-4" /> Upload .mrpack file
+            </button>
+          </ButtonStyled>
+        </div>
+      </div>
+
+      <div class="card flex flex-col gap-4">
+        <div class="flex flex-col gap-2">
+          <h2 class="m-0 text-lg font-bold text-contrast">Platform</h2>
+          <p class="m-0">Your server's platform is the software that runs mods and plugins.</p>
+          <div v-if="data.upstream" class="mt-2 flex items-center gap-2">
+            <InfoIcon class="hidden sm:block" />
+            <span class="text-sm text-secondary">
+              The current platform was automatically selected based on your modpack.
+            </span>
+          </div>
+        </div>
+        <div
+          class="flex w-full flex-col gap-1 rounded-2xl"
+          :class="{
+            'pointer-events-none cursor-not-allowed select-none opacity-50':
+              props.server.general?.status === 'installing',
+          }"
+          :tabindex="props.server.general?.status === 'installing' ? -1 : 0"
+        >
+          <UiServersLoaderSelector
+            :data="
+              ignoreCurrentInstallation
+                ? {
+                    loader: null,
+                    loader_version: null,
+                  }
+                : data
+            "
+            :is-installing="isInstalling"
+            @select-loader="selectLoader"
+          />
+        </div>
+      </div>
+    </div>
+
+    <div v-else />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ButtonStyled, NewProjectCard } from "@modrinth/ui";
+import { TransferIcon, UploadIcon, InfoIcon, CompassIcon, SettingsIcon } from "@modrinth/assets";
+import type { Loaders } from "@modrinth/utils";
+import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
+
+const { formatMessage } = useVIntl();
+
+const props = defineProps<{
+  server: ModrinthServer;
+  ignoreCurrentInstallation?: boolean;
+  backupInProgress?: BackupInProgressReason;
+}>();
+
+const emit = defineEmits<{
+  reinstall: [any?];
+}>();
+
+const isInstalling = computed(() => props.server.general?.status === "installing");
+
+const versionSelectModal = ref();
+const mrpackModal = ref();
+const modpackVersionModal = ref();
+
+const data = computed(() => props.server.general);
+
+const {
+  data: versions,
+  error: versionsError,
+  refresh: refreshVersions,
+} = await useAsyncData(
+  `content-loader-versions-${data.value?.upstream?.project_id}`,
+  async () => {
+    if (!data.value?.upstream?.project_id) return [];
+    try {
+      const result = await useBaseFetch(`project/${data.value.upstream.project_id}/version`);
+      return result || [];
+    } catch (e) {
+      console.error("couldnt fetch all versions:", e);
+      throw new Error("Failed to load modpack versions.");
+    }
+  },
+  { default: () => [] },
+);
+
+const {
+  data: currentVersion,
+  error: currentVersionError,
+  refresh: refreshCurrentVersion,
+} = await useAsyncData(
+  `content-loader-version-${data.value?.upstream?.version_id}`,
+  async () => {
+    if (!data.value?.upstream?.version_id) return null;
+    try {
+      const result = await useBaseFetch(`version/${data.value.upstream.version_id}`);
+      return result || null;
+    } catch (e) {
+      console.error("couldnt fetch version:", e);
+      throw new Error("Failed to load modpack version.");
+    }
+  },
+  { default: () => null },
+);
+
+const projectCardData = computed(() => ({
+  icon_url: data.value?.project?.icon_url,
+  title: data.value?.project?.title,
+  description: data.value?.project?.description,
+  downloads: data.value?.project?.downloads,
+  follows: data.value?.project?.followers,
+  // @ts-ignore
+  date_modified: currentVersion.value?.date_published || data.value?.project?.updated,
+}));
+
+const selectLoader = (loader: string) => {
+  versionSelectModal.value?.show(loader as Loaders);
+};
+
+const refreshData = async () => {
+  await Promise.all([refreshVersions(), refreshCurrentVersion()]);
+};
+
+const updateAvailable = computed(() => {
+  // so sorry
+  // @ts-ignore
+  if (!data.value?.upstream || !versions.value?.length || !currentVersion.value) {
+    return false;
+  }
+
+  // @ts-ignore
+  const latestVersion = versions.value[0];
+  // @ts-ignore
+  return latestVersion.id !== currentVersion.value.id;
+});
+
+watch(
+  () => props.server.general?.status,
+  async (newStatus, oldStatus) => {
+    if (oldStatus === "installing" && newStatus === "available") {
+      await Promise.all([
+        refreshVersions(),
+        refreshCurrentVersion(),
+        props.server.refresh(["general"]),
+      ]);
+    }
+  },
+);
+</script>
+
+<style scoped>
+.stylized-toggle:checked::after {
+  background: var(--color-accent-contrast) !important;
+}
+
+.button-base:active {
+  scale: none !important;
+}
+</style>
diff --git a/apps/frontend/src/components/ui/servers/ServerListing.vue b/apps/frontend/src/components/ui/servers/ServerListing.vue
index bacf2ab34..23b78a0b8 100644
--- a/apps/frontend/src/components/ui/servers/ServerListing.vue
+++ b/apps/frontend/src/components/ui/servers/ServerListing.vue
@@ -43,7 +43,14 @@
         </div>
         <div v-else class="min-h-[20px]"></div>
 
+        <div
+          v-if="isConfiguring"
+          class="flex min-w-0 items-center gap-2 truncate text-sm font-semibold text-brand"
+        >
+          <SparklesIcon class="size-5 shrink-0" /> New server
+        </div>
         <UiServersServerInfoLabels
+          v-else
           :server-data="{ game, mc_version, loader, loader_version, net }"
           :show-game-label="showGameLabel"
           :show-loader-label="showLoaderLabel"
@@ -73,13 +80,14 @@
 </template>
 
 <script setup lang="ts">
-import { ChevronRightIcon, HammerIcon, LockIcon } from "@modrinth/assets";
-import type { Project, Server } from "~/types/servers";
+import { ChevronRightIcon, LockIcon, SparklesIcon } from "@modrinth/assets";
+import type { Project, Server } from "@modrinth/utils";
+import { useModrinthServers } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<Partial<Server>>();
 
 if (props.server_id) {
-  await usePyroServer(props.server_id, ["general"]);
+  await useModrinthServers(props.server_id, ["general"]);
 }
 
 const showGameLabel = computed(() => !!props.game);
@@ -102,8 +110,9 @@ if (props.upstream) {
 const image = useState<string | undefined>(`server-icon-${props.server_id}`, () => undefined);
 
 if (import.meta.server && projectData.value?.icon_url) {
-  await usePyroServer(props.server_id!, ["general"]);
+  await useModrinthServers(props.server_id!, ["general"]);
 }
 
 const iconUrl = computed(() => projectData.value?.icon_url || undefined);
+const isConfiguring = computed(() => props.flows?.intro);
 </script>
diff --git a/apps/frontend/src/components/ui/servers/ServerSidebar.vue b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
index d287109f2..c3edaab68 100644
--- a/apps/frontend/src/components/ui/servers/ServerSidebar.vue
+++ b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
@@ -34,15 +34,15 @@
 <script setup lang="ts">
 import { RightArrowIcon } from "@modrinth/assets";
 import type { RouteLocationNormalized } from "vue-router";
-import type { Server } from "~/composables/pyroServers";
 import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const emit = defineEmits(["reinstall"]);
 
 defineProps<{
   navLinks: { label: string; href: string; icon: Component; external?: boolean }[];
   route: RouteLocationNormalized;
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   backupInProgress?: BackupInProgressReason;
 }>();
 
diff --git a/apps/frontend/src/components/ui/servers/ServerStats.vue b/apps/frontend/src/components/ui/servers/ServerStats.vue
index 192603c8f..30119bc51 100644
--- a/apps/frontend/src/components/ui/servers/ServerStats.vue
+++ b/apps/frontend/src/components/ui/servers/ServerStats.vue
@@ -3,6 +3,8 @@
     data-pyro-server-stats
     style="font-variant-numeric: tabular-nums"
     class="flex select-none flex-col items-center gap-6 md:flex-row"
+    :class="{ 'pointer-events-none': loading }"
+    :aria-hidden="loading"
   >
     <div
       v-for="(metric, index) in metrics"
@@ -18,7 +20,7 @@
           <h3 class="flex items-center gap-2 text-base font-normal text-secondary">
             {{ metric.title }}
             <IssuesIcon
-              v-if="metric.warning"
+              v-if="metric.warning && !loading"
               v-tooltip="metric.warning"
               class="size-5"
               :style="{ color: 'var(--color-orange)' }"
@@ -28,51 +30,76 @@
         <div class="absolute -left-8 -top-4 h-28 w-56 rounded-full bg-bg-raised blur-lg" />
       </div>
 
-      <component :is="metric.icon" class="absolute right-10 top-10 z-10" />
-      <ClientOnly>
-        <VueApexCharts
-          v-if="metric.showGraph"
-          type="area"
-          height="142"
-          :options="getChartOptions(metric.warning)"
-          :series="[{ name: metric.title, data: metric.data }]"
-          class="chart absolute bottom-0 left-0 right-0 w-full opacity-0"
-        />
-      </ClientOnly>
+      <component
+        :is="metric.icon"
+        class="absolute right-10 top-10 z-10 size-8"
+        style="width: 2rem; height: 2rem"
+      />
+
+      <div class="chart-space absolute bottom-0 left-0 right-0">
+        <ClientOnly>
+          <VueApexCharts
+            v-if="metric.showGraph && !loading"
+            type="area"
+            height="142"
+            :options="getChartOptions(metric.warning, index)"
+            :series="[{ name: metric.title, data: metric.data }]"
+            class="chart"
+            :class="chartsReady.has(index) ? 'opacity-100' : 'opacity-0'"
+          />
+        </ClientOnly>
+      </div>
     </div>
 
-    <NuxtLink
-      :to="`/servers/manage/${serverId}/files`"
-      class="relative isolate min-h-[156px] w-full overflow-hidden rounded-2xl bg-bg-raised p-8 transition-transform duration-100 hover:scale-105 active:scale-100"
+    <component
+      :is="loading ? 'div' : 'NuxtLink'"
+      :to="loading ? undefined : `/servers/manage/${serverId}/files`"
+      class="relative isolate min-h-[156px] w-full overflow-hidden rounded-2xl bg-bg-raised p-8"
+      :class="loading ? '' : 'transition-transform duration-100 hover:scale-105 active:scale-100'"
     >
       <div class="flex flex-row items-center gap-2">
         <h2 class="m-0 -ml-0.5 mt-1 text-3xl font-extrabold text-contrast">
-          {{ formatBytes(stats.storage_usage_bytes) }}
+          {{ loading ? "0 B" : formatBytes(stats.storage_usage_bytes) }}
         </h2>
       </div>
       <h3 class="text-base font-normal text-secondary">Storage usage</h3>
       <FolderOpenIcon class="absolute right-10 top-10 size-8" />
-    </NuxtLink>
+    </component>
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, shallowRef } from "vue";
-import { FolderOpenIcon, CPUIcon, DBIcon, IssuesIcon } from "@modrinth/assets";
+import { FolderOpenIcon, CPUIcon, DatabaseIcon, IssuesIcon } from "@modrinth/assets";
 import { useStorage } from "@vueuse/core";
-import type { Stats } from "~/types/servers";
+import type { Stats } from "@modrinth/utils";
 
 const route = useNativeRoute();
 const serverId = route.params.id;
 const VueApexCharts = defineAsyncComponent(() => import("vue3-apexcharts"));
 
+const chartsReady = ref(new Set<number>());
+
 const userPreferences = useStorage(`pyro-server-${serverId}-preferences`, {
   ramAsNumber: false,
 });
 
-const props = defineProps<{ data: Stats }>();
+const props = withDefaults(defineProps<{ data?: Stats; loading?: boolean }>(), {
+  loading: false,
+});
 
-const stats = shallowRef(props.data.current);
+const stats = shallowRef(
+  props.data?.current || {
+    cpu_percent: 0,
+    ram_usage_bytes: 0,
+    ram_total_bytes: 1, // Avoid division by zero
+    storage_usage_bytes: 0,
+  },
+);
+
+const onChartReady = (index: number) => {
+  chartsReady.value.add(index);
+};
 
 const formatBytes = (bytes: number) => {
   const units = ["B", "KB", "MB", "GB"];
@@ -94,6 +121,29 @@ const updateGraphData = (arr: number[], newValue: number) => {
 };
 
 const metrics = computed(() => {
+  if (props.loading) {
+    return [
+      {
+        title: "CPU usage",
+        value: "0.00%",
+        max: "100%",
+        icon: CPUIcon,
+        data: cpuData.value,
+        showGraph: false,
+        warning: null,
+      },
+      {
+        title: "Memory usage",
+        value: "0.00%",
+        max: "100%",
+        icon: DatabaseIcon,
+        data: ramData.value,
+        showGraph: false,
+        warning: null,
+      },
+    ];
+  }
+
   const ramPercent = Math.min(
     (stats.value.ram_usage_bytes / stats.value.ram_total_bytes) * 100,
     100,
@@ -119,7 +169,7 @@ const metrics = computed(() => {
         ? formatBytes(stats.value.ram_usage_bytes)
         : `${ramPercent.toFixed(2)}%`,
       max: userPreferences.value.ramAsNumber ? formatBytes(stats.value.ram_total_bytes) : "100%",
-      icon: DBIcon,
+      icon: DatabaseIcon,
       data: ramData.value,
       showGraph: true,
       warning: ramPercent >= 90 ? "Memory usage is very high" : null,
@@ -127,7 +177,7 @@ const metrics = computed(() => {
   ];
 });
 
-const getChartOptions = (hasWarning: string | null) => ({
+const getChartOptions = (hasWarning: string | null, index: number) => ({
   chart: {
     type: "area",
     animations: { enabled: false },
@@ -139,6 +189,10 @@ const getChartOptions = (hasWarning: string | null) => ({
       top: 0,
       bottom: 0,
     },
+    events: {
+      mounted: () => onChartReady(index),
+      updated: () => onChartReady(index),
+    },
   },
   stroke: { curve: "smooth", width: 3 },
   fill: {
@@ -172,24 +226,26 @@ const getChartOptions = (hasWarning: string | null) => ({
 });
 
 watch(
-  () => props.data.current,
+  () => props.data?.current,
   (newStats) => {
-    stats.value = newStats;
+    if (newStats) {
+      stats.value = newStats;
+    }
   },
 );
 </script>
 
 <style scoped>
-.chart {
-  animation: fadeIn 0.2s ease-out 0.2s forwards;
+.chart-space {
+  height: 142px;
+  width: calc(100% + 48px);
   margin-left: -24px;
   margin-right: -24px;
-  width: calc(100% + 48px) !important;
 }
 
-@keyframes fadeIn {
-  to {
-    opacity: 1;
-  }
+.chart {
+  width: 100% !important;
+  height: 142px !important;
+  transition: opacity 0.3s ease-out;
 }
 </style>
diff --git a/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue b/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
index 0ae4a3ab7..5e53075a7 100644
--- a/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
+++ b/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
@@ -224,7 +224,7 @@
 
 <script setup lang="ts">
 import { LoaderIcon } from "@modrinth/assets";
-import type { Loaders } from "~/types/servers";
+import type { Loaders } from "@modrinth/utils";
 
 defineProps<{
   loader: Loaders;
diff --git a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
index 7c08bdf9e..c6cd32b19 100644
--- a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { ButtonStyled } from "@modrinth/ui";
-import { RightArrowIcon, SparklesIcon, UnknownIcon } from "@modrinth/assets";
+import { ButtonStyled, ServersSpecs } from "@modrinth/ui";
 import type { MessageDescriptor } from "@vintl/vintl";
+import { formatPrice } from "@modrinth/utils";
 
-const { formatMessage } = useVIntl();
+const { formatMessage, locale } = useVIntl();
 
 const emit = defineEmits<{
   (e: "select" | "scroll-to-faq"): void;
@@ -18,8 +18,8 @@ const plans: Record<
     accentText: string;
     accentBg: string;
     name: MessageDescriptor;
-    symbol: MessageDescriptor;
     description: MessageDescriptor;
+    mostPopular: boolean;
   }
 > = {
   small: {
@@ -30,15 +30,11 @@ const plans: Record<
       id: "servers.plan.small.name",
       defaultMessage: "Small",
     }),
-    symbol: defineMessage({
-      id: "servers.plan.small.symbol",
-      defaultMessage: "S",
-    }),
     description: defineMessage({
       id: "servers.plan.small.description",
-      defaultMessage:
-        "Perfect for vanilla multiplayer, small friend groups, SMPs, and light modding.",
+      defaultMessage: "Perfect for 1–5 friends with a few light mods.",
     }),
+    mostPopular: false,
   },
   medium: {
     buttonColor: "green",
@@ -48,14 +44,11 @@ const plans: Record<
       id: "servers.plan.medium.name",
       defaultMessage: "Medium",
     }),
-    symbol: defineMessage({
-      id: "servers.plan.medium.symbol",
-      defaultMessage: "M",
-    }),
     description: defineMessage({
       id: "servers.plan.medium.description",
-      defaultMessage: "Great for modded multiplayer and small communities.",
+      defaultMessage: "Great for 6–15 players and multiple mods.",
     }),
+    mostPopular: true,
   },
   large: {
     buttonColor: "purple",
@@ -65,14 +58,11 @@ const plans: Record<
       id: "servers.plan.large.name",
       defaultMessage: "Large",
     }),
-    symbol: defineMessage({
-      id: "servers.plan.large.symbol",
-      defaultMessage: "L",
-    }),
     description: defineMessage({
       id: "servers.plan.large.description",
-      defaultMessage: "Ideal for larger communities, modpacks, and heavy modding.",
+      defaultMessage: "Ideal for 15–25 players, modpacks, or heavy modding.",
     }),
+    mostPopular: false,
   },
 };
 
@@ -83,42 +73,30 @@ const props = defineProps<{
   storage: number;
   cpus: number;
   price: number;
+  interval: "monthly" | "quarterly" | "yearly";
+  currency: string;
+  isUsa: boolean;
 }>();
 
 const outOfStock = computed(() => {
   return !props.capacity || props.capacity === 0;
 });
 
-const lowStock = computed(() => {
-  return !props.capacity || props.capacity < 8;
-});
-
-const formattedRam = computed(() => {
-  return props.ram / 1024;
-});
-
-const formattedStorage = computed(() => {
-  return props.storage / 1024;
-});
-
-const sharedCpus = computed(() => {
-  return props.cpus / 2;
+const billingMonths = computed(() => {
+  if (props.interval === "yearly") {
+    return 12;
+  } else if (props.interval === "quarterly") {
+    return 3;
+  }
+  return 1;
 });
 </script>
 
 <template>
-  <li class="relative flex w-full flex-col justify-between pt-12 lg:w-1/3">
-    <div
-      v-if="lowStock"
-      class="absolute left-0 right-0 top-[-2px] rounded-t-2xl p-4 text-center font-bold"
-      :class="outOfStock ? 'bg-bg-red' : 'bg-bg-orange'"
-    >
-      <template v-if="outOfStock"> Out of stock! </template>
-      <template v-else> Only {{ capacity }} left in stock! </template>
-    </div>
+  <li class="relative flex w-full flex-col justify-between">
     <div
       :style="
-        plan === 'medium'
+        plans[plan].mostPopular
           ? {
               background: `radial-gradient(
                   86.12% 101.64% at 95.97% 94.07%,
@@ -131,55 +109,41 @@ const sharedCpus = computed(() => {
           : undefined
       "
       class="flex w-full flex-col justify-between gap-4 rounded-2xl bg-bg p-8 text-left"
-      :class="{ '!rounded-t-none': lowStock }"
     >
-      <div class="flex flex-col gap-4">
-        <div class="flex flex-row items-center justify-between">
+      <div class="flex flex-col gap-2">
+        <div class="flex flex-row flex-wrap items-center gap-3">
           <h1 class="m-0">{{ formatMessage(plans[plan].name) }}</h1>
           <div
-            class="grid size-8 place-content-center rounded-full text-xs font-bold"
-            :class="`${plans[plan].accentBg} ${plans[plan].accentText}`"
+            v-if="plans[plan].mostPopular"
+            class="rounded-full bg-brand-highlight px-2 py-1 text-xs font-bold text-brand"
           >
-            {{ formatMessage(plans[plan].symbol) }}
+            Most popular
           </div>
         </div>
-        <p class="m-0">{{ formatMessage(plans[plan].description) }}</p>
-        <div
-          class="flex flex-row flex-wrap items-center gap-2 text-nowrap text-secondary xl:justify-between"
-        >
-          <p class="m-0">{{ formattedRam }} GB RAM</p>
-          <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-          <p class="m-0">{{ formattedStorage }} GB SSD</p>
-          <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-          <p class="m-0">{{ sharedCpus }} Shared CPUs</p>
-        </div>
-        <div class="flex items-center gap-2 text-secondary">
-          <SparklesIcon /> Bursts up to {{ cpus }} CPUs
-          <nuxt-link
-            v-tooltip="
-              `CPU bursting allows your server to temporarily use additional threads to help mitigate TPS spikes. Click for more info.`
-            "
-            to="/servers#cpu-burst"
-            @click="() => emit('scroll-to-faq')"
-          >
-            <UnknownIcon class="h-4 w-4 text-secondary opacity-80" />
-          </nuxt-link>
-        </div>
         <span class="m-0 text-2xl font-bold text-contrast">
-          ${{ price / 100 }}<span class="text-lg font-semibold text-secondary">/month</span>
+          {{ formatPrice(locale, price / billingMonths, currency, true) }}
+          {{ isUsa ? "" : currency }}
+          <span class="text-lg font-semibold text-secondary">
+            / month<template v-if="interval !== 'monthly'">, billed {{ interval }}</template>
+          </span>
         </span>
+        <p class="m-0 max-w-[18rem]">{{ formatMessage(plans[plan].description) }}</p>
       </div>
       <ButtonStyled
         :color="plans[plan].buttonColor"
-        :type="plan === 'medium' ? 'standard' : 'highlight-colored-text'"
+        :type="plans[plan].mostPopular ? 'standard' : 'highlight-colored-text'"
         size="large"
       >
         <span v-if="outOfStock" class="button-like disabled"> Out of Stock </span>
-        <button v-else @click="() => emit('select')">
-          Get Started
-          <RightArrowIcon class="shrink-0" />
-        </button>
+        <button v-else @click="() => emit('select')">Select plan</button>
       </ButtonStyled>
+      <ServersSpecs
+        :ram="ram"
+        :storage="storage"
+        :cpus="cpus"
+        :bursting-link="'/servers#cpu-burst'"
+        @click-bursting-link="() => emit('scroll-to-faq')"
+      />
     </div>
   </li>
 </template>
diff --git a/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue b/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
index b7446c36f..4b10b7a43 100644
--- a/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
+++ b/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
@@ -3,7 +3,7 @@ import { Accordion, ButtonStyled, NewModal, ServerNotice, TagItem } from "@modri
 import { PlusIcon, XIcon } from "@modrinth/assets";
 import type { ServerNotice as ServerNoticeType } from "@modrinth/utils";
 import { ref } from "vue";
-import { usePyroFetch } from "~/composables/pyroFetch.ts";
+import { useServersFetch } from "~/composables/servers/servers-fetch.ts";
 
 const app = useNuxtApp() as unknown as { $notify: any };
 
@@ -23,7 +23,7 @@ const assignedNodes = computed(() => assigned.value.filter((n) => n.kind === "no
 const inputField = ref("");
 
 async function refresh() {
-  await usePyroFetch("notices").then((res) => {
+  await useServersFetch("notices").then((res) => {
     const notices = res as ServerNoticeType[];
     assigned.value = notices.find((n) => n.id === notice.value?.id)?.assigned ?? [];
   });
@@ -33,9 +33,12 @@ async function assign(server: boolean = true) {
   const input = inputField.value.trim();
 
   if (input !== "" && notice.value) {
-    await usePyroFetch(`notices/${notice.value.id}/assign?${server ? "server" : "node"}=${input}`, {
-      method: "PUT",
-    }).catch((err) => {
+    await useServersFetch(
+      `notices/${notice.value.id}/assign?${server ? "server" : "node"}=${input}`,
+      {
+        method: "PUT",
+      },
+    ).catch((err) => {
       app.$notify({
         group: "main",
         title: "Error assigning notice",
@@ -75,9 +78,12 @@ async function unassignDetect() {
 
 async function unassign(id: string, server: boolean = true) {
   if (notice.value) {
-    await usePyroFetch(`notices/${notice.value.id}/unassign?${server ? "server" : "node"}=${id}`, {
-      method: "PUT",
-    }).catch((err) => {
+    await useServersFetch(
+      `notices/${notice.value.id}/unassign?${server ? "server" : "node"}=${id}`,
+      {
+        method: "PUT",
+      },
+    ).catch((err) => {
       app.$notify({
         group: "main",
         title: "Error unassigning notice",
diff --git a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
index 7b7c4f994..e76cb7233 100644
--- a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
+++ b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
@@ -2,13 +2,8 @@
 import dayjs from "dayjs";
 import { ButtonStyled, commonMessages, CopyCode, ServerNotice, TagItem } from "@modrinth/ui";
 import { EditIcon, SettingsIcon, TrashIcon } from "@modrinth/assets";
-import { ServerNotice as ServerNoticeType } from "@modrinth/utils";
-import { useRelativeTime } from "@modrinth/ui";
-import {
-  DISMISSABLE,
-  getDismissableMetadata,
-  NOTICE_LEVELS,
-} from "@modrinth/ui/src/utils/notices.ts";
+import type { ServerNotice as ServerNoticeType } from "@modrinth/utils";
+import { useRelativeTime, getDismissableMetadata, NOTICE_LEVELS } from "@modrinth/ui";
 import { useVIntl } from "@vintl/vintl";
 
 const { formatMessage } = useVIntl();
diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue
index abec85273..9109822e0 100644
--- a/apps/frontend/src/components/ui/thread/ConversationThread.vue
+++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue
@@ -214,7 +214,7 @@
 </template>
 
 <script setup>
-import { OverflowMenu, MarkdownEditor } from "@modrinth/ui";
+import { CopyCode, OverflowMenu, MarkdownEditor } from "@modrinth/ui";
 import {
   DropdownIcon,
   ReplyIcon,
@@ -226,7 +226,6 @@ import {
   ScaleIcon,
 } from "@modrinth/assets";
 import { useImageUpload } from "~/composables/image-upload.ts";
-import CopyCode from "~/components/ui/CopyCode.vue";
 import ThreadMessage from "~/components/ui/thread/ThreadMessage.vue";
 import { isStaff } from "~/helpers/users.js";
 import { isApproved, isRejected } from "~/helpers/projects.js";
diff --git a/apps/frontend/src/components/ui/thread/ThreadMessage.vue b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
index 607b269b3..9d962c98e 100644
--- a/apps/frontend/src/components/ui/thread/ThreadMessage.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
@@ -103,10 +103,8 @@ import {
   ModrinthIcon,
   ScaleIcon,
 } from "@modrinth/assets";
-import { AutoLink, OverflowMenu, useRelativeTime } from "@modrinth/ui";
+import { AutoLink, Avatar, Badge, OverflowMenu, useRelativeTime } from "@modrinth/ui";
 import { renderString } from "@modrinth/utils";
-import Avatar from "~/components/ui/Avatar.vue";
-import Badge from "~/components/ui/Badge.vue";
 import { isStaff } from "~/helpers/users.js";
 
 const props = defineProps({
diff --git a/apps/frontend/src/composables/country.ts b/apps/frontend/src/composables/country.ts
index 0d3dd6a81..cde074ff0 100644
--- a/apps/frontend/src/composables/country.ts
+++ b/apps/frontend/src/composables/country.ts
@@ -24,6 +24,7 @@ export const useUserCountry = () => {
   if (import.meta.client) {
     onMounted(() => {
       if (fromServer.value) return;
+      // @ts-expect-error - ignore TS not knowing about navigator.userLanguage
       const lang = navigator.language || navigator.userLanguage || "";
       const region = lang.split("-")[1];
       if (region) {
diff --git a/apps/frontend/src/composables/image-upload.ts b/apps/frontend/src/composables/image-upload.ts
index 5afc38850..5e7e74e81 100644
--- a/apps/frontend/src/composables/image-upload.ts
+++ b/apps/frontend/src/composables/image-upload.ts
@@ -19,7 +19,7 @@ export const useImageUpload = async (file: File, ctx: ImageUploadContext) => {
 
   // Make sure file is less than 1MB
   if (file.size > 1024 * 1024) {
-    throw new Error("File is too large");
+    throw new Error("File exceeds the 1MiB size limit");
   }
 
   const qs = new URLSearchParams();
diff --git a/apps/frontend/src/composables/pyroFetch.ts b/apps/frontend/src/composables/pyroFetch.ts
deleted file mode 100644
index 1c2e45a98..000000000
--- a/apps/frontend/src/composables/pyroFetch.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { $fetch, FetchError } from "ofetch";
-
-interface PyroFetchOptions {
-  method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-  contentType?: string;
-  body?: Record<string, any>;
-  version?: number;
-  override?: {
-    url?: string;
-    token?: string;
-  };
-  retry?: boolean;
-  bypassAuth?: boolean;
-}
-
-export class PyroFetchError extends Error {
-  constructor(
-    message: string,
-    public statusCode?: number,
-    public originalError?: Error,
-  ) {
-    super(message);
-    this.name = "PyroFetchError";
-  }
-}
-
-export async function usePyroFetch<T>(path: string, options: PyroFetchOptions = {}): Promise<T> {
-  const config = useRuntimeConfig();
-  const auth = await useAuth();
-  const authToken = auth.value?.token;
-
-  if (!authToken && !options.bypassAuth) {
-    throw new PyroFetchError("Cannot pyrofetch without auth", 10000);
-  }
-
-  const { method = "GET", contentType = "application/json", body, version = 0, override } = options;
-
-  const base = (import.meta.server ? config.pyroBaseUrl : config.public.pyroBaseUrl)?.replace(
-    /\/$/,
-    "",
-  );
-
-  if (!base) {
-    throw new PyroFetchError(
-      "Cannot pyrofetch without base url. Make sure to set a PYRO_BASE_URL in environment variables",
-      10001,
-    );
-  }
-
-  const fullUrl = override?.url
-    ? `https://${override.url}/${path.replace(/^\//, "")}`
-    : `${base}/modrinth/v${version}/${path.replace(/^\//, "")}`;
-
-  type HeadersRecord = Record<string, string>;
-
-  const authHeader: HeadersRecord = options.bypassAuth
-    ? {}
-    : {
-        Authorization: `Bearer ${override?.token ?? authToken}`,
-        "Access-Control-Allow-Headers": "Authorization",
-      };
-
-  const headers: HeadersRecord = {
-    ...authHeader,
-    "User-Agent": "Pyro/1.0 (https://pyro.host)",
-    Vary: "Accept, Origin",
-    "Content-Type": contentType,
-  };
-
-  if (import.meta.client && typeof window !== "undefined") {
-    headers.Origin = window.location.origin;
-  }
-
-  try {
-    const response = await $fetch<T>(fullUrl, {
-      method,
-      headers,
-      body: body && contentType === "application/json" ? JSON.stringify(body) : body ?? undefined,
-      timeout: 10000,
-      retry: options.retry !== false ? (method === "GET" ? 3 : 0) : 0,
-    });
-    return response;
-  } catch (error) {
-    console.error("Fetch error:", error);
-    if (error instanceof FetchError) {
-      const statusCode = error.response?.status;
-      const statusText = error.response?.statusText || "Unknown error";
-      const errorMessages: { [key: number]: string } = {
-        400: "Bad Request",
-        401: "Unauthorized",
-        403: "Forbidden",
-        404: "Not Found",
-        405: "Method Not Allowed",
-        429: "Too Many Requests",
-        500: "Internal Server Error",
-        502: "Bad Gateway",
-      };
-      const message =
-        statusCode && statusCode in errorMessages
-          ? errorMessages[statusCode]
-          : `HTTP Error: ${statusCode || "unknown"} ${statusText}`;
-      throw new PyroFetchError(`[PYROFETCH][PYRO] ${message}`, statusCode, error);
-    }
-    throw new PyroFetchError(
-      "[PYROFETCH][PYRO] An unexpected error occurred during the fetch operation.",
-      undefined,
-      error as Error,
-    );
-  }
-}
diff --git a/apps/frontend/src/composables/pyroServers.ts b/apps/frontend/src/composables/pyroServers.ts
deleted file mode 100644
index 9c758e110..000000000
--- a/apps/frontend/src/composables/pyroServers.ts
+++ /dev/null
@@ -1,1890 +0,0 @@
-// usePyroServer is a composable that interfaces with the REDACTED API to get data and control the users server
-import { $fetch, FetchError } from "ofetch";
-import type { ServerNotice } from "@modrinth/utils";
-import type { FilesystemOp, FSQueuedOp, WSBackupState, WSBackupTask } from "~/types/servers.ts";
-
-interface PyroFetchOptions {
-  method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-  contentType?: string;
-  body?: Record<string, any>;
-  version?: number;
-  override?: {
-    url?: string;
-    token?: string;
-  };
-  retry?: number | boolean;
-}
-
-class PyroServerError extends Error {
-  public readonly errors: Map<string, Error> = new Map();
-  public readonly timestamp: number = Date.now();
-
-  constructor(message?: string) {
-    super(message || "Multiple errors occurred");
-    this.name = "PyroServerError";
-  }
-
-  addError(module: string, error: Error) {
-    this.errors.set(module, error);
-    this.message = this.buildErrorMessage();
-  }
-
-  hasErrors() {
-    return this.errors.size > 0;
-  }
-
-  private buildErrorMessage(): string {
-    return Array.from(this.errors.entries())
-      .map(([_module, error]) => error.message)
-      .join("\n");
-  }
-}
-
-type V1ErrorInfo = {
-  context?: string;
-  error: string;
-  description: string;
-};
-
-export class ServersError extends Error {
-  constructor(
-    message: string,
-    public readonly statusCode?: number,
-    public readonly originalError?: Error,
-    public readonly module?: string,
-    public readonly v1Error?: V1ErrorInfo,
-  ) {
-    let errorMessage = message;
-    let method = "GET";
-    let path = "";
-
-    if (originalError instanceof FetchError) {
-      const matches = message.match(/\[([A-Z]+)\]\s+"([^"]+)":/);
-      if (matches) {
-        method = matches[1];
-        path = matches[2].replace(/https?:\/\/[^/]+\/[^/]+\/v\d+\//, "");
-      }
-
-      const statusMessage = (() => {
-        if (!statusCode) return "Unknown Error";
-        switch (statusCode) {
-          case 400:
-            return "Bad Request";
-          case 401:
-            return "Unauthorized";
-          case 403:
-            return "Forbidden";
-          case 404:
-            return "Not Found";
-          case 408:
-            return "Request Timeout";
-          case 429:
-            return "Too Many Requests";
-          case 500:
-            return "Internal Server Error";
-          case 502:
-            return "Bad Gateway";
-          case 503:
-            return "Service Unavailable";
-          case 504:
-            return "Gateway Timeout";
-          default:
-            return `HTTP ${statusCode}`;
-        }
-      })();
-
-      errorMessage = `[${method}] ${statusMessage} (${statusCode}) while fetching ${path}${module ? ` in ${module}` : ""}`;
-    } else {
-      errorMessage = `${message}${statusCode ? ` (${statusCode})` : ""}${module ? ` in ${module}` : ""}`;
-    }
-
-    super(errorMessage);
-    this.name = "PyroServersFetchError";
-  }
-}
-
-export const handleError = (err: any) => {
-  if (err instanceof ServersError && err.v1Error) {
-    addNotification({
-      title: err.v1Error?.context ?? `An error occurred`,
-      type: "error",
-      text: err.v1Error.description,
-      errorCode: err.v1Error.error,
-    });
-  } else {
-    addNotification({
-      title: "An error occurred",
-      type: "error",
-      text: err.message ?? (err.data ? err.data.description : err),
-    });
-  }
-};
-
-async function PyroFetch<T>(
-  path: string,
-  options: PyroFetchOptions = {},
-  module?: string,
-  errorContext?: string,
-): Promise<T> {
-  const config = useRuntimeConfig();
-  const auth = await useAuth();
-  const authToken = auth.value?.token;
-
-  if (!authToken) {
-    throw new ServersError("Missing auth token", 401, undefined, module);
-  }
-
-  const {
-    method = "GET",
-    contentType = "application/json",
-    body,
-    version = 0,
-    override,
-    retry = method === "GET" ? 3 : 0,
-  } = options;
-
-  const base = (import.meta.server ? config.pyroBaseUrl : config.public.pyroBaseUrl)?.replace(
-    /\/$/,
-    "",
-  );
-
-  if (!base) {
-    throw new ServersError("Configuration error: Missing PYRO_BASE_URL", 500, undefined, module);
-  }
-
-  const versionString = `v${version}`;
-
-  let newOverrideUrl = override?.url;
-  if (newOverrideUrl && newOverrideUrl.includes("v0") && version !== 0) {
-    newOverrideUrl = newOverrideUrl.replace("v0", versionString);
-  }
-
-  const fullUrl = newOverrideUrl
-    ? `https://${newOverrideUrl}/${path.replace(/^\//, "")}`
-    : `${base}/modrinth/v${version}/${path.replace(/^\//, "")}`;
-
-  const headers: Record<string, string> = {
-    Authorization: `Bearer ${override?.token ?? authToken}`,
-    "Access-Control-Allow-Headers": "Authorization",
-    "User-Agent": "Pyro/1.0 (https://pyro.host)",
-    Vary: "Accept, Origin",
-  };
-
-  if (contentType !== "none") {
-    headers["Content-Type"] = contentType;
-  }
-
-  if (import.meta.client && typeof window !== "undefined") {
-    headers.Origin = window.location.origin;
-  }
-
-  let attempts = 0;
-  const maxAttempts = (typeof retry === "boolean" ? (retry ? 1 : 0) : retry) + 1;
-  let lastError: Error | null = null;
-
-  while (attempts < maxAttempts) {
-    try {
-      const response = await $fetch<T>(fullUrl, {
-        method,
-        headers,
-        body: body && contentType === "application/json" ? JSON.stringify(body) : body ?? undefined,
-        timeout: 10000,
-      });
-
-      return response;
-    } catch (error) {
-      lastError = error as Error;
-      attempts++;
-
-      if (error instanceof FetchError) {
-        let v1Error: V1ErrorInfo | undefined;
-
-        if (error.data.error && error.data.description) {
-          v1Error = {
-            context: errorContext,
-            ...error.data,
-          };
-        }
-
-        const statusCode = error.response?.status;
-        const isRetryable = statusCode ? [408, 429, 500, 502, 503, 504].includes(statusCode) : true;
-
-        if (!isRetryable || attempts >= maxAttempts) {
-          throw new ServersError(error.message, statusCode, error, module, v1Error);
-        }
-
-        const delay = Math.min(1000 * Math.pow(2, attempts - 1) + Math.random() * 1000, 10000);
-        await new Promise((resolve) => setTimeout(resolve, delay));
-        continue;
-      }
-
-      throw new ServersError(
-        "Unexpected error during fetch operation",
-        undefined,
-        error as Error,
-        module,
-      );
-    }
-  }
-
-  throw lastError || new Error("Maximum retry attempts reached");
-}
-
-const internalServerReference = ref<any>(null);
-
-interface License {
-  id: string;
-  name: string;
-  url: string;
-}
-
-interface DonationUrl {
-  id: string;
-  platform: string;
-  url: string;
-}
-
-interface GalleryItem {
-  url: string;
-  featured: boolean;
-  title: string;
-  description: string;
-  created: string;
-  ordering: number;
-}
-
-export interface Project {
-  slug: string;
-  title: string;
-  description: string;
-  categories: string[];
-  client_side: "required" | "optional";
-  server_side: "required" | "optional";
-  body: string;
-  status: "approved" | "pending" | "rejected";
-  requested_status: "approved" | "pending" | "rejected";
-  additional_categories: string[];
-  issues_url: string;
-  source_url: string;
-  wiki_url: string;
-  discord_url: string;
-  donation_urls: DonationUrl[];
-  project_type: "mod" | "resourcepack" | "map" | "plugin";
-  downloads: number;
-  icon_url: string;
-  color: number;
-  thread_id: string;
-  monetization_status: "monetized" | "non-monetized";
-  id: string;
-  team: string;
-  body_url: string | null;
-  moderator_message: string | null;
-  published: string;
-  updated: string;
-  approved: string;
-  queued: string;
-  followers: number;
-  license: License;
-  versions: string[];
-  game_versions: string[];
-  loaders: string[];
-  gallery: GalleryItem[];
-}
-
-interface General {
-  server_id: string;
-  name: string;
-  net: {
-    ip: string;
-    port: number;
-    domain: string;
-  };
-  game: string;
-  backup_quota: number;
-  used_backup_quota: number;
-  status: string;
-  suspension_reason:
-    | "moderated"
-    | "paymentfailed"
-    | "cancelled"
-    | "upgrading"
-    | "other"
-    | (string & {});
-  loader: string;
-  loader_version: string;
-  mc_version: string;
-  upstream: {
-    kind: "modpack" | "mod" | "resourcepack";
-    version_id: string;
-    project_id: string;
-  } | null;
-  motd?: string;
-  image?: string;
-  project?: Project;
-  sftp_username: string;
-  sftp_password: string;
-  sftp_host: string;
-  datacenter?: string;
-  notices?: ServerNotice[];
-  node: {
-    token: string;
-    instance: string;
-  };
-}
-
-interface Allocation {
-  port: number;
-  name: string;
-}
-
-interface Startup {
-  invocation: string;
-  original_invocation: string;
-  jdk_version: "lts8" | "lts11" | "lts17" | "lts21";
-  jdk_build: "corretto" | "temurin" | "graal";
-}
-
-export interface Mod {
-  filename: string;
-  project_id: string | undefined;
-  version_id: string | undefined;
-  name: string | undefined;
-  version_number: string | undefined;
-  icon_url: string | undefined;
-  owner: string | undefined;
-  disabled: boolean;
-  installing: boolean;
-}
-
-export interface Backup {
-  id: string;
-  name: string;
-  created_at: string;
-  locked: boolean;
-  automated: boolean;
-  interrupted: boolean;
-  ongoing: boolean;
-  task: {
-    [K in WSBackupTask]?: {
-      progress: number;
-      state: WSBackupState;
-    };
-  };
-}
-
-interface AutoBackupSettings {
-  enabled: boolean;
-  interval: number;
-}
-
-interface JWTAuth {
-  url: string;
-  token: string;
-}
-
-export interface DirectoryItem {
-  name: string;
-  type: "directory" | "file";
-  count?: number;
-  modified: number;
-  created: number;
-  path: string;
-}
-
-export interface DirectoryResponse {
-  items: DirectoryItem[];
-  total: number;
-  current?: number;
-}
-
-type ContentType = "mod" | "plugin";
-
-const constructServerProperties = (properties: any): string => {
-  let fileContent = `#Minecraft server properties\n#${new Date().toUTCString()}\n`;
-
-  for (const [key, value] of Object.entries(properties)) {
-    if (typeof value === "object") {
-      fileContent += `${key}=${JSON.stringify(value)}\n`;
-    } else if (typeof value === "boolean") {
-      fileContent += `${key}=${value ? "true" : "false"}\n`;
-    } else {
-      fileContent += `${key}=${value}\n`;
-    }
-  }
-
-  return fileContent;
-};
-
-const processImage = async (iconUrl: string | undefined) => {
-  const sharedImage = useState<string | undefined>(
-    `server-icon-${internalServerReference.value.serverId}`,
-  );
-
-  if (sharedImage.value) {
-    return sharedImage.value;
-  }
-
-  try {
-    const auth = await PyroFetch<JWTAuth>(`servers/${internalServerReference.value.serverId}/fs`);
-    try {
-      const fileData = await PyroFetch(`/download?path=/server-icon-original.png`, {
-        override: auth,
-        retry: false,
-      });
-
-      if (fileData instanceof Blob) {
-        if (import.meta.client) {
-          const dataURL = await new Promise<string>((resolve) => {
-            const canvas = document.createElement("canvas");
-            const ctx = canvas.getContext("2d");
-            const img = new Image();
-            img.onload = () => {
-              canvas.width = 512;
-              canvas.height = 512;
-              ctx?.drawImage(img, 0, 0, 512, 512);
-              const dataURL = canvas.toDataURL("image/png");
-              sharedImage.value = dataURL;
-              resolve(dataURL);
-              URL.revokeObjectURL(img.src);
-            };
-            img.src = URL.createObjectURL(fileData);
-          });
-          return dataURL;
-        }
-      }
-    } catch (error) {
-      if (error instanceof ServersError && error.statusCode === 404 && iconUrl) {
-        try {
-          const response = await fetch(iconUrl);
-          if (!response.ok) throw new Error("Failed to fetch icon");
-          const file = await response.blob();
-          const originalFile = new File([file], "server-icon-original.png", { type: "image/png" });
-
-          if (import.meta.client) {
-            const dataURL = await new Promise<string>((resolve) => {
-              const canvas = document.createElement("canvas");
-              const ctx = canvas.getContext("2d");
-              const img = new Image();
-              img.onload = () => {
-                canvas.width = 64;
-                canvas.height = 64;
-                ctx?.drawImage(img, 0, 0, 64, 64);
-                canvas.toBlob(async (blob) => {
-                  if (blob) {
-                    const scaledFile = new File([blob], "server-icon.png", { type: "image/png" });
-                    await PyroFetch(`/create?path=/server-icon.png&type=file`, {
-                      method: "POST",
-                      contentType: "application/octet-stream",
-                      body: scaledFile,
-                      override: auth,
-                    });
-                    await PyroFetch(`/create?path=/server-icon-original.png&type=file`, {
-                      method: "POST",
-                      contentType: "application/octet-stream",
-                      body: originalFile,
-                      override: auth,
-                    });
-                  }
-                }, "image/png");
-                const dataURL = canvas.toDataURL("image/png");
-                sharedImage.value = dataURL;
-                resolve(dataURL);
-                URL.revokeObjectURL(img.src);
-              };
-              img.src = URL.createObjectURL(file);
-            });
-            return dataURL;
-          }
-        } catch (error) {
-          console.error("Failed to process external icon:", error);
-        }
-      }
-    }
-  } catch (error) {
-    console.error("Failed to process server icon:", error);
-  }
-
-  sharedImage.value = undefined;
-  return undefined;
-};
-
-// ------------------ GENERAL ------------------ //
-
-const sendPowerAction = async (action: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/power`, {
-      method: "POST",
-      body: { action },
-    });
-
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-    await internalServerReference.value.refresh();
-  } catch (error) {
-    console.error("Error changing power state:", error);
-    throw error;
-  }
-};
-
-const updateName = async (newName: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/name`, {
-      method: "POST",
-      body: { name: newName },
-    });
-  } catch (error) {
-    console.error("Error updating server name:", error);
-    throw error;
-  }
-};
-
-const reinstallServer = async (
-  serverId: string,
-  loader: boolean,
-  projectId: string,
-  versionId?: string,
-  loaderVersionId?: string,
-  hardReset: boolean = false,
-) => {
-  try {
-    const hardResetParam = hardReset ? "true" : "false";
-    if (loader) {
-      if (projectId.toLowerCase() === "neoforge") {
-        projectId = "NeoForge";
-      }
-      await PyroFetch(`servers/${serverId}/reinstall?hard=${hardResetParam}`, {
-        method: "POST",
-        body: { loader: projectId, loader_version: loaderVersionId, game_version: versionId },
-      });
-    } else {
-      await PyroFetch(`servers/${serverId}/reinstall?hard=${hardResetParam}`, {
-        method: "POST",
-        body: { project_id: projectId, version_id: versionId },
-      });
-    }
-  } catch (error) {
-    console.error("Error reinstalling server:", error);
-    throw error;
-  }
-};
-
-const reinstallFromMrpack = async (mrpack: File, hardReset: boolean = false) => {
-  const hardResetParam = hardReset ? "true" : "false";
-  try {
-    const auth = await PyroFetch<JWTAuth>(
-      `servers/${internalServerReference.value.serverId}/reinstallFromMrpack`,
-    );
-
-    const formData = new FormData();
-    formData.append("file", mrpack);
-
-    const response = await fetch(
-      `https://${auth.url}/reinstallMrpackMultiparted?hard=${hardResetParam}`,
-      {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${auth.token}`,
-        },
-        body: formData,
-        signal: AbortSignal.timeout(30 * 60 * 1000),
-      },
-    );
-
-    if (!response.ok) {
-      throw new Error(`[pyroservers] native fetch err status: ${response.status}`);
-    }
-  } catch (error) {
-    console.error("Error reinstalling from mrpack:", error);
-    throw error;
-  }
-};
-
-const suspendServer = async (status: boolean) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/suspend`, {
-      method: "POST",
-      body: { suspended: status },
-    });
-  } catch (error) {
-    console.error("Error suspending server:", error);
-    throw error;
-  }
-};
-
-const fetchConfigFile = async (fileName: string) => {
-  try {
-    return await PyroFetch(`servers/${internalServerReference.value.serverId}/config/${fileName}`);
-  } catch (error) {
-    console.error("Error fetching config file:", error);
-    throw error;
-  }
-};
-
-const getMotd = async () => {
-  try {
-    const props = await downloadFile("/server.properties");
-    if (props) {
-      const lines = props.split("\n");
-      for (const line of lines) {
-        if (line.startsWith("motd=")) {
-          return line.slice(5);
-        }
-      }
-    }
-  } catch {
-    return null;
-  }
-};
-
-const setMotd = async (motd: string) => {
-  try {
-    const props = (await fetchConfigFile("ServerProperties")) as any;
-    if (props) {
-      props.motd = motd;
-      const newProps = constructServerProperties(props);
-      const octetStream = new Blob([newProps], { type: "application/octet-stream" });
-      const auth = await await PyroFetch<JWTAuth>(
-        `servers/${internalServerReference.value.serverId}/fs`,
-      );
-
-      return await PyroFetch(`/update?path=/server.properties`, {
-        method: "PUT",
-        contentType: "application/octet-stream",
-        body: octetStream,
-        override: auth,
-      });
-    }
-  } catch (error) {
-    console.error("Error setting motd:", error);
-  }
-};
-
-// ------------------ CONTENT ------------------ //
-
-const installContent = async (contentType: ContentType, projectId: string, versionId: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/mods`, {
-      method: "POST",
-      body: {
-        rinth_ids: { project_id: projectId, version_id: versionId },
-        install_as: contentType,
-      },
-    });
-  } catch (error) {
-    console.error("Error installing mod:", error);
-    throw error;
-  }
-};
-
-const removeContent = async (path: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/deleteMod`, {
-      method: "POST",
-      body: {
-        path,
-      },
-    });
-  } catch (error) {
-    console.error("Error removing mod:", error);
-    throw error;
-  }
-};
-
-const reinstallContent = async (replace: string, projectId: string, versionId: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/mods/update`, {
-      method: "POST",
-      body: { replace, project_id: projectId, version_id: versionId },
-    });
-  } catch (error) {
-    console.error("Error reinstalling mod:", error);
-    throw error;
-  }
-};
-
-// ------------------ BACKUPS ------------------ //
-
-const createBackup = async (backupName: string) => {
-  try {
-    const response = await PyroFetch<{ id: string }>(
-      `servers/${internalServerReference.value.serverId}/backups`,
-      {
-        method: "POST",
-        body: { name: backupName },
-      },
-    );
-    await internalServerReference.value.refresh(["backups"]);
-    return response.id;
-  } catch (error) {
-    console.error("Error creating backup:", error);
-    throw error;
-  }
-};
-
-const renameBackup = async (backupId: string, newName: string) => {
-  try {
-    await PyroFetch(
-      `servers/${internalServerReference.value.serverId}/backups/${backupId}/rename`,
-      {
-        method: "POST",
-        body: { name: newName },
-      },
-    );
-    await internalServerReference.value.refresh(["backups"]);
-  } catch (error) {
-    console.error("Error renaming backup:", error);
-    throw error;
-  }
-};
-
-const deleteBackup = async (backupId: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/backups/${backupId}`, {
-      method: "DELETE",
-    });
-    await internalServerReference.value.refresh(["backups"]);
-  } catch (error) {
-    console.error("Error deleting backup:", error);
-    throw error;
-  }
-};
-
-const restoreBackup = async (backupId: string) => {
-  try {
-    await PyroFetch(
-      `servers/${internalServerReference.value.serverId}/backups/${backupId}/restore`,
-      {
-        method: "POST",
-      },
-    );
-    await internalServerReference.value.refresh(["backups"]);
-  } catch (error) {
-    console.error("Error restoring backup:", error);
-    throw error;
-  }
-};
-
-const prepareBackup = async (backupId: string) => {
-  try {
-    await PyroFetch(
-      `servers/${internalServerReference.value.serverId}/backups/${backupId}/prepare-download`,
-      {
-        method: "POST",
-      },
-    );
-  } catch (error) {
-    console.error("Error preparing backup:", error);
-    throw error;
-  }
-};
-
-const updateAutoBackup = async (autoBackup: "enable" | "disable", interval: number) => {
-  try {
-    return await PyroFetch(`servers/${internalServerReference.value.serverId}/autobackup`, {
-      method: "POST",
-      body: { set: autoBackup, interval },
-    });
-  } catch (error) {
-    console.error("Error updating auto backup:", error);
-    throw error;
-  }
-};
-
-const getAutoBackup = async () => {
-  try {
-    return await PyroFetch(`servers/${internalServerReference.value.serverId}/autobackup`);
-  } catch (error) {
-    console.error("Error getting auto backup settings:", error);
-    throw error;
-  }
-};
-
-const lockBackup = async (backupId: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/backups/${backupId}/lock`, {
-      method: "POST",
-    });
-    await internalServerReference.value.refresh(["backups"]);
-  } catch (error) {
-    console.error("Error locking backup:", error);
-    throw error;
-  }
-};
-
-const unlockBackup = async (backupId: string) => {
-  try {
-    await PyroFetch(
-      `servers/${internalServerReference.value.serverId}/backups/${backupId}/unlock`,
-      {
-        method: "POST",
-      },
-    );
-    await internalServerReference.value.refresh(["backups"]);
-  } catch (error) {
-    console.error("Error unlocking backup:", error);
-    throw error;
-  }
-};
-
-const retryBackup = async (backupId: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/backups/${backupId}/retry`, {
-      method: "POST",
-    });
-  } catch (error) {
-    console.error("Error retrying backup:", error);
-    throw error;
-  }
-};
-
-// ------------------ NETWORK ------------------ //
-
-const reserveAllocation = async (name: string): Promise<Allocation> => {
-  try {
-    return await PyroFetch<Allocation>(
-      `servers/${internalServerReference.value.serverId}/allocations?name=${name}`,
-      {
-        method: "POST",
-      },
-    );
-  } catch (error) {
-    console.error("Error reserving new allocation:", error);
-    throw error;
-  }
-};
-
-const updateAllocation = async (port: number, name: string) => {
-  try {
-    await PyroFetch(
-      `servers/${internalServerReference.value.serverId}/allocations/${port}?name=${name}`,
-      {
-        method: "PUT",
-      },
-    );
-  } catch (error) {
-    console.error("Error updating allocations:", error);
-    throw error;
-  }
-};
-
-const deleteAllocation = async (port: number) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/allocations/${port}`, {
-      method: "DELETE",
-    });
-  } catch (error) {
-    console.error("Error deleting allocation:", error);
-    throw error;
-  }
-};
-
-const checkSubdomainAvailability = async (subdomain: string): Promise<{ available: boolean }> => {
-  try {
-    return (await PyroFetch(`subdomains/${subdomain}/isavailable`)) as { available: boolean };
-  } catch (error) {
-    console.error("Error checking subdomain availability:", error);
-    throw error;
-  }
-};
-
-const changeSubdomain = async (subdomain: string) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/subdomain`, {
-      method: "POST",
-      body: { subdomain },
-    });
-  } catch (error) {
-    console.error("Error changing subdomain:", error);
-    throw error;
-  }
-};
-
-// ------------------ STARTUP ------------------ //
-
-const updateStartupSettings = async (
-  invocation: string,
-  jdkVersion: "lts8" | "lts11" | "lts17" | "lts21",
-  jdkBuild: "corretto" | "temurin" | "graal",
-) => {
-  try {
-    await PyroFetch(`servers/${internalServerReference.value.serverId}/startup`, {
-      method: "POST",
-      body: {
-        invocation: invocation || null,
-        jdk_version: jdkVersion || null,
-        jdk_build: jdkBuild || null,
-      },
-    });
-  } catch (error) {
-    console.error("Error updating startup settings:", error);
-    throw error;
-  }
-};
-
-// ------------------ FS ------------------ //
-
-const retryWithAuth = async (requestFn: () => Promise<any>) => {
-  try {
-    return await requestFn();
-  } catch (error) {
-    if (error instanceof ServersError && error.statusCode === 401) {
-      await internalServerReference.value.refresh(["fs"]);
-      return await requestFn();
-    }
-
-    throw error;
-  }
-};
-
-const listDirContents = (path: string, page: number, pageSize: number) => {
-  return retryWithAuth(async () => {
-    const encodedPath = encodeURIComponent(path);
-    return await PyroFetch(`/list?path=${encodedPath}&page=${page}&page_size=${pageSize}`, {
-      override: internalServerReference.value.fs.auth,
-      retry: false,
-    });
-  });
-};
-
-const createFileOrFolder = (path: string, type: "file" | "directory") => {
-  return retryWithAuth(async () => {
-    const encodedPath = encodeURIComponent(path);
-    return await PyroFetch(`/create?path=${encodedPath}&type=${type}`, {
-      method: "POST",
-      contentType: "application/octet-stream",
-      override: internalServerReference.value.fs.auth,
-    });
-  });
-};
-
-const uploadFile = (path: string, file: File) => {
-  // eslint-disable-next-line require-await
-  return retryWithAuth(async () => {
-    const encodedPath = encodeURIComponent(path);
-    const progressSubject = new EventTarget();
-    const abortController = new AbortController();
-
-    const uploadPromise = new Promise((resolve, reject) => {
-      const xhr = new XMLHttpRequest();
-
-      xhr.upload.addEventListener("progress", (e) => {
-        if (e.lengthComputable) {
-          const progress = (e.loaded / e.total) * 100;
-          progressSubject.dispatchEvent(
-            new CustomEvent("progress", {
-              detail: {
-                loaded: e.loaded,
-                total: e.total,
-                progress,
-              },
-            }),
-          );
-        }
-      });
-
-      xhr.onload = () => {
-        if (xhr.status >= 200 && xhr.status < 300) {
-          resolve(xhr.response);
-        } else {
-          reject(new Error(`Upload failed with status ${xhr.status}`));
-        }
-      };
-
-      xhr.onerror = () => reject(new Error("Upload failed"));
-      xhr.onabort = () => reject(new Error("Upload cancelled"));
-
-      xhr.open(
-        "POST",
-        `https://${internalServerReference.value.fs.auth.url}/create?path=${encodedPath}&type=file`,
-      );
-      xhr.setRequestHeader(
-        "Authorization",
-        `Bearer ${internalServerReference.value.fs.auth.token}`,
-      );
-      xhr.setRequestHeader("Content-Type", "application/octet-stream");
-      xhr.send(file);
-
-      abortController.signal.addEventListener("abort", () => {
-        xhr.abort();
-      });
-    });
-
-    return {
-      promise: uploadPromise,
-      onProgress: (
-        callback: (progress: { loaded: number; total: number; progress: number }) => void,
-      ) => {
-        progressSubject.addEventListener("progress", ((e: CustomEvent) => {
-          callback(e.detail);
-        }) as EventListener);
-      },
-      cancel: () => {
-        abortController.abort();
-      },
-    };
-  });
-};
-
-const renameFileOrFolder = (path: string, name: string) => {
-  const pathName = path.split("/").slice(0, -1).join("/") + "/" + name;
-  return retryWithAuth(async () => {
-    await PyroFetch(`/move`, {
-      method: "POST",
-      override: internalServerReference.value.fs.auth,
-      body: {
-        source: path,
-        destination: pathName,
-      },
-    });
-    return true;
-  });
-};
-
-const updateFile = (path: string, content: string) => {
-  const octetStream = new Blob([content], { type: "application/octet-stream" });
-  return retryWithAuth(async () => {
-    return await PyroFetch(`/update?path=${path}`, {
-      method: "PUT",
-      contentType: "application/octet-stream",
-      body: octetStream,
-      override: internalServerReference.value.fs.auth,
-    });
-  });
-};
-
-const createMissingFolders = async (path: string) => {
-  if (path.startsWith("/")) {
-    path = path.substring(1);
-  }
-  const folders = path.split("/");
-  console.log(folders);
-  let currentPath = "";
-
-  for (const folder of folders) {
-    currentPath += "/" + folder;
-    try {
-      await createFileOrFolder(currentPath, "directory");
-    } catch {}
-  }
-};
-
-const moveFileOrFolder = (path: string, newPath: string) => {
-  return retryWithAuth(async () => {
-    console.log(path);
-    console.log(newPath);
-    console.log(newPath.substring(0, newPath.lastIndexOf("/")));
-    await createMissingFolders(newPath.substring(0, newPath.lastIndexOf("/")));
-
-    return await PyroFetch(`/move`, {
-      method: "POST",
-      override: internalServerReference.value.fs.auth,
-      body: {
-        source: path,
-        destination: newPath,
-      },
-    });
-  });
-};
-
-const clearQueuedOps = () => {
-  internalServerReference.value.fs.queuedOps = [];
-};
-
-const removeQueuedOp = (op: FSQueuedOp["op"], src: string) => {
-  internalServerReference.value.fs.queuedOps = internalServerReference.value.fs.queuedOps.filter(
-    (x: FSQueuedOp) => x.op !== op || x.src !== src,
-  );
-};
-
-const extractFile = (path: string, override = true, dry = false, silentQueue = false) =>
-  retryWithAuth(async () => {
-    console.log(
-      `Extracting: ${path}` + (dry ? " (dry run)" : "") + (silentQueue ? " (silent)" : ""),
-    );
-
-    const encodedPath = encodeURIComponent(path);
-
-    if (!silentQueue) {
-      internalServerReference.value.fs.queuedOps.push({
-        op: "unarchive",
-        src: path,
-      });
-
-      setTimeout(() => internalServerReference.value.fs.removeQueuedOp("unarchive", path), 4000);
-    }
-
-    return (await PyroFetch(
-      `/unarchive?src=${encodedPath}&trg=/&override=${override}&dry=${dry}`,
-      {
-        method: "POST",
-        override: internalServerReference.value.fs.auth,
-        version: 1,
-      },
-      undefined,
-      "Error extracting file",
-    ).catch((err) => {
-      removeQueuedOp("unarchive", path);
-      throw err;
-    })) as { modpack_name: string | null };
-  });
-
-const modifyOp = (id: string, action: "dismiss" | "cancel") =>
-  retryWithAuth(async () => {
-    return await PyroFetch(
-      `/ops/${action}?id=${id}`,
-      {
-        method: "POST",
-        override: internalServerReference.value.fs.auth,
-        version: 1,
-      },
-      undefined,
-      `Error ${action === "dismiss" ? "dismissing" : "cancelling"} filesystem operation`,
-    ).then(() => {
-      internalServerReference.value.fs.opsQueuedForModification =
-        internalServerReference.value.fs.opsQueuedForModification.filter((x: string) => x !== id);
-      internalServerReference.value.fs.ops = internalServerReference.value.fs.ops.filter(
-        (x: FilesystemOp) => x.id !== id,
-      );
-    });
-  });
-
-const deleteFileOrFolder = (path: string, recursive: boolean) => {
-  const encodedPath = encodeURIComponent(path);
-  return retryWithAuth(async () => {
-    return await PyroFetch(`/delete?path=${encodedPath}&recursive=${recursive}`, {
-      method: "DELETE",
-      override: internalServerReference.value.fs.auth,
-    });
-  });
-};
-
-const downloadFile = (path: string, raw?: boolean) => {
-  return retryWithAuth(async () => {
-    const encodedPath = encodeURIComponent(path);
-    const fileData = await PyroFetch(`/download?path=${encodedPath}`, {
-      override: internalServerReference.value.fs.auth,
-    });
-
-    if (fileData instanceof Blob) {
-      if (raw) {
-        return fileData;
-      } else {
-        return await fileData.text();
-      }
-    }
-  });
-};
-
-const modules: any = {
-  general: {
-    get: async (serverId: string) => {
-      try {
-        const data = await PyroFetch<General>(`servers/${serverId}`, {}, "general");
-        if (data.upstream?.project_id) {
-          const res = await $fetch(
-            `https://api.modrinth.com/v2/project/${data.upstream.project_id}`,
-          );
-          data.project = res as Project;
-        }
-
-        if (import.meta.client) {
-          data.image = (await processImage(data.project?.icon_url)) ?? undefined;
-        }
-
-        const motd = await getMotd();
-        if (motd === "A Minecraft Server") {
-          await setMotd(
-            `§b${data.project?.title || data.loader + " " + data.mc_version} §f♦ §aModrinth Servers`,
-          );
-        }
-        data.motd = motd;
-        return data;
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          status: "error",
-          server_id: serverId,
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-    updateName,
-    power: sendPowerAction,
-    reinstall: reinstallServer,
-    reinstallFromMrpack,
-    suspend: suspendServer,
-    getMotd,
-    setMotd,
-  },
-  content: {
-    get: async (serverId: string) => {
-      try {
-        const mods = await PyroFetch<Mod[]>(`servers/${serverId}/mods`, {}, "content");
-        return {
-          data: mods.sort((a, b) => (a?.name ?? "").localeCompare(b?.name ?? "")),
-        };
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          data: [],
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-    install: installContent,
-    remove: removeContent,
-    reinstall: reinstallContent,
-  },
-  backups: {
-    get: async (serverId: string) => {
-      try {
-        return {
-          data: await PyroFetch<Backup[]>(`servers/${serverId}/backups`, {}, "backups"),
-        };
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          data: [],
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-    create: createBackup,
-    rename: renameBackup,
-    delete: deleteBackup,
-    restore: restoreBackup,
-    prepare: prepareBackup,
-    updateAutoBackup,
-    getAutoBackup,
-    lock: lockBackup,
-    unlock: unlockBackup,
-    retry: retryBackup,
-  },
-  network: {
-    get: async (serverId: string) => {
-      try {
-        return {
-          allocations: await PyroFetch<Allocation[]>(
-            `servers/${serverId}/allocations`,
-            {},
-            "network",
-          ),
-        };
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          allocations: [],
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-    reserveAllocation,
-    updateAllocation,
-    deleteAllocation,
-    checkSubdomainAvailability,
-    changeSubdomain,
-  },
-  startup: {
-    get: async (serverId: string) => {
-      try {
-        return await PyroFetch<Startup>(`servers/${serverId}/startup`, {}, "startup");
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-    update: updateStartupSettings,
-  },
-  ws: {
-    get: async (serverId: string) => {
-      try {
-        return await PyroFetch<JWTAuth>(`servers/${serverId}/ws`, {}, "ws");
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-  },
-  fs: {
-    queuedOps: [],
-    opsQueuedForModification: [],
-    get: async (serverId: string) => {
-      try {
-        return { auth: await PyroFetch<JWTAuth>(`servers/${serverId}/fs`, {}, "fs") };
-      } catch (error) {
-        const fetchError =
-          error instanceof ServersError
-            ? error
-            : new ServersError("Unknown error occurred", undefined, error as Error);
-
-        return {
-          auth: undefined,
-          error: {
-            error: fetchError,
-            timestamp: Date.now(),
-          },
-        };
-      }
-    },
-    listDirContents,
-    createFileOrFolder,
-    uploadFile,
-    renameFileOrFolder,
-    updateFile,
-    moveFileOrFolder,
-    deleteFileOrFolder,
-    downloadFile,
-    extractFile,
-    removeQueuedOp,
-    clearQueuedOps,
-    modifyOp,
-  },
-};
-
-type GeneralFunctions = {
-  /**
-   * INTERNAL: Gets the general settings of a server.
-   * @param serverId - The ID of the server.
-   */
-  get: (serverId: string) => Promise<General>;
-
-  /**
-   * Updates the name of the server.
-   * @param newName - The new name for the server.
-   */
-  updateName: (newName: string) => Promise<void>;
-
-  /**
-   * Sends a power action to the server.
-
-   * @param action - The power action to send (e.g., "start", "stop", "restart").
-   */
-  power: (action: string) => Promise<void>;
-
-  /**
-   * Reinstalls the server with the specified project and version.
-   * @param loader - Whether to use a loader.
-   * @param projectId - The ID of the project.
-   * @param versionId - Optional version ID.
-   * @param loaderVersionId - Optional loader version ID.
-   * @param hardReset - Whether to perform a hard reset.
-   */
-  reinstall: (
-    serverId: string,
-    loader: boolean,
-    projectId: string,
-    versionId?: string,
-    loaderVersionId?: string,
-    hardReset?: boolean,
-  ) => Promise<void>;
-
-  /**
-   * Reinstalls the server from a mrpack.
-   * @param mrpack - The mrpack file.
-   * @param hardReset - Whether to perform a hard reset.
-   */
-  reinstallFromMrpack: (mrpack: File, hardReset?: boolean) => Promise<void>;
-
-  /**
-   * Suspends or resumes the server.
-   * @param status - True to suspend the server, false to resume.
-   */
-  suspend: (status: boolean) => Promise<void>;
-
-  /**
-   * INTERNAL: Gets the general settings of a server.
-   */
-  getMotd: () => Promise<string>;
-
-  /**
-   * INTERNAL: Updates the general settings of a server.
-   * @param motd - The new motd.
-   */
-  setMotd: (motd: string) => Promise<void>;
-
-  /**
-   * @deprecated Use fs.downloadFile instead
-   */
-  fetchConfigFile: (fileName: string) => Promise<any>;
-};
-
-type ContentFunctions = {
-  /**
-   * INTERNAL: Gets the list content of a server.
-   * @param serverId - The ID of the server.
-   * @returns
-   */
-  get: (serverId: string) => Promise<Mod[]>;
-
-  /**
-   * Installs a mod to a server.
-   * @param contentType - The type of content to install.
-   * @param projectId - The ID of the project.
-   * @param versionId - The ID of the version.
-   */
-  install: (contentType: ContentType, projectId: string, versionId: string) => Promise<void>;
-
-  /**
-   * Removes a mod from a server.
-   * @param path - The path of the mod file.
-   */
-  remove: (path: string) => Promise<void>;
-
-  /**
-   * Reinstalls a mod to a server.
-   * @param replace - The path of the mod to replace.
-   * @param projectId - The ID of the content.
-   * @param versionId - The ID of the new version.
-   */
-  reinstall: (replace: string, projectId: string, versionId: string) => Promise<void>;
-};
-
-type BackupFunctions = {
-  /**
-   * INTERNAL: Gets the backups of a server.
-   * @param serverId - The ID of the server.
-   * @returns
-   */
-  get: (serverId: string) => Promise<Backup[]>;
-
-  /**
-   * Creates a new backup for the server.
-   * @param backupName - The name of the backup.
-   * @returns The ID of the backup.
-   */
-  create: (backupName: string) => Promise<void>;
-
-  /**
-   * Renames a backup for the server.
-   * @param backupId - The ID of the backup.
-   * @param newName - The new name for the backup.
-   */
-  rename: (backupId: string, newName: string) => Promise<void>;
-
-  /**
-   * Deletes a backup for the server.
-   * @param backupId - The ID of the backup.
-   */
-  delete: (backupId: string) => Promise<void>;
-
-  /**
-   * Restores a backup for the server.
-   * @param serverId - The ID of the server.
-   * @param backupId - The ID of the backup.
-   */
-  restore: (backupId: string) => Promise<void>;
-
-  /**
-   * Downloads a backup for the server.
-   * @param backupId - The ID of the backup.
-   */
-  download: (backupId: string) => Promise<void>;
-
-  /**
-   * Prepare a backup for the server.
-   * @param backupId - The ID of the backup.
-   */
-  prepare: (backupId: string) => Promise<void>;
-
-  /**
-   * Updates the auto backup settings of the server.
-   * @param autoBackup - Whether to enable auto backup.
-   * @param interval - The interval to backup at (in Hours).
-   */
-  updateAutoBackup: (autoBackup: "enable" | "disable", interval: number) => Promise<void>;
-
-  /**
-   * Gets the auto backup settings of the server.
-   */
-  getAutoBackup: () => Promise<AutoBackupSettings>;
-
-  /**
-   * Locks a backup for the server.
-   * @param backupId - The ID of the backup.
-   */
-  lock: (backupId: string) => Promise<void>;
-
-  /**
-   * Unlocks a backup for the server.
-   * @param backupId - The ID of the backup.
-   */
-  unlock: (backupId: string) => Promise<void>;
-
-  /**
-   * Retries a failed backup for the server.
-   * @param backupId - The ID of the backup.
-   */
-  retry: (backupId: string) => Promise<void>;
-};
-
-type NetworkFunctions = {
-  /**
-   * INTERNAL: Gets the network settings of a server.
-   * @param serverId - The ID of the server.
-   * @returns
-   */
-  get: (serverId: string) => Promise<Allocation[]>;
-
-  /**
-   * Reserves a new allocation for the server.
-   * @param name - The name of the allocation.
-   * @returns The allocated network port details.
-   */
-  reserveAllocation: (name: string) => Promise<Allocation>;
-
-  /**
-   * Updates the allocation for the server.
-   * @param port - The port to update.
-   * @param name - The new name for the allocation.
-   */
-  updateAllocation: (port: number, name: string) => Promise<void>;
-
-  /**
-   * Deletes an allocation for the server.
-   * @param port - The port to delete.
-   */
-  deleteAllocation: (port: number) => Promise<void>;
-
-  /**
-   * Checks if a subdomain is available.
-   * @param subdomain - The subdomain to check.
-   * @returns True if the subdomain is available, otherwise false.
-   */
-  checkSubdomainAvailability: (subdomain: string) => Promise<boolean>;
-
-  /**
-   * Changes the subdomain of the server.
-   * @param subdomain - The new subdomain.
-   */
-  changeSubdomain: (subdomain: string) => Promise<void>;
-};
-
-type StartupFunctions = {
-  /**
-   * INTERNAL: Gets the startup settings of a server.
-   * @param serverId - The ID of the server.
-   * @returns
-   */
-  get: (serverId: string) => Promise<Startup>;
-
-  /**
-   * Updates the startup settings of a server.
-   * @param invocation - The invocation of the server.
-   * @param jdkVersion - The version of the JDK.
-   * @param jdkBuild - The build of the JDK.
-   */
-  update: (
-    invocation: string,
-    jdkVersion: "lts8" | "lts11" | "lts17" | "lts21",
-    jdkBuild: "corretto" | "temurin" | "graal",
-  ) => Promise<void>;
-};
-
-type FSFunctions = {
-  /**
-   * INTERNAL: Gets the file system settings of a server.
-   * @param serverId
-   * @returns
-   */
-  get: (serverId: string) => Promise<JWTAuth>;
-
-  /**
-   * @param path - The path to list the contents of.
-   * @param page - The page to list.
-   * @param pageSize - The page size to list.
-   * @returns
-   */
-  listDirContents: (path: string, page: number, pageSize: number) => Promise<DirectoryResponse>;
-
-  /**
-   * @param path - The path to create the file or folder at.
-   * @param type - The type of file or folder to create.
-   * @returns
-   */
-  createFileOrFolder: (path: string, type: "file" | "directory") => Promise<any>;
-
-  /**
-   * @param path - The path to upload the file to.
-   * @param file - The file to upload.
-   * @returns
-   */
-  uploadFile: (path: string, file: File) => Promise<any>;
-
-  /**
-   * @param path - The path to rename the file or folder at.
-   * @param name - The new name for the file or folder.
-   * @returns
-   */
-  renameFileOrFolder: (path: string, name: string) => Promise<any>;
-
-  /**
-   * @param path - The path to update the file at.
-   * @param content - The new content for the file.
-   * @returns
-   */
-  updateFile: (path: string, content: string) => Promise<any>;
-
-  /**
-   * @param path - The path to move the file or folder at.
-   * @param newPath - The new path for the file or folder.
-   * @returns
-   */
-  moveFileOrFolder: (path: string, newPath: string) => Promise<any>;
-
-  /**
-   * @param path - The path to delete the file or folder at.
-   * @param recursive - Whether to delete the file or folder recursively.
-   * @returns
-   */
-  deleteFileOrFolder: (path: string, recursive: boolean) => Promise<any>;
-
-  /**
-   * @param serverId - The ID of the server.
-   * @param path - The path to download the file from.
-   * @param raw - Whether to return the raw blob.
-   * @returns
-   */
-  downloadFile: (path: string, raw?: boolean) => Promise<any>;
-
-  /**
-   * @param path - The path of the file to extract
-   * @returns
-   */
-  extractFile: (
-    path: string,
-    override?: boolean,
-    dry?: boolean,
-    silentQueue?: boolean,
-  ) => Promise<{
-    modpack_name: string | null;
-    conflicting_files: string[];
-  }>;
-
-  removeQueuedOp: (op: FSQueuedOp["op"], src: string) => void;
-  clearQueuedOps: () => void;
-
-  modifyOp: (id: string, action: "dismiss" | "cancel") => Promise<any>;
-};
-
-type ModuleError = {
-  error: ServersError;
-  timestamp: number;
-};
-
-type GeneralModule = General &
-  GeneralFunctions & {
-    error?: ModuleError;
-  };
-
-type ContentModule = {
-  data: Mod[];
-  error?: ModuleError;
-} & ContentFunctions;
-
-type BackupsModule = {
-  data: Backup[];
-  error?: ModuleError;
-} & BackupFunctions;
-
-type NetworkModule = {
-  allocations: Allocation[];
-  error?: ModuleError;
-} & NetworkFunctions;
-
-type StartupModule = Startup &
-  StartupFunctions & {
-    error?: ModuleError;
-  };
-
-type WSModule = JWTAuth & {
-  error?: ModuleError;
-};
-
-export type FSModule = {
-  auth: JWTAuth;
-  ops: FilesystemOp[];
-  queuedOps: FSQueuedOp[];
-  opsQueuedForModification: string[];
-  error?: ModuleError;
-} & FSFunctions;
-
-type ModulesMap = {
-  general: GeneralModule;
-  content: ContentModule;
-  backups: BackupsModule;
-  network: NetworkModule;
-  startup: StartupModule;
-  ws: WSModule;
-  fs: FSModule;
-};
-
-type avaliableModules = ("general" | "content" | "backups" | "network" | "startup" | "ws" | "fs")[];
-
-export type Server<T extends avaliableModules> = {
-  [K in T[number]]?: ModulesMap[K];
-} & {
-  /**
-   * Refreshes the included modules of the server
-   * @param refreshModules - The modules to refresh.
-   * @param options - The options to use when refreshing the modules.
-   */
-  refresh: (
-    refreshModules?: avaliableModules,
-    options?: {
-      preserveConnection?: boolean;
-      preserveInstallState?: boolean;
-    },
-  ) => Promise<void>;
-  loadModules: (modulesToLoad: avaliableModules) => Promise<void>;
-  setError: (error: Error) => void;
-  error?: Error;
-  serverId: string;
-};
-
-export const usePyroServer = async (serverId: string, includedModules: avaliableModules) => {
-  const server: Server<typeof includedModules> = reactive({
-    refresh: async (
-      refreshModules?: avaliableModules,
-      options?: {
-        preserveConnection?: boolean;
-        preserveInstallState?: boolean;
-      },
-    ) => {
-      if (server.general?.status === "installing" && !refreshModules) {
-        return;
-      }
-
-      const modulesToRefresh = [...new Set(refreshModules || includedModules)];
-      const serverError = new PyroServerError();
-
-      const modulePromises = modulesToRefresh.map(async (module) => {
-        try {
-          const mods = modules[module];
-          if (!mods?.get) return;
-
-          const data = await mods.get(serverId);
-          if (!data) return;
-
-          if (module === "general" && options?.preserveConnection) {
-            server[module] = {
-              ...server[module],
-              ...data,
-              image: server[module]?.image || data.image,
-              motd: server[module]?.motd || data.motd,
-              status:
-                options.preserveInstallState && server[module]?.status === "installing"
-                  ? "installing"
-                  : data.status,
-            };
-          } else {
-            server[module] = { ...server[module], ...data };
-          }
-        } catch (error) {
-          console.error(`Failed to refresh module ${module}:`, error);
-          if (error instanceof Error) {
-            serverError.addError(module, error);
-          }
-        }
-      });
-
-      await Promise.allSettled(modulePromises);
-
-      if (serverError.hasErrors()) {
-        if (server.error && server.error instanceof PyroServerError) {
-          serverError.errors.forEach((error, module) => {
-            (server.error as PyroServerError).addError(module, error);
-          });
-        } else {
-          server.setError(serverError);
-        }
-      }
-    },
-    loadModules: async (modulesToLoad: avaliableModules) => {
-      const newModules = modulesToLoad.filter((module) => !server[module]);
-      if (newModules.length === 0) return;
-
-      newModules.forEach((module) => {
-        server[module] = modules[module];
-      });
-
-      await server.refresh(newModules);
-    },
-    setError: (error: Error) => {
-      if (!server.error) {
-        server.error = error;
-      } else if (error instanceof PyroServerError) {
-        if (!(server.error instanceof PyroServerError)) {
-          const newError = new PyroServerError();
-          newError.addError("previous", server.error);
-          server.error = newError;
-        }
-        error.errors.forEach((err, module) => {
-          (server.error as PyroServerError).addError(module, err);
-        });
-      }
-    },
-
-    serverId,
-  });
-
-  const initialModules = includedModules.filter((module) => ["general", "ws"].includes(module));
-  const deferredModules = includedModules.filter((module) => !["general", "ws"].includes(module));
-
-  initialModules.forEach((module) => {
-    server[module] = modules[module];
-  });
-
-  internalServerReference.value = server;
-  await server.refresh(initialModules);
-
-  if (deferredModules.length > 0) {
-    await server.loadModules(deferredModules);
-  }
-
-  return server as Server<typeof includedModules>;
-};
diff --git a/apps/frontend/src/composables/servers/modrinth-servers.ts b/apps/frontend/src/composables/servers/modrinth-servers.ts
new file mode 100644
index 000000000..e91bb8530
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modrinth-servers.ts
@@ -0,0 +1,282 @@
+import { ModrinthServerError } from "@modrinth/utils";
+import type { JWTAuth, ModuleError, ModuleName } from "@modrinth/utils";
+import { useServersFetch } from "./servers-fetch.ts";
+
+import {
+  GeneralModule,
+  ContentModule,
+  BackupsModule,
+  NetworkModule,
+  StartupModule,
+  WSModule,
+  FSModule,
+} from "./modules/index.ts";
+
+export function handleError(err: any) {
+  if (err instanceof ModrinthServerError && err.v1Error) {
+    addNotification({
+      title: err.v1Error?.context ?? `An error occurred`,
+      type: "error",
+      text: err.v1Error.description,
+      errorCode: err.v1Error.error,
+    });
+  } else {
+    addNotification({
+      title: "An error occurred",
+      type: "error",
+      text: err.message ?? (err.data ? err.data.description : err),
+    });
+  }
+}
+
+export class ModrinthServer {
+  readonly serverId: string;
+  private errors: Partial<Record<ModuleName, ModuleError>> = {};
+
+  readonly general: GeneralModule;
+  readonly content: ContentModule;
+  readonly backups: BackupsModule;
+  readonly network: NetworkModule;
+  readonly startup: StartupModule;
+  readonly ws: WSModule;
+  readonly fs: FSModule;
+
+  constructor(serverId: string) {
+    this.serverId = serverId;
+
+    this.general = new GeneralModule(this);
+    this.content = new ContentModule(this);
+    this.backups = new BackupsModule(this);
+    this.network = new NetworkModule(this);
+    this.startup = new StartupModule(this);
+    this.ws = new WSModule(this);
+    this.fs = new FSModule(this);
+  }
+
+  async createMissingFolders(path: string): Promise<void> {
+    if (path.startsWith("/")) {
+      path = path.substring(1);
+    }
+    const folders = path.split("/");
+    let currentPath = "";
+
+    for (const folder of folders) {
+      currentPath += "/" + folder;
+      try {
+        await this.fs.createFileOrFolder(currentPath, "directory");
+      } catch {
+        // Folder might already exist, ignore error
+      }
+    }
+  }
+
+  async fetchConfigFile(fileName: string): Promise<any> {
+    return await useServersFetch(`servers/${this.serverId}/config/${fileName}`);
+  }
+
+  constructServerProperties(properties: any): string {
+    let fileContent = `#Minecraft server properties\n#${new Date().toUTCString()}\n`;
+
+    for (const [key, value] of Object.entries(properties)) {
+      if (typeof value === "object") {
+        fileContent += `${key}=${JSON.stringify(value)}\n`;
+      } else if (typeof value === "boolean") {
+        fileContent += `${key}=${value ? "true" : "false"}\n`;
+      } else {
+        fileContent += `${key}=${value}\n`;
+      }
+    }
+
+    return fileContent;
+  }
+
+  async processImage(iconUrl: string | undefined): Promise<string | undefined> {
+    const sharedImage = useState<string | undefined>(`server-icon-${this.serverId}`);
+
+    if (sharedImage.value) {
+      return sharedImage.value;
+    }
+
+    try {
+      const auth = await useServersFetch<JWTAuth>(`servers/${this.serverId}/fs`);
+      try {
+        const fileData = await useServersFetch(`/download?path=/server-icon-original.png`, {
+          override: auth,
+          retry: false,
+        });
+
+        if (fileData instanceof Blob && import.meta.client) {
+          const dataURL = await new Promise<string>((resolve) => {
+            const canvas = document.createElement("canvas");
+            const ctx = canvas.getContext("2d");
+            const img = new Image();
+            img.onload = () => {
+              canvas.width = 512;
+              canvas.height = 512;
+              ctx?.drawImage(img, 0, 0, 512, 512);
+              const dataURL = canvas.toDataURL("image/png");
+              sharedImage.value = dataURL;
+              resolve(dataURL);
+              URL.revokeObjectURL(img.src);
+            };
+            img.src = URL.createObjectURL(fileData);
+          });
+          return dataURL;
+        }
+      } catch (error) {
+        if (error instanceof ModrinthServerError && error.statusCode === 404) {
+          if (iconUrl) {
+            try {
+              const response = await fetch(iconUrl);
+              if (!response.ok) throw new Error("Failed to fetch icon");
+              const file = await response.blob();
+              const originalFile = new File([file], "server-icon-original.png", {
+                type: "image/png",
+              });
+
+              if (import.meta.client) {
+                const dataURL = await new Promise<string>((resolve) => {
+                  const canvas = document.createElement("canvas");
+                  const ctx = canvas.getContext("2d");
+                  const img = new Image();
+                  img.onload = () => {
+                    canvas.width = 64;
+                    canvas.height = 64;
+                    ctx?.drawImage(img, 0, 0, 64, 64);
+                    canvas.toBlob(async (blob) => {
+                      if (blob) {
+                        const scaledFile = new File([blob], "server-icon.png", {
+                          type: "image/png",
+                        });
+                        await useServersFetch(`/create?path=/server-icon.png&type=file`, {
+                          method: "POST",
+                          contentType: "application/octet-stream",
+                          body: scaledFile,
+                          override: auth,
+                        });
+                        await useServersFetch(`/create?path=/server-icon-original.png&type=file`, {
+                          method: "POST",
+                          contentType: "application/octet-stream",
+                          body: originalFile,
+                          override: auth,
+                        });
+                      }
+                    }, "image/png");
+                    const dataURL = canvas.toDataURL("image/png");
+                    sharedImage.value = dataURL;
+                    resolve(dataURL);
+                    URL.revokeObjectURL(img.src);
+                  };
+                  img.src = URL.createObjectURL(file);
+                });
+                return dataURL;
+              }
+            } catch (externalError: any) {
+              console.debug("Could not process external icon:", externalError.message);
+            }
+          }
+        } else {
+          throw error;
+        }
+      }
+    } catch (error: any) {
+      console.debug("Icon processing failed:", error.message);
+    }
+
+    sharedImage.value = undefined;
+    return undefined;
+  }
+
+  async refresh(
+    modules: ModuleName[] = [],
+    options?: {
+      preserveConnection?: boolean;
+      preserveInstallState?: boolean;
+    },
+  ): Promise<void> {
+    const modulesToRefresh =
+      modules.length > 0
+        ? modules
+        : (["general", "content", "backups", "network", "startup", "ws", "fs"] as ModuleName[]);
+
+    for (const module of modulesToRefresh) {
+      try {
+        switch (module) {
+          case "general": {
+            if (options?.preserveConnection) {
+              const currentImage = this.general.image;
+              const currentMotd = this.general.motd;
+              const currentStatus = this.general.status;
+
+              await this.general.fetch();
+
+              if (currentImage) {
+                this.general.image = currentImage;
+              }
+              if (currentMotd) {
+                this.general.motd = currentMotd;
+              }
+              if (options.preserveInstallState && currentStatus === "installing") {
+                this.general.status = "installing";
+              }
+            } else {
+              await this.general.fetch();
+            }
+            break;
+          }
+          case "content":
+            await this.content.fetch();
+            break;
+          case "backups":
+            await this.backups.fetch();
+            break;
+          case "network":
+            await this.network.fetch();
+            break;
+          case "startup":
+            await this.startup.fetch();
+            break;
+          case "ws":
+            await this.ws.fetch();
+            break;
+          case "fs":
+            await this.fs.fetch();
+            break;
+        }
+      } catch (error) {
+        if (error instanceof ModrinthServerError) {
+          if (error.statusCode === 404 && ["fs", "content"].includes(module)) {
+            console.debug(`Optional ${module} resource not found:`, error.message);
+            continue;
+          }
+
+          if (error.statusCode === 503) {
+            console.debug(`Temporary ${module} unavailable:`, error.message);
+            continue;
+          }
+        }
+
+        this.errors[module] = {
+          error:
+            error instanceof ModrinthServerError
+              ? error
+              : new ModrinthServerError("Unknown error", undefined, error as Error),
+          timestamp: Date.now(),
+        };
+      }
+    }
+  }
+
+  get moduleErrors() {
+    return this.errors;
+  }
+}
+
+export const useModrinthServers = async (
+  serverId: string,
+  includedModules: ModuleName[] = ["general"],
+) => {
+  const server = new ModrinthServer(serverId);
+  await server.refresh(includedModules);
+  return reactive(server);
+};
diff --git a/apps/frontend/src/composables/servers/modules/backups.ts b/apps/frontend/src/composables/servers/modules/backups.ts
new file mode 100644
index 000000000..2dbaac1ab
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/backups.ts
@@ -0,0 +1,79 @@
+import type { Backup, AutoBackupSettings } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class BackupsModule extends ServerModule {
+  data: Backup[] = [];
+
+  async fetch(): Promise<void> {
+    this.data = await useServersFetch<Backup[]>(`servers/${this.serverId}/backups`, {}, "backups");
+  }
+
+  async create(backupName: string): Promise<string> {
+    const response = await useServersFetch<{ id: string }>(`servers/${this.serverId}/backups`, {
+      method: "POST",
+      body: { name: backupName },
+    });
+    await this.fetch(); // Refresh this module
+    return response.id;
+  }
+
+  async rename(backupId: string, newName: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}/rename`, {
+      method: "POST",
+      body: { name: newName },
+    });
+    await this.fetch(); // Refresh this module
+  }
+
+  async delete(backupId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}`, {
+      method: "DELETE",
+    });
+    await this.fetch(); // Refresh this module
+  }
+
+  async restore(backupId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}/restore`, {
+      method: "POST",
+    });
+    await this.fetch(); // Refresh this module
+  }
+
+  async prepare(backupId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}/prepare-download`, {
+      method: "POST",
+    });
+  }
+
+  async lock(backupId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}/lock`, {
+      method: "POST",
+    });
+    await this.fetch(); // Refresh this module
+  }
+
+  async unlock(backupId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}/unlock`, {
+      method: "POST",
+    });
+    await this.fetch(); // Refresh this module
+  }
+
+  async retry(backupId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/backups/${backupId}/retry`, {
+      method: "POST",
+    });
+  }
+
+  async updateAutoBackup(autoBackup: "enable" | "disable", interval: number): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/autobackup`, {
+      method: "POST",
+      body: { set: autoBackup, interval },
+    });
+  }
+
+  async getAutoBackup(): Promise<AutoBackupSettings> {
+    return await useServersFetch(`servers/${this.serverId}/autobackup`);
+  }
+}
diff --git a/apps/frontend/src/composables/servers/modules/base.ts b/apps/frontend/src/composables/servers/modules/base.ts
new file mode 100644
index 000000000..84495d749
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/base.ts
@@ -0,0 +1,15 @@
+import type { ModrinthServer } from "../modrinth-servers.ts";
+
+export abstract class ServerModule {
+  protected server: ModrinthServer;
+
+  constructor(server: ModrinthServer) {
+    this.server = server;
+  }
+
+  protected get serverId(): string {
+    return this.server.serverId;
+  }
+
+  abstract fetch(): Promise<void>;
+}
diff --git a/apps/frontend/src/composables/servers/modules/content.ts b/apps/frontend/src/composables/servers/modules/content.ts
new file mode 100644
index 000000000..e05c67233
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/content.ts
@@ -0,0 +1,36 @@
+import type { Mod, ContentType } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class ContentModule extends ServerModule {
+  data: Mod[] = [];
+
+  async fetch(): Promise<void> {
+    const mods = await useServersFetch<Mod[]>(`servers/${this.serverId}/mods`, {}, "content");
+    this.data = mods.sort((a, b) => (a?.name ?? "").localeCompare(b?.name ?? ""));
+  }
+
+  async install(contentType: ContentType, projectId: string, versionId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/mods`, {
+      method: "POST",
+      body: {
+        rinth_ids: { project_id: projectId, version_id: versionId },
+        install_as: contentType,
+      },
+    });
+  }
+
+  async remove(path: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/deleteMod`, {
+      method: "POST",
+      body: { path },
+    });
+  }
+
+  async reinstall(replace: string, projectId: string, versionId: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/mods/update`, {
+      method: "POST",
+      body: { replace, project_id: projectId, version_id: versionId },
+    });
+  }
+}
diff --git a/apps/frontend/src/composables/servers/modules/fs.ts b/apps/frontend/src/composables/servers/modules/fs.ts
new file mode 100644
index 000000000..1072789e0
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/fs.ts
@@ -0,0 +1,224 @@
+import type {
+  FileUploadQuery,
+  JWTAuth,
+  DirectoryResponse,
+  FilesystemOp,
+  FSQueuedOp,
+} from "@modrinth/utils";
+import { ModrinthServerError } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class FSModule extends ServerModule {
+  auth!: JWTAuth;
+  ops: FilesystemOp[] = [];
+  queuedOps: FSQueuedOp[] = [];
+  opsQueuedForModification: string[] = [];
+
+  async fetch(): Promise<void> {
+    this.auth = await useServersFetch<JWTAuth>(`servers/${this.serverId}/fs`, {}, "fs");
+    this.ops = [];
+    this.queuedOps = [];
+    this.opsQueuedForModification = [];
+  }
+
+  private async retryWithAuth<T>(requestFn: () => Promise<T>): Promise<T> {
+    try {
+      return await requestFn();
+    } catch (error) {
+      if (error instanceof ModrinthServerError && error.statusCode === 401) {
+        await this.fetch(); // Refresh auth
+        return await requestFn();
+      }
+      throw error;
+    }
+  }
+
+  listDirContents(path: string, page: number, pageSize: number): Promise<DirectoryResponse> {
+    return this.retryWithAuth(async () => {
+      const encodedPath = encodeURIComponent(path);
+      return await useServersFetch(`/list?path=${encodedPath}&page=${page}&page_size=${pageSize}`, {
+        override: this.auth,
+        retry: false,
+      });
+    });
+  }
+
+  createFileOrFolder(path: string, type: "file" | "directory"): Promise<void> {
+    return this.retryWithAuth(async () => {
+      const encodedPath = encodeURIComponent(path);
+      await useServersFetch(`/create?path=${encodedPath}&type=${type}`, {
+        method: "POST",
+        contentType: "application/octet-stream",
+        override: this.auth,
+      });
+    });
+  }
+
+  uploadFile(path: string, file: File): FileUploadQuery {
+    const encodedPath = encodeURIComponent(path);
+    const progressSubject = new EventTarget();
+    const abortController = new AbortController();
+
+    const uploadPromise = new Promise((resolve, reject) => {
+      const xhr = new XMLHttpRequest();
+
+      xhr.upload.addEventListener("progress", (e) => {
+        if (e.lengthComputable) {
+          const progress = (e.loaded / e.total) * 100;
+          progressSubject.dispatchEvent(
+            new CustomEvent("progress", {
+              detail: { loaded: e.loaded, total: e.total, progress },
+            }),
+          );
+        }
+      });
+
+      xhr.onload = () => {
+        if (xhr.status >= 200 && xhr.status < 300) {
+          resolve(xhr.response);
+        } else {
+          reject(new Error(`Upload failed with status ${xhr.status}`));
+        }
+      };
+
+      xhr.onerror = () => reject(new Error("Upload failed"));
+      xhr.onabort = () => reject(new Error("Upload cancelled"));
+
+      xhr.open("POST", `https://${this.auth.url}/create?path=${encodedPath}&type=file`);
+      xhr.setRequestHeader("Authorization", `Bearer ${this.auth.token}`);
+      xhr.setRequestHeader("Content-Type", "application/octet-stream");
+      xhr.send(file);
+
+      abortController.signal.addEventListener("abort", () => xhr.abort());
+    });
+
+    return {
+      promise: uploadPromise,
+      onProgress: (
+        callback: (progress: { loaded: number; total: number; progress: number }) => void,
+      ) => {
+        progressSubject.addEventListener("progress", ((e: CustomEvent) => {
+          callback(e.detail);
+        }) as EventListener);
+      },
+      cancel: () => abortController.abort(),
+    } as FileUploadQuery;
+  }
+
+  renameFileOrFolder(path: string, name: string): Promise<void> {
+    const pathName = path.split("/").slice(0, -1).join("/") + "/" + name;
+    return this.retryWithAuth(async () => {
+      await useServersFetch(`/move`, {
+        method: "POST",
+        override: this.auth,
+        body: { source: path, destination: pathName },
+      });
+    });
+  }
+
+  updateFile(path: string, content: string): Promise<void> {
+    const octetStream = new Blob([content], { type: "application/octet-stream" });
+    return this.retryWithAuth(async () => {
+      await useServersFetch(`/update?path=${path}`, {
+        method: "PUT",
+        contentType: "application/octet-stream",
+        body: octetStream,
+        override: this.auth,
+      });
+    });
+  }
+
+  moveFileOrFolder(path: string, newPath: string): Promise<void> {
+    return this.retryWithAuth(async () => {
+      await this.server.createMissingFolders(newPath.substring(0, newPath.lastIndexOf("/")));
+      await useServersFetch(`/move`, {
+        method: "POST",
+        override: this.auth,
+        body: { source: path, destination: newPath },
+      });
+    });
+  }
+
+  deleteFileOrFolder(path: string, recursive: boolean): Promise<void> {
+    const encodedPath = encodeURIComponent(path);
+    return this.retryWithAuth(async () => {
+      await useServersFetch(`/delete?path=${encodedPath}&recursive=${recursive}`, {
+        method: "DELETE",
+        override: this.auth,
+      });
+    });
+  }
+
+  downloadFile(path: string, raw?: boolean): Promise<any> {
+    return this.retryWithAuth(async () => {
+      const encodedPath = encodeURIComponent(path);
+      const fileData = await useServersFetch(`/download?path=${encodedPath}`, {
+        override: this.auth,
+      });
+
+      if (fileData instanceof Blob) {
+        return raw ? fileData : await fileData.text();
+      }
+      return fileData;
+    });
+  }
+
+  extractFile(
+    path: string,
+    override = true,
+    dry = false,
+    silentQueue = false,
+  ): Promise<{ modpack_name: string | null; conflicting_files: string[] }> {
+    return this.retryWithAuth(async () => {
+      const encodedPath = encodeURIComponent(path);
+
+      if (!silentQueue) {
+        this.queuedOps.push({ op: "unarchive", src: path });
+        setTimeout(() => this.removeQueuedOp("unarchive", path), 4000);
+      }
+
+      try {
+        return await useServersFetch(
+          `/unarchive?src=${encodedPath}&trg=/&override=${override}&dry=${dry}`,
+          {
+            method: "POST",
+            override: this.auth,
+            version: 1,
+          },
+          undefined,
+          "Error extracting file",
+        );
+      } catch (err) {
+        this.removeQueuedOp("unarchive", path);
+        throw err;
+      }
+    });
+  }
+
+  modifyOp(id: string, action: "dismiss" | "cancel"): Promise<void> {
+    return this.retryWithAuth(async () => {
+      await useServersFetch(
+        `/ops/${action}?id=${id}`,
+        {
+          method: "POST",
+          override: this.auth,
+          version: 1,
+        },
+        undefined,
+        `Error ${action === "dismiss" ? "dismissing" : "cancelling"} filesystem operation`,
+      );
+
+      this.opsQueuedForModification = this.opsQueuedForModification.filter((x: string) => x !== id);
+      this.ops = this.ops.filter((x: FilesystemOp) => x.id !== id);
+    });
+  }
+
+  removeQueuedOp(op: FSQueuedOp["op"], src: string): void {
+    this.queuedOps = this.queuedOps.filter((x: FSQueuedOp) => x.op !== op || x.src !== src);
+  }
+
+  clearQueuedOps(): void {
+    this.queuedOps = [];
+  }
+}
diff --git a/apps/frontend/src/composables/servers/modules/general.ts b/apps/frontend/src/composables/servers/modules/general.ts
new file mode 100644
index 000000000..21546cb77
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/general.ts
@@ -0,0 +1,179 @@
+import { $fetch } from "ofetch";
+import type { ServerGeneral, Project, PowerAction, JWTAuth } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class GeneralModule extends ServerModule implements ServerGeneral {
+  server_id!: string;
+  name!: string;
+  net!: { ip: string; port: number; domain: string };
+  game!: string;
+  backup_quota!: number;
+  used_backup_quota!: number;
+  status!: string;
+  suspension_reason!: string;
+  loader!: string;
+  loader_version!: string;
+  mc_version!: string;
+  upstream!: {
+    kind: "modpack" | "mod" | "resourcepack";
+    version_id: string;
+    project_id: string;
+  } | null;
+
+  motd?: string;
+  image?: string;
+  project?: Project;
+  sftp_username!: string;
+  sftp_password!: string;
+  sftp_host!: string;
+  datacenter?: string;
+  notices?: any[];
+  node!: { token: string; instance: string };
+  flows?: { intro?: boolean };
+
+  async fetch(): Promise<void> {
+    const data = await useServersFetch<ServerGeneral>(`servers/${this.serverId}`, {}, "general");
+
+    if (data.upstream?.project_id) {
+      const project = await $fetch(
+        `https://api.modrinth.com/v2/project/${data.upstream.project_id}`,
+      );
+      data.project = project as Project;
+    }
+
+    if (import.meta.client) {
+      data.image = (await this.server.processImage(data.project?.icon_url)) ?? undefined;
+    }
+
+    const motd = await this.getMotd();
+    if (motd === "A Minecraft Server") {
+      await this.setMotd(
+        `§b${data.project?.title || data.loader + " " + data.mc_version} §f♦ §aModrinth Servers`,
+      );
+    }
+    data.motd = motd;
+
+    // Copy data to this module
+    Object.assign(this, data);
+  }
+
+  async updateName(newName: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/name`, {
+      method: "POST",
+      body: { name: newName },
+    });
+  }
+
+  async power(action: PowerAction): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/power`, {
+      method: "POST",
+      body: { action },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    await this.fetch(); // Refresh this module
+  }
+
+  async reinstall(
+    loader: boolean,
+    projectId: string,
+    versionId?: string,
+    loaderVersionId?: string,
+    hardReset: boolean = false,
+  ): Promise<void> {
+    const hardResetParam = hardReset ? "true" : "false";
+    if (loader) {
+      if (projectId.toLowerCase() === "neoforge") {
+        projectId = "NeoForge";
+      }
+      await useServersFetch(`servers/${this.serverId}/reinstall?hard=${hardResetParam}`, {
+        method: "POST",
+        body: { loader: projectId, loader_version: loaderVersionId, game_version: versionId },
+      });
+    } else {
+      await useServersFetch(`servers/${this.serverId}/reinstall?hard=${hardResetParam}`, {
+        method: "POST",
+        body: { project_id: projectId, version_id: versionId },
+      });
+    }
+  }
+
+  async reinstallFromMrpack(mrpack: File, hardReset: boolean = false): Promise<void> {
+    const hardResetParam = hardReset ? "true" : "false";
+    const auth = await useServersFetch<JWTAuth>(`servers/${this.serverId}/reinstallFromMrpack`);
+
+    const formData = new FormData();
+    formData.append("file", mrpack);
+
+    const response = await fetch(
+      `https://${auth.url}/reinstallMrpackMultiparted?hard=${hardResetParam}`,
+      {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${auth.token}`,
+        },
+        body: formData,
+        signal: AbortSignal.timeout(30 * 60 * 1000),
+      },
+    );
+
+    if (!response.ok) {
+      throw new Error(`[pyroservers] native fetch err status: ${response.status}`);
+    }
+  }
+
+  async suspend(status: boolean): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/suspend`, {
+      method: "POST",
+      body: { suspended: status },
+    });
+  }
+
+  async endIntro(): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/flows/intro`, {
+      method: "DELETE",
+      version: 1,
+    });
+    await this.fetch(); // Refresh this module
+  }
+
+  async getMotd(): Promise<string | undefined> {
+    try {
+      const props = await this.server.fs.downloadFile("/server.properties");
+      if (props) {
+        const lines = props.split("\n");
+        for (const line of lines) {
+          if (line.startsWith("motd=")) {
+            return line.slice(5);
+          }
+        }
+      }
+    } catch {
+      return undefined;
+    }
+    return undefined;
+  }
+
+  async setMotd(motd: string): Promise<void> {
+    try {
+      const props = (await this.server.fetchConfigFile("ServerProperties")) as any;
+      if (props) {
+        props.motd = motd;
+        const newProps = this.server.constructServerProperties(props);
+        const octetStream = new Blob([newProps], { type: "application/octet-stream" });
+        const auth = await useServersFetch<JWTAuth>(`servers/${this.serverId}/fs`);
+
+        await useServersFetch(`/update?path=/server.properties`, {
+          method: "PUT",
+          contentType: "application/octet-stream",
+          body: octetStream,
+          override: auth,
+        });
+      }
+    } catch {
+      console.error(
+        "[Modrinth Servers] [General] Failed to set MOTD due to lack of server properties file.",
+      );
+    }
+  }
+}
diff --git a/apps/frontend/src/composables/servers/modules/index.ts b/apps/frontend/src/composables/servers/modules/index.ts
new file mode 100644
index 000000000..6046d91e8
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/index.ts
@@ -0,0 +1,8 @@
+export * from "./base.ts";
+export * from "./backups.ts";
+export * from "./content.ts";
+export * from "./fs.ts";
+export * from "./general.ts";
+export * from "./network.ts";
+export * from "./startup.ts";
+export * from "./ws.ts";
diff --git a/apps/frontend/src/composables/servers/modules/network.ts b/apps/frontend/src/composables/servers/modules/network.ts
new file mode 100644
index 000000000..54094f57c
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/network.ts
@@ -0,0 +1,47 @@
+import type { Allocation } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class NetworkModule extends ServerModule {
+  allocations: Allocation[] = [];
+
+  async fetch(): Promise<void> {
+    this.allocations = await useServersFetch<Allocation[]>(
+      `servers/${this.serverId}/allocations`,
+      {},
+      "network",
+    );
+  }
+
+  async reserveAllocation(name: string): Promise<Allocation> {
+    return await useServersFetch<Allocation>(`servers/${this.serverId}/allocations?name=${name}`, {
+      method: "POST",
+    });
+  }
+
+  async updateAllocation(port: number, name: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/allocations/${port}?name=${name}`, {
+      method: "PUT",
+    });
+  }
+
+  async deleteAllocation(port: number): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/allocations/${port}`, {
+      method: "DELETE",
+    });
+  }
+
+  async checkSubdomainAvailability(subdomain: string): Promise<boolean> {
+    const result = (await useServersFetch(`subdomains/${subdomain}/isavailable`)) as {
+      available: boolean;
+    };
+    return result.available;
+  }
+
+  async changeSubdomain(subdomain: string): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/subdomain`, {
+      method: "POST",
+      body: { subdomain },
+    });
+  }
+}
diff --git a/apps/frontend/src/composables/servers/modules/startup.ts b/apps/frontend/src/composables/servers/modules/startup.ts
new file mode 100644
index 000000000..2d6a70180
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/startup.ts
@@ -0,0 +1,26 @@
+import type { Startup, JDKVersion, JDKBuild } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class StartupModule extends ServerModule implements Startup {
+  invocation!: string;
+  original_invocation!: string;
+  jdk_version!: JDKVersion;
+  jdk_build!: JDKBuild;
+
+  async fetch(): Promise<void> {
+    const data = await useServersFetch<Startup>(`servers/${this.serverId}/startup`, {}, "startup");
+    Object.assign(this, data);
+  }
+
+  async update(invocation: string, jdkVersion: JDKVersion, jdkBuild: JDKBuild): Promise<void> {
+    await useServersFetch(`servers/${this.serverId}/startup`, {
+      method: "POST",
+      body: {
+        invocation: invocation || null,
+        jdk_version: jdkVersion || null,
+        jdk_build: jdkBuild || null,
+      },
+    });
+  }
+}
diff --git a/apps/frontend/src/composables/servers/modules/ws.ts b/apps/frontend/src/composables/servers/modules/ws.ts
new file mode 100644
index 000000000..31dfee9e5
--- /dev/null
+++ b/apps/frontend/src/composables/servers/modules/ws.ts
@@ -0,0 +1,13 @@
+import type { JWTAuth } from "@modrinth/utils";
+import { useServersFetch } from "../servers-fetch.ts";
+import { ServerModule } from "./base.ts";
+
+export class WSModule extends ServerModule implements JWTAuth {
+  url!: string;
+  token!: string;
+
+  async fetch(): Promise<void> {
+    const data = await useServersFetch<JWTAuth>(`servers/${this.serverId}/ws`, {}, "ws");
+    Object.assign(this, data);
+  }
+}
diff --git a/apps/frontend/src/composables/servers/servers-fetch.ts b/apps/frontend/src/composables/servers/servers-fetch.ts
new file mode 100644
index 000000000..137baea5a
--- /dev/null
+++ b/apps/frontend/src/composables/servers/servers-fetch.ts
@@ -0,0 +1,188 @@
+import { $fetch, FetchError } from "ofetch";
+import { ModrinthServerError, ModrinthServersFetchError } from "@modrinth/utils";
+import type { V1ErrorInfo } from "@modrinth/utils";
+
+export interface ServersFetchOptions {
+  method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+  contentType?: string;
+  body?: Record<string, any>;
+  version?: number;
+  override?: {
+    url?: string;
+    token?: string;
+  };
+  retry?: number | boolean;
+  bypassAuth?: boolean;
+}
+
+export async function useServersFetch<T>(
+  path: string,
+  options: ServersFetchOptions = {},
+  module?: string,
+  errorContext?: string,
+): Promise<T> {
+  const config = useRuntimeConfig();
+  const auth = await useAuth();
+  const authToken = auth.value?.token;
+
+  if (!authToken && !options.bypassAuth) {
+    const error = new ModrinthServersFetchError(
+      "[Modrinth Servers] Cannot fetch without auth",
+      10000,
+    );
+    throw new ModrinthServerError("Missing auth token", 401, error, module);
+  }
+
+  const {
+    method = "GET",
+    contentType = "application/json",
+    body,
+    version = 0,
+    override,
+    retry = method === "GET" ? 3 : 0,
+  } = options;
+
+  const base = (import.meta.server ? config.pyroBaseUrl : config.public.pyroBaseUrl)?.replace(
+    /\/$/,
+    "",
+  );
+
+  if (!base) {
+    const error = new ModrinthServersFetchError(
+      "[Modrinth Servers] Cannot fetch without base url. Make sure to set a PYRO_BASE_URL in environment variables",
+      10001,
+    );
+    throw new ModrinthServerError("Configuration error: Missing PYRO_BASE_URL", 500, error, module);
+  }
+
+  const versionString = `v${version}`;
+  let newOverrideUrl = override?.url;
+  if (newOverrideUrl && newOverrideUrl.includes("v0") && version !== 0) {
+    newOverrideUrl = newOverrideUrl.replace("v0", versionString);
+  }
+
+  const fullUrl = newOverrideUrl
+    ? `https://${newOverrideUrl}/${path.replace(/^\//, "")}`
+    : version === 0
+      ? `${base}/modrinth/v${version}/${path.replace(/^\//, "")}`
+      : `${base}/v${version}/${path.replace(/^\//, "")}`;
+
+  const headers: Record<string, string> = {
+    "User-Agent": "Modrinth/1.0 (https://modrinth.com)",
+    Vary: "Accept, Origin",
+  };
+
+  if (!options.bypassAuth) {
+    headers.Authorization = `Bearer ${override?.token ?? authToken}`;
+    headers["Access-Control-Allow-Headers"] = "Authorization";
+  }
+
+  if (contentType !== "none") {
+    headers["Content-Type"] = contentType;
+  }
+
+  if (import.meta.client && typeof window !== "undefined") {
+    headers.Origin = window.location.origin;
+  }
+
+  let attempts = 0;
+  const maxAttempts = (typeof retry === "boolean" ? (retry ? 3 : 1) : retry) + 1;
+  let lastError: Error | null = null;
+
+  while (attempts < maxAttempts) {
+    try {
+      const response = await $fetch<T>(fullUrl, {
+        method,
+        headers,
+        body: body && contentType === "application/json" ? JSON.stringify(body) : body ?? undefined,
+        timeout: 10000,
+      });
+
+      return response;
+    } catch (error) {
+      lastError = error as Error;
+      attempts++;
+
+      if (error instanceof FetchError) {
+        const statusCode = error.response?.status;
+        const statusText = error.response?.statusText || "Unknown error";
+
+        let v1Error: V1ErrorInfo | undefined;
+        if (error.data?.error && error.data?.description) {
+          v1Error = {
+            context: errorContext,
+            ...error.data,
+          };
+        }
+
+        const errorMessages: { [key: number]: string } = {
+          400: "Bad Request",
+          401: "Unauthorized",
+          403: "Forbidden",
+          404: "Not Found",
+          405: "Method Not Allowed",
+          408: "Request Timeout",
+          429: "Too Many Requests",
+          500: "Internal Server Error",
+          502: "Bad Gateway",
+          503: "Service Unavailable",
+          504: "Gateway Timeout",
+        };
+
+        const message =
+          statusCode && statusCode in errorMessages
+            ? errorMessages[statusCode]
+            : `HTTP Error: ${statusCode || "unknown"} ${statusText}`;
+
+        const isRetryable = statusCode ? [408, 429, 500, 502, 504].includes(statusCode) : true;
+
+        if (!isRetryable || attempts >= maxAttempts) {
+          console.error("Fetch error:", error);
+
+          const fetchError = new ModrinthServersFetchError(
+            `[Modrinth Servers] ${message}`,
+            statusCode,
+            error,
+          );
+          throw new ModrinthServerError(error.message, statusCode, fetchError, module, v1Error);
+        }
+
+        const delay = Math.min(1000 * Math.pow(2, attempts - 1) + Math.random() * 1000, 10000);
+        console.warn(`Retrying request in ${delay}ms (attempt ${attempts}/${maxAttempts - 1})`);
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        continue;
+      }
+
+      console.error("Unexpected fetch error:", error);
+      const fetchError = new ModrinthServersFetchError(
+        "[Modrinth Servers] An unexpected error occurred during the fetch operation.",
+        undefined,
+        error as Error,
+      );
+      throw new ModrinthServerError(
+        "Unexpected error during fetch operation",
+        undefined,
+        fetchError,
+        module,
+      );
+    }
+  }
+
+  console.error("All retry attempts failed:", lastError);
+  if (lastError instanceof FetchError) {
+    const statusCode = lastError.response?.status;
+    const pyroError = new ModrinthServersFetchError(
+      "Maximum retry attempts reached",
+      statusCode,
+      lastError,
+    );
+    throw new ModrinthServerError("Maximum retry attempts reached", statusCode, pyroError, module);
+  }
+
+  const fetchError = new ModrinthServersFetchError(
+    "Maximum retry attempts reached",
+    undefined,
+    lastError || undefined,
+  );
+  throw new ModrinthServerError("Maximum retry attempts reached", undefined, fetchError, module);
+}
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 5e1ecbe68..d36b6b4c3 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -159,7 +159,7 @@
     "message": "Subscribe to updates about Modrinth"
   },
   "auth.welcome.description": {
-    "message": "You’re now part of the awesome community of creators & explorers already building, downloading, and staying up-to-date with amazing mods."
+    "message": "You’re now part of the awesome community of creators & explorers already building, downloading, and staying up-to-date with awazing mods."
   },
   "auth.welcome.label.tos": {
     "message": "By creating an account, you have agreed to Modrinth's <terms-link>Terms</terms-link> and <privacy-policy-link>Privacy Policy</privacy-policy-link>."
@@ -350,11 +350,14 @@
   "layout.banner.add-email.button": {
     "message": "Visit account settings"
   },
+  "layout.banner.add-email.description": {
+    "message": "For security reasons, Modrinth needs you to register an email address to your account."
+  },
   "layout.banner.build-fail.description": {
     "message": "This deploy of Modrinth's frontend failed to generate state from the API. This may be due to an outage or an error in configuration. Rebuild when the API is available. Error codes: {errors}; Current API URL is: {url}"
   },
   "layout.banner.build-fail.title": {
-    "message": "Error generating state from API when building"
+    "message": "Error generating state from API when building."
   },
   "layout.banner.staging.description": {
     "message": "The staging environment is completely separate from the production Modrinth database. This is used for testing and debugging purposes, and may be running in-development versions of the Modrinth backend or frontend newer than the production instance."
@@ -365,12 +368,12 @@
   "layout.banner.subscription-payment-failed.button": {
     "message": "Update billing info"
   },
-  "layout.banner.subscription-payment-failed.title": {
-    "message": "Billing action required"
-  },
   "layout.banner.subscription-payment-failed.description": {
     "message": "One or more subscriptions failed to renew. Please update your payment method to prevent losing access!"
   },
+  "layout.banner.subscription-payment-failed.title": {
+    "message": "Billing action required."
+  },
   "layout.banner.verify-email.action": {
     "message": "Re-send verification email"
   },
@@ -1047,32 +1050,23 @@
     "message": "No notices"
   },
   "servers.plan.large.description": {
-    "message": "Ideal for larger communities, modpacks, and heavy modding."
+    "message": "Ideal for 15–25 players, modpacks, or heavy modding."
   },
   "servers.plan.large.name": {
     "message": "Large"
   },
-  "servers.plan.large.symbol": {
-    "message": "L"
-  },
   "servers.plan.medium.description": {
-    "message": "Great for modded multiplayer and small communities."
+    "message": "Great for 6–15 players and multiple mods."
   },
   "servers.plan.medium.name": {
     "message": "Medium"
   },
-  "servers.plan.medium.symbol": {
-    "message": "M"
-  },
   "servers.plan.small.description": {
-    "message": "Perfect for vanilla multiplayer, small friend groups, SMPs, and light modding."
+    "message": "Perfect for 1–5 friends with a few light mods."
   },
   "servers.plan.small.name": {
     "message": "Small"
   },
-  "servers.plan.small.symbol": {
-    "message": "S"
-  },
   "settings.billing.modal.cancel.action": {
     "message": "Cancel subscription"
   },
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index edf2660d9..c6d9451d7 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -32,7 +32,7 @@
             <h1 class="wrap-as-needed">
               {{ project.title }}
             </h1>
-            <Badge :type="project.status" />
+            <ProjectStatusBadge :status="project.status" />
           </div>
         </div>
         <h2>Project settings</h2>
@@ -870,6 +870,7 @@ import {
   ProjectSidebarCreators,
   ProjectSidebarDetails,
   ProjectSidebarLinks,
+  ProjectStatusBadge,
   ScrollablePanel,
   useRelativeTime,
 } from "@modrinth/ui";
@@ -880,7 +881,6 @@ import dayjs from "dayjs";
 import Accordion from "~/components/ui/Accordion.vue";
 // import AdPlaceholder from "~/components/ui/AdPlaceholder.vue";
 import AutomaticAccordion from "~/components/ui/AutomaticAccordion.vue";
-import Badge from "~/components/ui/Badge.vue";
 import Breadcrumbs from "~/components/ui/Breadcrumbs.vue";
 import CollectionCreateModal from "~/components/ui/CollectionCreateModal.vue";
 import MessageBanner from "~/components/ui/MessageBanner.vue";
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/index.vue b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
index f17a36cc7..a0593483c 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
@@ -242,8 +242,7 @@
 import { formatProjectStatus } from "@modrinth/utils";
 import { UploadIcon, SaveIcon, TrashIcon, XIcon, IssuesIcon, CheckIcon } from "@modrinth/assets";
 import { Multiselect } from "vue-multiselect";
-import { ConfirmModal } from "@modrinth/ui";
-import Avatar from "~/components/ui/Avatar.vue";
+import { ConfirmModal, Avatar } from "@modrinth/ui";
 import FileInput from "~/components/ui/FileInput.vue";
 
 const props = defineProps({
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version].vue b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
index b79b9b632..7e274c93c 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -630,7 +630,15 @@
   </div>
 </template>
 <script>
-import { ButtonStyled, ConfirmModal, MarkdownEditor } from "@modrinth/ui";
+import {
+  Avatar,
+  Badge,
+  CopyCode,
+  Checkbox,
+  ButtonStyled,
+  ConfirmModal,
+  MarkdownEditor,
+} from "@modrinth/ui";
 import {
   FileIcon,
   TrashIcon,
@@ -656,13 +664,9 @@ import { renderHighlightedString } from "~/helpers/highlight.js";
 import { reportVersion } from "~/utils/report-helpers.ts";
 import { useImageUpload } from "~/composables/image-upload.ts";
 
-import Avatar from "~/components/ui/Avatar.vue";
 import AdPlaceholder from "~/components/ui/AdPlaceholder.vue";
-import Badge from "~/components/ui/Badge.vue";
 import Breadcrumbs from "~/components/ui/Breadcrumbs.vue";
-import CopyCode from "~/components/ui/CopyCode.vue";
 import Categories from "~/components/ui/search/Categories.vue";
-import Checkbox from "~/components/ui/Checkbox.vue";
 import FileInput from "~/components/ui/FileInput.vue";
 import Modal from "~/components/ui/Modal.vue";
 
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index 392cc70a9..480cf8257 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -275,7 +275,7 @@ import { useVIntl } from "@vintl/vintl";
 import type { ServerNotice as ServerNoticeType } from "@modrinth/utils";
 import { computed } from "vue";
 import { NOTICE_LEVELS } from "@modrinth/ui/src/utils/notices.ts";
-import { usePyroFetch } from "~/composables/pyroFetch.ts";
+import { useServersFetch } from "~/composables/servers/servers-fetch.ts";
 import AssignNoticeModal from "~/components/ui/servers/notice/AssignNoticeModal.vue";
 
 const { formatMessage } = useVIntl();
@@ -290,7 +290,7 @@ const assignNoticeModal = ref<InstanceType<typeof AssignNoticeModal>>();
 await refreshNotices();
 
 async function refreshNotices() {
-  await usePyroFetch("notices").then((res) => {
+  await useServersFetch("notices").then((res) => {
     notices.value = res as ServerNoticeType[];
     notices.value.sort((a, b) => {
       const dateDiff = dayjs(b.announce_at).diff(dayjs(a.announce_at));
@@ -347,7 +347,7 @@ function startEditing(notice: ServerNoticeType, assignments: boolean = false) {
 }
 
 async function deleteNotice(notice: ServerNoticeType) {
-  await usePyroFetch(`notices/${notice.id}`, {
+  await useServersFetch(`notices/${notice.id}`, {
     method: "DELETE",
   })
     .then(() => {
@@ -401,7 +401,7 @@ async function saveChanges() {
     return;
   }
 
-  await usePyroFetch(`notices/${editingNotice.value?.id}`, {
+  await useServersFetch(`notices/${editingNotice.value?.id}`, {
     method: "PATCH",
     body: {
       message: newNoticeMessage.value,
@@ -432,7 +432,7 @@ async function createNotice() {
     return;
   }
 
-  await usePyroFetch("notices", {
+  await useServersFetch("notices", {
     method: "POST",
     body: {
       message: newNoticeMessage.value,
diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue
index 6aa9d7163..6e311d187 100644
--- a/apps/frontend/src/pages/app.vue
+++ b/apps/frontend/src/pages/app.vue
@@ -8,13 +8,11 @@ import {
   DownloadIcon,
   LinkIcon,
 } from "@modrinth/assets";
-import Avatar from "~/components/ui/Avatar.vue";
+import { Avatar, Checkbox, Badge } from "@modrinth/ui";
 import LogoAnimated from "~/components/brand/LogoAnimated.vue";
-import Badge from "~/components/ui/Badge.vue";
 import PrismIcon from "~/assets/images/external/prism.svg?component";
 import ATLauncher from "~/assets/images/external/atlauncher.svg?component";
 import CurseForge from "~/assets/images/external/curseforge.svg?component";
-import Checkbox from "~/components/ui/Checkbox.vue";
 
 import { homePageProjects } from "~/generated/state.json";
 
diff --git a/apps/frontend/src/pages/dashboard/index.vue b/apps/frontend/src/pages/dashboard/index.vue
index bacc6e4d1..9ee6f7d75 100644
--- a/apps/frontend/src/pages/dashboard/index.vue
+++ b/apps/frontend/src/pages/dashboard/index.vue
@@ -97,7 +97,7 @@
 </template>
 <script setup>
 import { ChevronRightIcon, HistoryIcon } from "@modrinth/assets";
-import Avatar from "~/components/ui/Avatar.vue";
+import { Avatar } from "@modrinth/ui";
 import NotificationItem from "~/components/ui/NotificationItem.vue";
 import { fetchExtraNotificationData, groupNotifications } from "~/helpers/notifications.ts";
 
diff --git a/apps/frontend/src/pages/dashboard/notifications.vue b/apps/frontend/src/pages/dashboard/notifications.vue
index cc1be438c..9403107ab 100644
--- a/apps/frontend/src/pages/dashboard/notifications.vue
+++ b/apps/frontend/src/pages/dashboard/notifications.vue
@@ -49,12 +49,14 @@
         />
       </template>
       <p v-else>You don't have any unread notifications.</p>
-      <Pagination :page="page" :count="pages" @switch-page="changePage" />
+      <div class="flex justify-end">
+        <Pagination :page="page" :count="pages" @switch-page="changePage" />
+      </div>
     </section>
   </div>
 </template>
 <script setup>
-import { Button, Chips } from "@modrinth/ui";
+import { Button, Pagination, Chips } from "@modrinth/ui";
 import { HistoryIcon, CheckCheckIcon } from "@modrinth/assets";
 import {
   fetchExtraNotificationData,
@@ -63,7 +65,6 @@ import {
 } from "~/helpers/notifications.ts";
 import NotificationItem from "~/components/ui/NotificationItem.vue";
 import Breadcrumbs from "~/components/ui/Breadcrumbs.vue";
-import Pagination from "~/components/ui/Pagination.vue";
 
 useHead({
   title: "Notifications - Modrinth",
diff --git a/apps/frontend/src/pages/dashboard/organizations.vue b/apps/frontend/src/pages/dashboard/organizations.vue
index 168e688e0..38eecc9e0 100644
--- a/apps/frontend/src/pages/dashboard/organizations.vue
+++ b/apps/frontend/src/pages/dashboard/organizations.vue
@@ -14,7 +14,7 @@
       <template v-if="orgs?.length > 0">
         <div class="orgs-grid">
           <nuxt-link
-            v-for="org in orgs"
+            v-for="org in sortedOrgs"
             :key="org.id"
             :to="`/organization/${org.slug}`"
             class="universal-card button-base recessed org"
@@ -67,6 +67,8 @@ const { data: orgs, error } = useAsyncData("organizations", () => {
   });
 });
 
+const sortedOrgs = computed(() => orgs.value.sort((a, b) => a.name.localeCompare(b.name)));
+
 const onlyAcceptedMembers = (members) => members.filter((member) => member?.accepted);
 
 if (error.value) {
diff --git a/apps/frontend/src/pages/dashboard/projects.vue b/apps/frontend/src/pages/dashboard/projects.vue
index 1947f1408..d77de66aa 100644
--- a/apps/frontend/src/pages/dashboard/projects.vue
+++ b/apps/frontend/src/pages/dashboard/projects.vue
@@ -279,18 +279,19 @@
             </div>
 
             <div>
-              <Badge v-if="project.status" :type="project.status" class="status" />
+              <ProjectStatusBadge v-if="project.status" :status="project.status" />
             </div>
 
             <div>
-              <nuxt-link
-                class="square-button"
-                :to="`/${$getProjectTypeForUrl(project.project_type, project.loaders)}/${
-                  project.slug ? project.slug : project.id
-                }/settings`"
-              >
-                <SettingsIcon />
-              </nuxt-link>
+              <ButtonStyled circular>
+                <nuxt-link
+                  :to="`/${$getProjectTypeForUrl(project.project_type, project.loaders)}/${
+                    project.slug ? project.slug : project.id
+                  }/settings`"
+                >
+                  <SettingsIcon />
+                </nuxt-link>
+              </ButtonStyled>
             </div>
           </div>
         </div>
@@ -312,19 +313,23 @@ import {
   SortAscendingIcon as AscendingIcon,
   SortDescendingIcon as DescendingIcon,
 } from "@modrinth/assets";
-import { commonMessages } from "@modrinth/ui";
+import {
+  Avatar,
+  ButtonStyled,
+  Checkbox,
+  CopyCode,
+  ProjectStatusBadge,
+  commonMessages,
+} from "@modrinth/ui";
 
-import Badge from "~/components/ui/Badge.vue";
-import Checkbox from "~/components/ui/Checkbox.vue";
 import Modal from "~/components/ui/Modal.vue";
-import Avatar from "~/components/ui/Avatar.vue";
 import ModalCreation from "~/components/ui/ModalCreation.vue";
-import CopyCode from "~/components/ui/CopyCode.vue";
 
 export default defineNuxtComponent({
   components: {
     Avatar,
-    Badge,
+    ButtonStyled,
+    ProjectStatusBadge,
     SettingsIcon,
     TrashIcon,
     Checkbox,
diff --git a/apps/frontend/src/pages/index.vue b/apps/frontend/src/pages/index.vue
index 5532ed42d..b3bdeb4d1 100644
--- a/apps/frontend/src/pages/index.vue
+++ b/apps/frontend/src/pages/index.vue
@@ -527,7 +527,7 @@
 </template>
 <script setup>
 import { Multiselect } from "vue-multiselect";
-import { ButtonStyled, useRelativeTime } from "@modrinth/ui";
+import { Avatar, ButtonStyled, useRelativeTime } from "@modrinth/ui";
 import {
   CompassIcon,
   LogInIcon,
@@ -539,7 +539,6 @@ import {
 } from "@modrinth/assets";
 import PrismLauncherLogo from "~/assets/images/external/prism.svg?component";
 import ATLauncherLogo from "~/assets/images/external/atlauncher.svg?component";
-import Avatar from "~/components/ui/Avatar.vue";
 import ProjectCard from "~/components/ui/ProjectCard.vue";
 
 import { homePageProjects, homePageSearch, homePageNotifs } from "~/generated/state.json";
diff --git a/apps/frontend/src/pages/moderation/review.vue b/apps/frontend/src/pages/moderation/review.vue
index 24eb15bf9..0c797dc11 100644
--- a/apps/frontend/src/pages/moderation/review.vue
+++ b/apps/frontend/src/pages/moderation/review.vue
@@ -81,7 +81,9 @@
         </div>
         <div class="mobile-row">
           is requesting to be
-          <Badge :type="project.requested_status ? project.requested_status : 'approved'" />
+          <ProjectStatusBadge
+            :status="project.requested_status ? project.requested_status : 'approved'"
+          />
         </div>
       </div>
       <div class="input-group">
@@ -103,7 +105,7 @@
 </template>
 
 <script setup>
-import { Chips, useRelativeTime } from "@modrinth/ui";
+import { Avatar, ProjectStatusBadge, Chips, useRelativeTime } from "@modrinth/ui";
 import {
   UnknownIcon,
   EyeIcon,
@@ -112,9 +114,8 @@ import {
   IssuesIcon,
   ScaleIcon,
 } from "@modrinth/assets";
-import Avatar from "~/components/ui/Avatar.vue";
-import Badge from "~/components/ui/Badge.vue";
 import { formatProjectType } from "~/plugins/shorthands.js";
+import { asEncodedJsonArray, fetchSegmented } from "~/utils/fetch-helpers.ts";
 
 useHead({
   title: "Review projects - Modrinth",
@@ -170,28 +171,6 @@ const projectTypes = computed(() => {
   return [...set];
 });
 
-function segmentData(data, segmentSize = 800) {
-  return data.reduce((acc, curr, index) => {
-    const segment = Math.floor(index / segmentSize);
-
-    if (!acc[segment]) {
-      acc[segment] = [];
-    }
-    acc[segment].push(curr);
-    return acc;
-  }, []);
-}
-
-function fetchSegmented(data, createUrl, options = {}) {
-  return Promise.all(segmentData(data).map((ids) => useBaseFetch(createUrl(ids), options))).then(
-    (results) => results.flat(),
-  );
-}
-
-function asEncodedJsonArray(data) {
-  return encodeURIComponent(JSON.stringify(data));
-}
-
 if (projects.value) {
   const teamIds = projects.value.map((x) => x.team_id);
   const orgIds = projects.value.filter((x) => x.organization).map((x) => x.organization);
diff --git a/apps/frontend/src/pages/search/[searchProjectType].vue b/apps/frontend/src/pages/search/[searchProjectType].vue
index 76c05a581..e2a00da2c 100644
--- a/apps/frontend/src/pages/search/[searchProjectType].vue
+++ b/apps/frontend/src/pages/search/[searchProjectType].vue
@@ -334,6 +334,7 @@ import {
   ImageIcon,
 } from "@modrinth/assets";
 import { computed } from "vue";
+import { useModrinthServers } from "~/composables/servers/modrinth-servers.ts";
 import ProjectCard from "~/components/ui/ProjectCard.vue";
 import LogoAnimated from "~/components/brand/LogoAnimated.vue";
 // import AdPlaceholder from "~/components/ui/AdPlaceholder.vue";
@@ -388,7 +389,7 @@ async function updateServerContext() {
     if (!auth.value.user) {
       router.push("/auth/sign-in?redirect=" + encodeURIComponent(route.fullPath));
     } else if (route.query.sid !== null) {
-      server.value = await usePyroServer(route.query.sid, ["general", "content"], {
+      server.value = await useModrinthServers(route.query.sid, ["general", "content"], {
         waitForModules: true,
       });
     }
@@ -519,7 +520,6 @@ async function serverInstall(project) {
 
     if (projectType.value.id === "modpack") {
       await server.value.general.reinstall(
-        server.value.serverId,
         false,
         project.project_id,
         version.id,
diff --git a/apps/frontend/src/pages/servers/index.vue b/apps/frontend/src/pages/servers/index.vue
index e96a8c8f4..b2eaa8117 100644
--- a/apps/frontend/src/pages/servers/index.vue
+++ b/apps/frontend/src/pages/servers/index.vue
@@ -4,27 +4,28 @@
     data-pyro
     class="servers-hero relative isolate -mt-44 h-full min-h-screen pt-8"
   >
-    <PurchaseModal
-      v-if="showModal && selectedProduct && customer"
-      :key="selectedProduct.id"
+    <ModrinthServersPurchaseModal
+      v-if="customer"
+      :key="`purchase-modal-${customer.id}`"
       ref="purchaseModal"
-      :product="selectedProduct"
-      :country="country"
-      :custom-server="customServer"
       :publishable-key="config.public.stripePublishableKey"
-      :send-billing-request="
+      :initiate-payment="
         async (body) =>
           await useBaseFetch('billing/payment', { internal: true, method: 'POST', body })
       "
-      :fetch-payment-data="fetchPaymentData"
+      :available-products="pyroProducts"
       :on-error="handleError"
       :customer="customer"
       :payment-methods="paymentMethods"
+      :currency="selectedCurrency"
       :return-url="`${config.public.siteUrl}/servers/manage`"
       :server-name="`${auth?.user?.username}'s server`"
-      :fetch-capacity-statuses="fetchCapacityStatuses"
       :out-of-stock-url="outOfStockUrl"
-      @hidden="handleModalHidden"
+      :fetch-capacity-statuses="fetchCapacityStatuses"
+      :pings="regionPings"
+      :regions="regions"
+      :refresh-payment-methods="fetchPaymentData"
+      :fetch-stock="fetchStock"
     />
 
     <section
@@ -442,8 +443,8 @@
                 Where are Modrinth Servers located? Can I choose a region?
               </summary>
               <p class="m-0 ml-6 leading-[160%]">
-                Currently, Modrinth Servers are located on the east coast of the United States in
-                Vint Hill, Virginia. More regions to come in the future!
+                We have servers in both North America in Vint Hill, Virginia, and Europe in Limburg,
+                Germany. More regions to come in the future!
               </p>
             </details>
 
@@ -497,98 +498,6 @@
       </div>
     </section>
 
-    <section
-      v-if="false"
-      class="relative mt-24 flex flex-col bg-[radial-gradient(65%_50%_at_50%_-10%,var(--color-brand-highlight)_0%,var(--color-accent-contrast)_100%)] px-3 pt-24 md:mt-48 md:pt-48"
-    >
-      <div class="faded-brand-line absolute left-0 top-0 h-[1px] w-full"></div>
-      <div class="mx-auto flex w-full max-w-7xl flex-col gap-8">
-        <div class="grid grid-cols-1 items-center gap-12 lg:grid-cols-2">
-          <div class="flex flex-col gap-8">
-            <div class="flex flex-col gap-4">
-              <div
-                class="relative w-fit rounded-full bg-highlight-green px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
-              >
-                Server Locations
-              </div>
-              <h1 class="relative m-0 max-w-2xl text-4xl leading-[120%] md:text-7xl">
-                Coast-to-Coast Coverage
-              </h1>
-            </div>
-
-            <div class="flex flex-col gap-8">
-              <div class="flex flex-col gap-4">
-                <div class="flex items-center gap-3">
-                  <div class="grid size-8 place-content-center rounded-full bg-highlight-green">
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="16"
-                      height="16"
-                      viewBox="0 0 24 24"
-                      fill="none"
-                      stroke="currentColor"
-                      stroke-width="2"
-                      stroke-linecap="round"
-                      stroke-linejoin="round"
-                      class="text-brand"
-                    >
-                      <path d="M20 10c0 6-8 12-8 12s-8-6-8-12a8 8 0 0 1 16 0Z" />
-                      <circle cx="12" cy="10" r="3" />
-                    </svg>
-                  </div>
-                  <h2 class="relative m-0 text-xl font-medium leading-[155%] md:text-2xl">
-                    US Coverage
-                  </h2>
-                </div>
-                <p
-                  class="relative m-0 max-w-xl text-base font-normal leading-[155%] text-secondary md:text-[18px]"
-                >
-                  With strategically placed servers in New York, California, Texas, Florida, and
-                  Washington, we ensure low latency connections for players across North America.
-                  Each location is equipped with high-performance hardware and DDoS protection.
-                </p>
-              </div>
-
-              <div class="flex flex-col gap-4">
-                <div class="flex items-center gap-3">
-                  <div class="grid size-8 place-content-center rounded-full bg-highlight-blue">
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="16"
-                      height="16"
-                      viewBox="0 0 24 24"
-                      fill="none"
-                      stroke="currentColor"
-                      stroke-width="2"
-                      stroke-linecap="round"
-                      stroke-linejoin="round"
-                      class="text-blue"
-                    >
-                      <path d="M12 2a10 10 0 1 0 10 10" />
-                      <path d="M18 13a6 6 0 0 0-6-6" />
-                      <path d="M13 2.05a10 10 0 0 1 2 2" />
-                      <path d="M19.5 8.5a10 10 0 0 1 2 2" />
-                    </svg>
-                  </div>
-                  <h2 class="relative m-0 text-xl font-medium leading-[155%] md:text-2xl">
-                    Global Expansion
-                  </h2>
-                </div>
-                <p
-                  class="relative m-0 max-w-xl text-base font-normal leading-[155%] text-secondary md:text-[18px]"
-                >
-                  We're expanding to Europe and Asia-Pacific regions soon, bringing Modrinth's
-                  seamless hosting experience worldwide. Join our Discord to stay updated on new
-                  region launches.
-                </p>
-              </div>
-            </div>
-          </div>
-          <Globe />
-        </div>
-      </div>
-    </section>
-
     <section
       id="plan"
       class="relative mt-24 flex flex-col bg-[radial-gradient(65%_50%_at_50%_-10%,var(--color-brand-highlight)_0%,var(--color-accent-contrast)_100%)] px-3 pt-24 md:mt-48 md:pt-48"
@@ -596,19 +505,35 @@
       <div class="faded-brand-line absolute left-0 top-0 h-[1px] w-full"></div>
       <div class="mx-auto flex w-full max-w-7xl flex-col items-center gap-8 text-center">
         <h1 class="relative m-0 text-4xl leading-[120%] md:text-7xl">
-          Start your server on Modrinth
+          There's a server for everyone
         </h1>
-        <h2
-          class="relative m-0 max-w-xl text-base font-normal leading-[155%] text-secondary md:text-[18px]"
-        >
-          {{
-            isAtCapacity && !loggedOut
-              ? "We are currently at capacity. Please try again later."
-              : "There's a plan for everyone! Choose the one that fits your needs."
-          }}
-        </h2>
+        <p class="m-0 flex items-center gap-1">
+          Available in North America and Europe for wide coverage.
+        </p>
 
-        <ul class="m-0 mt-8 flex w-full flex-col gap-8 p-0 lg:flex-row">
+        <div class="grid grid-cols-[1fr_auto_1fr] items-center gap-3">
+          <span></span>
+          <OptionGroup v-slot="{ option }" v-model="billingPeriod" :options="billingPeriods">
+            <template v-if="option === 'monthly'"> Pay monthly </template>
+            <span v-else-if="option === 'quarterly'"> Pay quarterly </span>
+            <span v-else-if="option === 'yearly'"> Pay yearly </span>
+          </OptionGroup>
+          <template v-if="billingPeriods.includes('quarterly')">
+            <button
+              v-if="billingPeriod !== 'quarterly'"
+              class="bg-transparent p-0 text-sm font-medium text-brand hover:underline active:scale-95"
+              @click="billingPeriod = 'quarterly'"
+            >
+              Save 16% with quarterly billing!
+            </button>
+            <span v-else class="bg-transparent p-0 text-sm font-medium text-brand">
+              Save 16% with quarterly billing!
+            </span>
+          </template>
+          <span v-else></span>
+        </div>
+
+        <ul class="m-0 flex w-full grid-cols-3 flex-col gap-8 p-0 lg:grid">
           <ServerPlanSelector
             :capacity="capacityStatuses?.small?.available"
             plan="small"
@@ -616,9 +541,12 @@
             :storage="plans.small.metadata.storage"
             :cpus="plans.small.metadata.cpu"
             :price="
-              plans.small?.prices?.find((x) => x.currency_code === 'USD')?.prices?.intervals
-                ?.monthly
+              plans.small?.prices?.find((x) => x.currency_code === selectedCurrency)?.prices
+                ?.intervals?.[billingPeriod]
             "
+            :interval="billingPeriod"
+            :currency="selectedCurrency"
+            :is-usa="country.toLowerCase() === 'us'"
             @select="selectProduct('small')"
             @scroll-to-faq="scrollToFaq()"
           />
@@ -629,9 +557,12 @@
             :storage="plans.medium.metadata.storage"
             :cpus="plans.medium.metadata.cpu"
             :price="
-              plans.medium?.prices?.find((x) => x.currency_code === 'USD')?.prices?.intervals
-                ?.monthly
+              plans.medium?.prices?.find((x) => x.currency_code === selectedCurrency)?.prices
+                ?.intervals?.[billingPeriod]
             "
+            :interval="billingPeriod"
+            :currency="selectedCurrency"
+            :is-usa="country.toLowerCase() === 'us'"
             @select="selectProduct('medium')"
             @scroll-to-faq="scrollToFaq()"
           />
@@ -641,10 +572,13 @@
             :storage="plans.large.metadata.storage"
             :cpus="plans.large.metadata.cpu"
             :price="
-              plans.large?.prices?.find((x) => x.currency_code === 'USD')?.prices?.intervals
-                ?.monthly
+              plans.large?.prices?.find((x) => x.currency_code === selectedCurrency)?.prices
+                ?.intervals?.[billingPeriod]
             "
+            :currency="selectedCurrency"
+            :is-usa="country.toLowerCase() === 'us'"
             plan="large"
+            :interval="billingPeriod"
             @select="selectProduct('large')"
             @scroll-to-faq="scrollToFaq()"
           />
@@ -654,10 +588,9 @@
           class="mb-24 flex w-full flex-col items-start justify-between gap-4 rounded-2xl bg-bg p-8 text-left lg:flex-row lg:gap-0"
         >
           <div class="flex flex-col gap-4">
-            <h1 class="m-0">Build your own</h1>
+            <h1 class="m-0">Know exactly what you need?</h1>
             <h2 class="m-0 text-base font-normal text-primary">
-              If you're a more technical server administrator, you can pick your own RAM and storage
-              options.
+              Pick a customized plan with just the specs you need.
             </h2>
           </div>
 
@@ -666,7 +599,7 @@
           >
             <ButtonStyled color="standard" size="large">
               <button class="w-full md:w-fit" @click="selectProduct('custom')">
-                Build your own
+                Get started
                 <RightArrowIcon class="shrink-0" />
               </button>
             </ButtonStyled>
@@ -679,7 +612,7 @@
 </template>
 
 <script setup>
-import { ButtonStyled, PurchaseModal } from "@modrinth/ui";
+import { ButtonStyled, ModrinthServersPurchaseModal } from "@modrinth/ui";
 import {
   BoxIcon,
   GameIcon,
@@ -690,9 +623,13 @@ import {
   ServerIcon,
 } from "@modrinth/assets";
 import { products } from "~/generated/state.json";
+import { useServersFetch } from "~/composables/servers/servers-fetch.ts";
 import LoaderIcon from "~/components/ui/servers/icons/LoaderIcon.vue";
-import Globe from "~/components/ui/servers/Globe.vue";
 import ServerPlanSelector from "~/components/ui/servers/marketing/ServerPlanSelector.vue";
+import OptionGroup from "~/components/ui/OptionGroup.vue";
+
+const billingPeriods = ref(["monthly", "quarterly"]);
+const billingPeriod = ref(billingPeriods.value.includes("quarterly") ? "quarterly" : "monthly");
 
 const pyroProducts = products.filter((p) => p.metadata.type === "pyro");
 const pyroPlanProducts = pyroProducts.filter(
@@ -711,16 +648,6 @@ useSeoMeta({
   ogDescription: description,
 });
 
-useHead({
-  script: [
-    {
-      src: "https://js.stripe.com/v3/",
-      defer: true,
-      async: true,
-    },
-  ],
-});
-
 const auth = await useAuth();
 const data = useNuxtApp();
 const config = useRuntimeConfig();
@@ -740,6 +667,7 @@ const isDeleting = ref(false);
 const typingSpeed = 75;
 const deletingSpeed = 25;
 const pauseTime = 2000;
+const selectedCurrency = ref("USD");
 
 const loggedOut = computed(() => !auth.value.user);
 const outOfStockUrl = "https://discord.modrinth.com";
@@ -747,13 +675,23 @@ const outOfStockUrl = "https://discord.modrinth.com";
 const { data: hasServers } = await useAsyncData("ServerListCountCheck", async () => {
   try {
     if (!auth.value.user) return false;
-    const response = await usePyroFetch("servers");
+    const response = await useServersFetch("servers");
     return response.servers && response.servers.length > 0;
   } catch {
     return false;
   }
 });
 
+function fetchStock(region, request) {
+  return useServersFetch(`stock?region=${region.shortcode}`, {
+    method: "POST",
+    body: {
+      ...request,
+    },
+    bypassAuth: true,
+  }).then((res) => res.available);
+}
+
 async function fetchCapacityStatuses(customProduct = null) {
   try {
     const productsToCheck = customProduct?.metadata
@@ -765,7 +703,7 @@ async function fetchCapacityStatuses(customProduct = null) {
           ),
         ];
     const capacityChecks = productsToCheck.map((product) =>
-      usePyroFetch("stock", {
+      useServersFetch("stock", {
         method: "POST",
         body: {
           cpu: product.metadata.cpu,
@@ -841,23 +779,6 @@ const handleError = (err) => {
   });
 };
 
-const handleModalHidden = () => {
-  showModal.value = false;
-};
-
-watch(selectedProduct, async (newProduct) => {
-  if (newProduct) {
-    showModal.value = false;
-    await nextTick();
-    showModal.value = true;
-    modalKey.value++;
-    await nextTick();
-    if (purchaseModal.value && purchaseModal.value.show) {
-      purchaseModal.value.show();
-    }
-  }
-});
-
 async function fetchPaymentData() {
   if (!auth.value.user) return;
   try {
@@ -954,8 +875,10 @@ const selectProduct = async (product) => {
   modalKey.value++;
   await nextTick();
 
-  if (purchaseModal.value && purchaseModal.value.show) {
-    purchaseModal.value.show();
+  if (product === "custom") {
+    purchaseModal.value?.show(billingPeriod.value);
+  } else {
+    purchaseModal.value?.show(billingPeriod.value, selectedProduct.value);
   }
 };
 
@@ -966,9 +889,82 @@ const planQuery = () => {
   }
 };
 
+const regions = ref([]);
+const regionPings = ref([]);
+
+function pingRegions() {
+  useServersFetch("regions", {
+    method: "GET",
+    version: 1,
+    bypassAuth: true,
+  }).then((res) => {
+    regions.value = res;
+    regions.value.forEach((region) => {
+      runPingTest(region);
+    });
+  });
+}
+
+const PING_COUNT = 20;
+const PING_INTERVAL = 200;
+const MAX_PING_TIME = 1000;
+
+function runPingTest(region, index = 1) {
+  if (index > 10) {
+    regionPings.value.push({
+      region: region.shortcode,
+      ping: -1,
+    });
+    return;
+  }
+
+  const wsUrl = `wss://${region.shortcode}${index}.${region.zone}/pingtest`;
+  try {
+    const socket = new WebSocket(wsUrl);
+    const pings = [];
+
+    socket.onopen = () => {
+      for (let i = 0; i < PING_COUNT; i++) {
+        setTimeout(() => {
+          socket.send(performance.now());
+        }, i * PING_INTERVAL);
+      }
+      setTimeout(
+        () => {
+          socket.close();
+
+          const median = Math.round([...pings].sort((a, b) => a - b)[Math.floor(pings.length / 2)]);
+          if (median) {
+            regionPings.value.push({
+              region: region.shortcode,
+              ping: median,
+            });
+          }
+        },
+        PING_COUNT * PING_INTERVAL + MAX_PING_TIME,
+      );
+    };
+
+    socket.onmessage = (event) => {
+      pings.push(performance.now() - event.data);
+    };
+
+    socket.onerror = (event) => {
+      console.error(
+        `Failed to connect pingtest WebSocket with ${wsUrl}, trying index ${index + 1}:`,
+        event,
+      );
+      runPingTest(region, index + 1);
+    };
+  } catch (error) {
+    console.error(`Failed to connect pingtest WebSocket with ${wsUrl}:`, error);
+  }
+}
+
 onMounted(() => {
   startTyping();
   planQuery();
+  pingRegions();
 });
 
 watch(customer, (newCustomer) => {
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 14387c62e..566cc1ed2 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -18,160 +18,96 @@
     v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'upgrading'"
     class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
   >
-    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-      <div class="flex flex-col items-center text-center">
-        <div class="flex flex-col items-center gap-4">
-          <div class="grid place-content-center rounded-full bg-bg-blue p-4">
-            <TransferIcon class="size-12 text-blue" />
-          </div>
-          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server upgrading</h1>
-        </div>
-        <p class="text-lg text-secondary">
-          Your server's hardware is currently being upgraded and will be back online shortly!
-        </p>
-      </div>
-    </div>
+    <ErrorInformationCard
+      title="Server upgrading"
+      description="Your server's hardware is currently being upgraded and will be back online shortly!"
+      :icon="TransferIcon"
+      icon-color="blue"
+      :action="generalErrorAction"
+    />
   </div>
   <div
     v-else-if="serverData?.status === 'suspended'"
     class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
   >
-    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-      <div class="flex flex-col items-center text-center">
-        <div class="flex flex-col items-center gap-4">
-          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-            <LockIcon class="size-12 text-orange" />
-          </div>
-          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server suspended</h1>
-        </div>
-        <p class="text-lg text-secondary">
-          {{
-            serverData.suspension_reason === "cancelled"
-              ? "Your subscription has been cancelled."
-              : serverData.suspension_reason
-                ? `Your server has been suspended: ${serverData.suspension_reason}`
-                : "Your server has been suspended."
-          }}
-          <br />
-          Contact Modrinth Support if you believe this is an error.
-        </p>
-      </div>
-      <ButtonStyled size="large" color="brand" @click="() => router.push('/settings/billing')">
-        <button class="mt-6 !w-full">Go to billing settings</button>
-      </ButtonStyled>
-    </div>
+    <ErrorInformationCard
+      title="Server suspended"
+      :description="suspendedDescription"
+      :icon="LockIcon"
+      icon-color="orange"
+      :action="suspendedAction"
+    />
   </div>
   <div
     v-else-if="
-      server.general?.error?.error.statusCode === 403 ||
-      server.general?.error?.error.statusCode === 404
+      server.moduleErrors?.general?.error.statusCode === 403 ||
+      server.moduleErrors?.general?.error.statusCode === 404
     "
     class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
   >
-    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-      <div class="flex flex-col items-center text-center">
-        <div class="flex flex-col items-center gap-4">
-          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-            <TransferIcon class="size-12 text-orange" />
-          </div>
-          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server not found</h1>
-        </div>
-        <p class="text-lg text-secondary">
-          You don't have permission to view this server or it no longer exists. If you believe this
-          is an error, please contact Modrinth Support.
-        </p>
-      </div>
-      <UiCopyCode :text="JSON.stringify(server.general?.error)" />
-
-      <ButtonStyled size="large" color="brand" @click="() => router.push('/servers/manage')">
-        <button class="mt-6 !w-full">Go back to all servers</button>
-      </ButtonStyled>
-    </div>
+    <ErrorInformationCard
+      title="An error occured."
+      description="Please contact Modrinth Support."
+      :icon="TransferIcon"
+      icon-color="orange"
+      :error-details="generalErrorDetails"
+      :action="generalErrorAction"
+    />
   </div>
   <div
-    v-else-if="server.general?.error?.error.statusCode === 503"
+    v-else-if="server.moduleErrors?.general?.error.statusCode === 503"
     class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
   >
-    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-      <div class="flex flex-col items-center text-center">
-        <div class="flex flex-col items-center gap-4">
-          <div class="grid place-content-center rounded-full bg-bg-red p-4">
-            <UiServersIconsPanelErrorIcon class="size-12 text-red" />
-          </div>
-          <h1 class="m-0 mb-4 w-fit text-4xl font-bold">Server Node Unavailable</h1>
+    <ErrorInformationCard
+      title="Server Node Unavailable"
+      :icon="PanelErrorIcon"
+      icon-color="red"
+      :action="nodeUnavailableAction"
+      :error-details="nodeUnavailableDetails"
+    >
+      <template #description>
+        <div class="text-md space-y-4">
+          <p class="leading-[170%] text-secondary">
+            Your server's node, where your Modrinth Server is physically hosted, is experiencing
+            issues. We are working with our datacenter to resolve the issue as quickly as possible.
+          </p>
+          <p class="leading-[170%] text-secondary">
+            Your data is safe and will not be lost, and your server will be back online as soon as
+            the issue is resolved.
+          </p>
+          <p class="leading-[170%] text-secondary">
+            For updates, please join the Modrinth Discord or contact Modrinth Support via the chat
+            bubble in the bottom right corner and we'll be happy to help.
+          </p>
         </div>
-        <p class="m-0 mb-4 leading-[170%] text-secondary">
-          Your server's node, where your Modrinth Server is physically hosted, is experiencing
-          issues. We are working with our datacenter to resolve the issue as quickly as possible.
-        </p>
-        <p class="m-0 mb-4 leading-[170%] text-secondary">
-          Your data is safe and will not be lost, and your server will be back online as soon as the
-          issue is resolved.
-        </p>
-        <p class="m-0 mb-4 leading-[170%] text-secondary">
-          For updates, please join the Modrinth Discord or contact Modrinth Support via the chat
-          bubble in the bottom right corner and we'll be happy to help.
-        </p>
-
-        <div class="flex flex-col gap-2">
-          <UiCopyCode :text="'Server ID: ' + server.serverId" />
-          <UiCopyCode :text="'Node: ' + server.general?.datacenter" />
-        </div>
-      </div>
-      <ButtonStyled
-        size="large"
-        color="standard"
-        @click="
-          () =>
-            navigateTo('https://discord.modrinth.com', {
-              external: true,
-            })
-        "
-      >
-        <button class="mt-6 !w-full">Join Modrinth Discord</button>
-      </ButtonStyled>
-      <ButtonStyled
-        :disabled="formattedTime !== '00'"
-        size="large"
-        color="standard"
-        @click="() => reloadNuxtApp()"
-      >
-        <button class="mt-3 !w-full">Reload</button>
-      </ButtonStyled>
-    </div>
+      </template>
+    </ErrorInformationCard>
   </div>
   <div
-    v-else-if="server.general?.error"
+    v-else-if="server.moduleErrors?.general?.error"
     class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
   >
-    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-      <div class="flex flex-col items-center text-center">
-        <div class="flex flex-col items-center gap-4">
-          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-            <TransferIcon class="size-12 text-orange" />
-          </div>
-          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Connection lost</h1>
+    <ErrorInformationCard
+      title="Connection lost"
+      description=""
+      :icon="TransferIcon"
+      icon-color="orange"
+      :action="connectionLostAction"
+    >
+      <template #description>
+        <div class="space-y-4">
           <div class="text-center text-secondary">
             {{
               formattedTime == "00" ? "Reconnecting..." : `Retrying in ${formattedTime} seconds...`
             }}
           </div>
+          <p class="text-lg text-secondary">
+            Something went wrong, and we couldn't connect to your server. This is likely due to a
+            temporary network issue. You'll be reconnected automatically.
+          </p>
         </div>
-        <p class="text-lg text-secondary">
-          Something went wrong, and we couldn't connect to your server. This is likely due to a
-          temporary network issue. You'll be reconnected automatically.
-        </p>
-      </div>
-      <UiCopyCode :text="JSON.stringify(server.general?.error)" />
-      <ButtonStyled
-        :disabled="formattedTime !== '00'"
-        size="large"
-        color="brand"
-        @click="() => reloadNuxtApp()"
-      >
-        <button class="mt-6 !w-full">Reload</button>
-      </ButtonStyled>
-    </div>
+      </template>
+    </ErrorInformationCard>
   </div>
   <!-- SERVER START -->
   <div
@@ -207,6 +143,7 @@
             class="server-action-buttons-anim flex w-fit flex-shrink-0"
           >
             <UiServersPanelServerActionButton
+              v-if="!serverData.flows?.intro"
               class="flex-shrink-0"
               :is-online="isServerRunning"
               :is-actioning="isActioning"
@@ -220,7 +157,14 @@
           </div>
         </div>
 
+        <div
+          v-if="serverData.flows?.intro"
+          class="flex items-center gap-2 font-semibold text-secondary"
+        >
+          <SettingsIcon /> Configuring server...
+        </div>
         <UiServersServerInfoLabels
+          v-else
           :server-data="serverData"
           :show-game-label="showGameLabel"
           :show-loader-label="showLoaderLabel"
@@ -231,149 +175,189 @@
       </div>
     </div>
 
-    <div
-      data-pyro-navigation
-      class="isolate flex w-full select-none flex-col justify-between gap-4 overflow-auto md:flex-row md:items-center"
-    >
-      <UiNavTabs :links="navLinks" />
-    </div>
-
-    <div data-pyro-mount class="h-full w-full flex-1">
+    <template v-if="serverData.flows?.intro">
       <div
-        v-if="error"
-        class="mx-auto mb-4 flex justify-between gap-2 rounded-2xl border-2 border-solid border-red bg-bg-red p-4 font-semibold text-contrast"
+        v-if="serverData?.status === 'installing'"
+        class="w-50 h-50 flex items-center justify-center gap-2 text-center text-lg font-bold"
       >
-        <div class="flex flex-row gap-4">
-          <IssuesIcon class="hidden h-8 w-8 shrink-0 text-red sm:block" />
-          <div class="flex flex-col gap-2 leading-[150%]">
-            <div class="flex items-center gap-3">
-              <IssuesIcon class="flex h-8 w-8 shrink-0 text-red sm:hidden" />
-              <div class="flex gap-2 text-2xl font-bold">{{ errorTitle }}</div>
-            </div>
+        <LazyUiServersPanelSpinner class="size-10 animate-spin" /> Setting up your server...
+      </div>
+      <div v-else>
+        <h2 class="my-4 text-xl font-extrabold">
+          What would you like to install on your new server?
+        </h2>
 
-            <div v-if="errorTitle.toLocaleLowerCase() === 'installation error'" class="font-normal">
-              <div
-                v-if="errorMessage.toLocaleLowerCase() === 'the specified version may be incorrect'"
-              >
-                An invalid loader or Minecraft version was specified and could not be installed.
-                <ul class="m-0 mt-4 p-0 pl-4">
-                  <li>
-                    If this version of Minecraft was released recently, please check if Modrinth
-                    Servers supports it.
-                  </li>
-                  <li>
-                    If you've installed a modpack, it may have been packaged incorrectly or may not
-                    be compatible with the loader.
-                  </li>
-                  <li>
-                    Your server may need to be reinstalled with a valid mod loader and version. You
-                    can change the loader by clicking the "Change Loader" button.
-                  </li>
-                  <li>
-                    If you're stuck, please contact Modrinth Support with the information below:
-                  </li>
-                </ul>
-                <ButtonStyled>
-                  <button class="mt-2" @click="copyServerDebugInfo">
-                    <CopyIcon v-if="!copied" />
-                    <CheckIcon v-else />
-                    Copy Debug Info
-                  </button>
-                </ButtonStyled>
-              </div>
-              <div v-if="errorMessage.toLocaleLowerCase() === 'internal error'">
-                An internal error occurred while installing your server. Don't fret — try
-                reinstalling your server, and if the problem persists, please contact Modrinth
-                support with your server's debug information.
-              </div>
-              <div v-if="errorMessage.toLocaleLowerCase() === 'this version is not yet supported'">
-                An error occurred while installing your server because Modrinth Servers does not
-                support the version of Minecraft or the loader you specified. Try reinstalling your
-                server with a different version or loader, and if the problem persists, please
-                contact Modrinth Support with your server's debug information.
+        <ServerInstallation
+          :server="server as ModrinthServer"
+          :backup-in-progress="backupInProgress"
+          ignore-current-installation
+          @reinstall="onReinstall"
+        />
+      </div>
+    </template>
+
+    <template v-else>
+      <div
+        data-pyro-navigation
+        class="isolate flex w-full select-none flex-col justify-between gap-4 overflow-auto md:flex-row md:items-center"
+      >
+        <UiNavTabs :links="navLinks" />
+      </div>
+
+      <div data-pyro-mount class="h-full w-full flex-1">
+        <div
+          v-if="error"
+          class="mx-auto mb-4 flex justify-between gap-2 rounded-2xl border-2 border-solid border-red bg-bg-red p-4 font-semibold text-contrast"
+        >
+          <div class="flex flex-row gap-4">
+            <IssuesIcon class="hidden h-8 w-8 shrink-0 text-red sm:block" />
+            <div class="flex flex-col gap-2 leading-[150%]">
+              <div class="flex items-center gap-3">
+                <IssuesIcon class="flex h-8 w-8 shrink-0 text-red sm:hidden" />
+                <div class="flex gap-2 text-2xl font-bold">{{ errorTitle }}</div>
               </div>
 
               <div
-                v-if="errorTitle === 'Installation error'"
-                class="mt-2 flex flex-col gap-4 sm:flex-row"
+                v-if="errorTitle.toLocaleLowerCase() === 'installation error'"
+                class="font-normal"
               >
-                <ButtonStyled v-if="errorLog">
-                  <button @click="openInstallLog"><FileIcon />Open Installation Log</button>
-                </ButtonStyled>
-                <ButtonStyled>
-                  <button @click="copyServerDebugInfo">
-                    <CopyIcon v-if="!copied" />
-                    <CheckIcon v-else />
-                    Copy Debug Info
-                  </button>
-                </ButtonStyled>
-                <ButtonStyled color="red" type="standard">
-                  <NuxtLink
-                    class="whitespace-pre"
-                    :to="`/servers/manage/${serverId}/options/loader`"
-                  >
-                    <RightArrowIcon />
-                    Change Loader
-                  </NuxtLink>
-                </ButtonStyled>
+                <div
+                  v-if="
+                    errorMessage.toLocaleLowerCase() === 'the specified version may be incorrect'
+                  "
+                >
+                  An invalid loader or Minecraft version was specified and could not be installed.
+                  <ul class="m-0 mt-4 p-0 pl-4">
+                    <li>
+                      If this version of Minecraft was released recently, please check if Modrinth
+                      Servers supports it.
+                    </li>
+                    <li>
+                      If you've installed a modpack, it may have been packaged incorrectly or may
+                      not be compatible with the loader.
+                    </li>
+                    <li>
+                      Your server may need to be reinstalled with a valid mod loader and version.
+                      You can change the loader by clicking the "Change Loader" button.
+                    </li>
+                    <li>
+                      If you're stuck, please contact Modrinth Support with the information below:
+                    </li>
+                  </ul>
+                  <ButtonStyled>
+                    <button class="mt-2" @click="copyServerDebugInfo">
+                      <CopyIcon v-if="!copied" />
+                      <CheckIcon v-else />
+                      Copy Debug Info
+                    </button>
+                  </ButtonStyled>
+                </div>
+                <div v-if="errorMessage.toLocaleLowerCase() === 'internal error'">
+                  An internal error occurred while installing your server. Don't fret — try
+                  reinstalling your server, and if the problem persists, please contact Modrinth
+                  support with your server's debug information.
+                </div>
+                <div
+                  v-if="errorMessage.toLocaleLowerCase() === 'this version is not yet supported'"
+                >
+                  An error occurred while installing your server because Modrinth Servers does not
+                  support the version of Minecraft or the loader you specified. Try reinstalling
+                  your server with a different version or loader, and if the problem persists,
+                  please contact Modrinth Support with your server's debug information.
+                </div>
+
+                <div
+                  v-if="errorTitle === 'Installation error'"
+                  class="mt-2 flex flex-col gap-4 sm:flex-row"
+                >
+                  <ButtonStyled v-if="errorLog">
+                    <button @click="openInstallLog"><FileIcon />Open Installation Log</button>
+                  </ButtonStyled>
+                  <ButtonStyled>
+                    <button @click="copyServerDebugInfo">
+                      <CopyIcon v-if="!copied" />
+                      <CheckIcon v-else />
+                      Copy Debug Info
+                    </button>
+                  </ButtonStyled>
+                  <ButtonStyled color="red" type="standard">
+                    <NuxtLink
+                      class="whitespace-pre"
+                      :to="`/servers/manage/${serverId}/options/loader`"
+                    >
+                      <RightArrowIcon />
+                      Change Loader
+                    </NuxtLink>
+                  </ButtonStyled>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <div
-        v-if="!isConnected && !isReconnecting && !isLoading"
-        data-pyro-server-ws-error
-        class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-red p-4 text-contrast"
-      >
-        <IssuesIcon class="size-5 text-red" />
-        Something went wrong...
-      </div>
+        <div
+          v-if="!isConnected && !isReconnecting && !isLoading"
+          data-pyro-server-ws-error
+          class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-red p-4 text-contrast"
+        >
+          <IssuesIcon class="size-5 text-red" />
+          Something went wrong...
+        </div>
 
-      <div
-        v-if="isReconnecting"
-        data-pyro-server-ws-reconnecting
-        class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-orange p-4 text-sm text-contrast"
-      >
-        <UiServersPanelSpinner />
-        Hang on, we're reconnecting to your server.
-      </div>
+        <div
+          v-if="isReconnecting"
+          data-pyro-server-ws-reconnecting
+          class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-orange p-4 text-sm text-contrast"
+        >
+          <UiServersPanelSpinner />
+          Hang on, we're reconnecting to your server.
+        </div>
 
-      <div
-        v-if="serverData.status === 'installing'"
-        data-pyro-server-installing
-        class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-blue p-4 text-sm text-contrast"
-      >
-        <UiServersServerIcon :image="serverData.image" class="!h-10 !w-10" />
+        <div
+          v-if="serverData.status === 'installing'"
+          data-pyro-server-installing
+          class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-blue p-4 text-sm text-contrast"
+        >
+          <UiServersServerIcon :image="serverData.image" class="!h-10 !w-10" />
 
-        <div class="flex flex-col gap-1">
-          <span class="text-lg font-bold"> We're preparing your server! </span>
-          <div class="flex flex-row items-center gap-2">
-            <UiServersPanelSpinner class="!h-3 !w-3" /> <LazyUiServersInstallingTicker />
+          <div class="flex flex-col gap-1">
+            <span class="text-lg font-bold"> We're preparing your server! </span>
+            <div class="flex flex-row items-center gap-2">
+              <UiServersPanelSpinner class="!h-3 !w-3" /> <LazyUiServersInstallingTicker />
+            </div>
           </div>
         </div>
+        <NuxtPage
+          :route="route"
+          :is-connected="isConnected"
+          :is-ws-auth-incorrect="isWSAuthIncorrect"
+          :is-server-running="isServerRunning"
+          :stats="stats"
+          :server-power-state="serverPowerState"
+          :power-state-details="powerStateDetails"
+          :socket="socket"
+          :server="server"
+          :backup-in-progress="backupInProgress"
+          @reinstall="onReinstall"
+        />
       </div>
-      <NuxtPage
-        :route="route"
-        :is-connected="isConnected"
-        :is-ws-auth-incorrect="isWSAuthIncorrect"
-        :is-server-running="isServerRunning"
-        :stats="stats"
-        :server-power-state="serverPowerState"
-        :power-state-details="powerStateDetails"
-        :socket="socket"
-        :server="server"
-        :backup-in-progress="backupInProgress"
-        @reinstall="onReinstall"
-      />
-    </div>
+    </template>
+  </div>
+  <div
+    v-if="flags.advancedDebugInfo"
+    class="experimental-styles-within relative mx-auto mt-6 box-border w-full min-w-0 max-w-[1280px] px-6"
+  >
+    <h2 class="m-0 text-lg font-extrabold text-contrast">Server data</h2>
+    <pre class="markdown-body w-full overflow-auto rounded-2xl bg-bg-raised p-4 text-sm">{{
+      JSON.stringify(server, null, "  ")
+    }}</pre>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, onUnmounted, watch } from "vue";
+import { ref, computed, onMounted, onUnmounted, watch, type Reactive } from "vue";
 import {
+  SettingsIcon,
   CopyIcon,
   IssuesIcon,
   LeftArrowIcon,
@@ -384,14 +368,23 @@ import {
   LockIcon,
 } from "@modrinth/assets";
 import DOMPurify from "dompurify";
-import { ButtonStyled, ServerNotice } from "@modrinth/ui";
+import { ButtonStyled, ErrorInformationCard, ServerNotice } from "@modrinth/ui";
 import { Intercom, shutdown } from "@intercom/messenger-js-sdk";
-import { reloadNuxtApp, navigateTo } from "#app";
 import type { MessageDescriptor } from "@vintl/vintl";
-import type { ServerState, Stats, WSEvent, WSInstallationResultEvent } from "~/types/servers";
-import { usePyroConsole } from "~/store/console.ts";
-import { type Backup } from "~/composables/pyroServers.ts";
-import { usePyroFetch } from "~/composables/pyroFetch.ts";
+import type {
+  ServerState,
+  Stats,
+  WSEvent,
+  WSInstallationResultEvent,
+  Backup,
+  PowerAction,
+} from "@modrinth/utils";
+import { reloadNuxtApp, navigateTo } from "#app";
+import { useModrinthServersConsole } from "~/store/console.ts";
+import { useServersFetch } from "~/composables/servers/servers-fetch.ts";
+import { ModrinthServer, useModrinthServers } from "~/composables/servers/modrinth-servers.ts";
+import ServerInstallation from "~/components/ui/servers/ServerInstallation.vue";
+import PanelErrorIcon from "~/components/ui/servers/icons/PanelErrorIcon.vue";
 
 const app = useNuxtApp() as unknown as { $notify: any };
 
@@ -401,6 +394,7 @@ const isLoading = ref(true);
 const reconnectInterval = ref<ReturnType<typeof setInterval> | null>(null);
 const isFirstMount = ref(true);
 const isMounted = ref(true);
+const flags = useFeatureFlags();
 
 const INTERCOM_APP_ID = ref("ykeritl9");
 const auth = (await useAuth()) as unknown as {
@@ -417,19 +411,19 @@ const route = useNativeRoute();
 const router = useRouter();
 const serverId = route.params.id as string;
 
-const server = await usePyroServer(serverId, ["general", "ws"]);
+const server: Reactive<ModrinthServer> = await useModrinthServers(serverId, ["general", "ws"]);
 
 const loadModulesPromise = Promise.resolve().then(() => {
   if (server.general?.status === "suspended") {
     return;
   }
-  return server.loadModules(["content", "backups", "network", "startup", "fs"]);
+  return server.refresh(["content", "backups", "network", "startup", "fs"]);
 });
 
 provide("modulesLoaded", loadModulesPromise);
 
 watch(
-  () => [server.general?.error, server.ws?.error],
+  () => [server.moduleErrors?.general, server.moduleErrors?.ws],
   ([generalError, wsError]) => {
     if (server.general?.status === "suspended") return;
 
@@ -447,7 +441,7 @@ const errorLogFile = ref("");
 const serverData = computed(() => server.general);
 const isConnected = ref(false);
 const isWSAuthIncorrect = ref(false);
-const pyroConsole = usePyroConsole();
+const modrinthServersConsole = useModrinthServersConsole();
 const cpuData = ref<number[]>([]);
 const ramData = ref<number[]>([]);
 const isActioning = ref(false);
@@ -621,7 +615,7 @@ const connectWebSocket = () => {
         return;
       }
 
-      pyroConsole.clear();
+      modrinthServersConsole.clear();
       socket.value?.send(JSON.stringify({ event: "auth", jwt: wsAuth.value?.token }));
       isConnected.value = true;
       isReconnecting.value = false;
@@ -629,7 +623,7 @@ const connectWebSocket = () => {
 
       if (firstConnect.value) {
         for (let i = 0; i < initialConsoleMessage.length; i++) {
-          pyroConsole.addLine(initialConsoleMessage[i]);
+          modrinthServersConsole.addLine(initialConsoleMessage[i]);
         }
       }
 
@@ -652,7 +646,9 @@ const connectWebSocket = () => {
 
     socket.value.onclose = () => {
       if (isMounted.value) {
-        pyroConsole.addLine("\nSomething went wrong with the connection, we're reconnecting...");
+        modrinthServersConsole.addLine(
+          "\nSomething went wrong with the connection, we're reconnecting...",
+        );
         isConnected.value = false;
         scheduleReconnect();
       }
@@ -701,7 +697,7 @@ const startUptimeUpdates = () => {
 const stopUptimeUpdates = () => {
   if (uptimeIntervalId) {
     clearInterval(uptimeIntervalId);
-    intervalId = null;
+    pollingIntervalId = null;
   }
 };
 
@@ -710,7 +706,7 @@ const handleWebSocketMessage = (data: WSEvent) => {
     case "log":
       // eslint-disable-next-line no-case-declarations
       const log = data.message.split("\n").filter((l) => l.trim());
-      pyroConsole.addLines(log);
+      modrinthServersConsole.addLines(log);
       break;
     case "stats":
       updateStats(data);
@@ -812,6 +808,10 @@ const newLoaderVersion = ref<string | null>(null);
 const newMCVersion = ref<string | null>(null);
 
 const onReinstall = (potentialArgs: any) => {
+  if (serverData.value?.flows?.intro) {
+    server.general?.endIntro();
+  }
+
   if (!serverData.value) return;
 
   serverData.value.status = "installing";
@@ -967,11 +967,11 @@ const toAdverb = (word: string) => {
   return word + "ing";
 };
 
-const sendPowerAction = async (action: "restart" | "start" | "stop" | "kill") => {
+const sendPowerAction = async (action: PowerAction) => {
   const actionName = action.charAt(0).toUpperCase() + action.slice(1);
   try {
     isActioning.value = true;
-    await server.general?.power(actionName);
+    await server.general?.power(action);
   } catch (error) {
     console.error(`Error ${toAdverb(actionName)} server:`, error);
     notifyError(
@@ -992,7 +992,7 @@ const notifyError = (title: string, text: string) => {
   });
 };
 
-let intervalId: ReturnType<typeof setInterval> | null = null;
+let pollingIntervalId: ReturnType<typeof setInterval> | null = null;
 const countdown = ref(15);
 
 const formattedTime = computed(() => {
@@ -1036,23 +1036,142 @@ const backupInProgress = computed(() => {
 });
 
 const stopPolling = () => {
-  if (intervalId) {
-    clearInterval(intervalId);
-    intervalId = null;
+  if (pollingIntervalId) {
+    clearTimeout(pollingIntervalId);
+    pollingIntervalId = null;
   }
 };
 
 const startPolling = () => {
-  countdown.value = 15;
-  intervalId = setInterval(() => {
-    if (countdown.value <= 0) {
-      reloadNuxtApp();
-    } else {
-      countdown.value--;
+  stopPolling();
+
+  let retryCount = 0;
+  const maxRetries = 10;
+
+  const poll = async () => {
+    try {
+      await server.refresh(["general", "ws"]);
+
+      if (!server.moduleErrors?.general?.error) {
+        stopPolling();
+        connectWebSocket();
+        return;
+      }
+
+      retryCount++;
+      if (retryCount >= maxRetries) {
+        console.error("Max retries reached, stopping polling");
+        stopPolling();
+        return;
+      }
+
+      // Exponential backoff: 3s, 6s, 12s, 24s, etc.
+      const delay = Math.min(3000 * Math.pow(2, retryCount - 1), 60000);
+
+      pollingIntervalId = setTimeout(poll, delay);
+    } catch (error) {
+      console.error("Polling failed:", error);
+      retryCount++;
+
+      if (retryCount < maxRetries) {
+        const delay = Math.min(3000 * Math.pow(2, retryCount - 1), 60000);
+        pollingIntervalId = setTimeout(poll, delay);
+      }
     }
-  }, 1000);
+  };
+
+  poll();
 };
 
+const nodeUnavailableDetails = computed(() => [
+  {
+    label: "Server ID",
+    value: server.serverId,
+    type: "inline" as const,
+  },
+  {
+    label: "Node",
+    value: server.general?.datacenter ?? "Unknown! Please contact support!",
+    type: "inline" as const,
+  },
+]);
+
+const suspendedDescription = computed(() => {
+  if (serverData.value?.suspension_reason === "cancelled") {
+    return "Your subscription has been cancelled.\nContact Modrinth Support if you believe this is an error.";
+  }
+  if (serverData.value?.suspension_reason) {
+    return `Your server has been suspended: ${serverData.value.suspension_reason}\nContact Modrinth Support if you believe this is an error.`;
+  }
+  return "Your server has been suspended.\nContact Modrinth Support if you believe this is an error.";
+});
+
+const generalErrorDetails = computed(() => [
+  {
+    label: "Server ID",
+    value: server.serverId,
+    type: "inline" as const,
+  },
+  {
+    label: "Timestamp",
+    value: String(server.moduleErrors?.general?.timestamp),
+    type: "inline" as const,
+  },
+  {
+    label: "Error Name",
+    value: server.moduleErrors?.general?.error.name,
+    type: "inline" as const,
+  },
+  {
+    label: "Error Message",
+    value: server.moduleErrors?.general?.error.message,
+    type: "block" as const,
+  },
+  ...(server.moduleErrors?.general?.error.originalError
+    ? [
+        {
+          label: "Original Error",
+          value: String(server.moduleErrors.general.error.originalError),
+          type: "hidden" as const,
+        },
+      ]
+    : []),
+  ...(server.moduleErrors?.general?.error.stack
+    ? [
+        {
+          label: "Stack Trace",
+          value: server.moduleErrors.general.error.stack,
+          type: "hidden" as const,
+        },
+      ]
+    : []),
+]);
+
+const suspendedAction = computed(() => ({
+  label: "Go to billing settings",
+  onClick: () => router.push("/settings/billing"),
+  color: "brand" as const,
+}));
+
+const generalErrorAction = computed(() => ({
+  label: "Go back to all servers",
+  onClick: () => router.push("/servers/manage"),
+  color: "brand" as const,
+}));
+
+const nodeUnavailableAction = computed(() => ({
+  label: "Join Modrinth Discord",
+  onClick: () => navigateTo("https://discord.modrinth.com", { external: true }),
+  color: "standard" as const,
+}));
+
+const connectionLostAction = computed(() => ({
+  label: "Reload",
+  onClick: () => reloadNuxtApp(),
+  color: "brand" as const,
+  disabled: formattedTime.value !== "00",
+}));
+
 const copyServerDebugInfo = () => {
   const debugInfo = `Server ID: ${serverData.value?.server_id}\nError: ${errorMessage.value}\nKind: ${serverData.value?.upstream?.kind}\nProject ID: ${serverData.value?.upstream?.project_id}\nVersion ID: ${serverData.value?.upstream?.version_id}\nLog: ${errorLog.value}`;
   navigator.clipboard.writeText(debugInfo);
@@ -1104,7 +1223,7 @@ const cleanup = () => {
 };
 
 async function dismissNotice(noticeId: number) {
-  await usePyroFetch(`servers/${serverId}/notices/${noticeId}/dismiss`, {
+  await useServersFetch(`servers/${serverId}/notices/${noticeId}/dismiss`, {
     method: "POST",
   }).catch((err) => {
     app.$notify({
@@ -1123,14 +1242,18 @@ onMounted(() => {
     isLoading.value = false;
     return;
   }
-  if (server.error) {
-    if (!server.error.message.includes("Forbidden")) {
+  if (server.moduleErrors.general?.error) {
+    if (!server.moduleErrors.general?.error?.message?.includes("Forbidden")) {
       startPolling();
     }
   } else {
     connectWebSocket();
   }
 
+  if (server.general?.flows?.intro && server.general?.project) {
+    server.general?.endIntro();
+  }
+
   if (username.value && email.value && userId.value && createdAt.value) {
     const currentUser = auth.value?.user as any;
     const matches =
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 906ab7022..116019256 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="server.backups?.error"
+    v-if="server.moduleErrors.backups"
     class="flex w-full flex-col items-center justify-center gap-4 p-4"
   >
     <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
@@ -15,7 +15,9 @@
           We couldn't load your server's backups. Here's what went wrong:
         </p>
         <p>
-          <span class="break-all font-mono">{{ JSON.stringify(server.backups.error) }}</span>
+          <span class="break-all font-mono">{{
+            JSON.stringify(server.moduleErrors.backups.error)
+          }}</span>
         </p>
         <ButtonStyled size="large" color="brand" @click="() => server.refresh(['backups'])">
           <button class="mt-6 !w-full">Retry</button>
@@ -152,16 +154,17 @@ import { ButtonStyled, TagItem } from "@modrinth/ui";
 import { useStorage } from "@vueuse/core";
 import { SpinnerIcon, PlusIcon, DownloadIcon, SettingsIcon, IssuesIcon } from "@modrinth/assets";
 import { ref, computed } from "vue";
-import type { Server } from "~/composables/pyroServers";
+import type { Backup } from "@modrinth/utils";
 import BackupItem from "~/components/ui/servers/BackupItem.vue";
 import BackupRenameModal from "~/components/ui/servers/BackupRenameModal.vue";
 import BackupCreateModal from "~/components/ui/servers/BackupCreateModal.vue";
 import BackupRestoreModal from "~/components/ui/servers/BackupRestoreModal.vue";
 import BackupDeleteModal from "~/components/ui/servers/BackupDeleteModal.vue";
 import BackupSettingsModal from "~/components/ui/servers/BackupSettingsModal.vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   isServerRunning: boolean;
 }>();
 
diff --git a/apps/frontend/src/pages/servers/manage/[id]/content.vue b/apps/frontend/src/pages/servers/manage/[id]/content.vue
index 32c9b9fa4..fa287e46a 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/content.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/content.vue
@@ -5,12 +5,12 @@
 </template>
 
 <script setup lang="ts">
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const route = useNativeRoute();
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const data = computed(() => props.server.general);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/content/index.vue b/apps/frontend/src/pages/servers/manage/[id]/content/index.vue
index 7397ff6b9..24d0f58b0 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/content/index.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/content/index.vue
@@ -11,7 +11,7 @@
   />
 
   <div
-    v-if="server.content?.error"
+    v-if="server.moduleErrors.content"
     class="flex w-full flex-col items-center justify-center gap-4 p-4"
   >
     <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
@@ -24,7 +24,9 @@
         </div>
         <p class="text-lg text-secondary">
           We couldn't load your server's {{ type.toLowerCase() }}s. Here's what we know:
-          <span class="break-all font-mono">{{ JSON.stringify(server.content.error) }}</span>
+          <span class="break-all font-mono">{{
+            JSON.stringify(server.moduleErrors.content.error)
+          }}</span>
         </p>
         <ButtonStyled size="large" color="brand" @click="() => server.refresh(['content'])">
           <button class="mt-6 !w-full">Retry</button>
@@ -349,13 +351,14 @@ import {
 } from "@modrinth/assets";
 import { ButtonStyled } from "@modrinth/ui";
 import { ref, computed, watch, onMounted, onUnmounted } from "vue";
+import type { Mod } from "@modrinth/utils";
 import FilesUploadDragAndDrop from "~/components/ui/servers/FilesUploadDragAndDrop.vue";
 import FilesUploadDropdown from "~/components/ui/servers/FilesUploadDropdown.vue";
-import type { Server } from "~/composables/pyroServers";
 import { acceptFileFromProjectType } from "~/helpers/fileUtils.js";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const type = computed(() => {
diff --git a/apps/frontend/src/pages/servers/manage/[id]/files.vue b/apps/frontend/src/pages/servers/manage/[id]/files.vue
index 633d29f45..a1045ce1e 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/files.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/files.vue
@@ -278,16 +278,11 @@ import {
 } from "@modrinth/assets";
 import { computed } from "vue";
 import { ButtonStyled, ProgressBar } from "@modrinth/ui";
-import { formatBytes } from "@modrinth/utils";
-import {
-  type DirectoryResponse,
-  type DirectoryItem,
-  type Server,
-  handleError,
-} from "~/composables/pyroServers.ts";
+import { formatBytes, ModrinthServersFetchError } from "@modrinth/utils";
+import type { FilesystemOp, FSQueuedOp, DirectoryItem, DirectoryResponse } from "@modrinth/utils";
+import { handleError, ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 import FilesUploadDragAndDrop from "~/components/ui/servers/FilesUploadDragAndDrop.vue";
 import FilesUploadDropdown from "~/components/ui/servers/FilesUploadDropdown.vue";
-import type { FilesystemOp, FSQueuedOp } from "~/types/servers.ts";
 import FilesUploadZipUrlModal from "~/components/ui/servers/FilesUploadZipUrlModal.vue";
 import FilesUploadConflictModal from "~/components/ui/servers/FilesUploadConflictModal.vue";
 
@@ -316,7 +311,7 @@ interface RenameOperation extends BaseOperation {
 type Operation = MoveOperation | RenameOperation;
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const modulesLoaded = inject<Promise<void>>("modulesLoaded");
@@ -402,7 +397,7 @@ const fetchDirectoryContents = async (): Promise<DirectoryResponse> => {
     };
   } catch (error) {
     console.error("Error fetching directory contents:", error);
-    if (error instanceof PyroFetchError && error.statusCode === 400) {
+    if (error instanceof ModrinthServersFetchError && error.statusCode === 400) {
       return directoryData.value || { items: [], total: 0 };
     }
     throw error;
@@ -561,7 +556,7 @@ const handleRenameItem = async (newName: string) => {
     });
   } catch (error) {
     console.error("Error renaming item:", error);
-    if (error instanceof PyroFetchError) {
+    if (error instanceof ModrinthServersFetchError) {
       if (error.statusCode === 400) {
         addNotification({
           group: "files",
@@ -719,7 +714,7 @@ const showDeleteModal = (item: any) => {
 
 const handleCreateError = (error: any) => {
   console.error("Error creating item:", error);
-  if (error instanceof PyroFetchError) {
+  if (error instanceof ModrinthServersFetchError) {
     if (error.statusCode === 400) {
       addNotification({
         group: "files",
diff --git a/apps/frontend/src/pages/servers/manage/[id]/index.vue b/apps/frontend/src/pages/servers/manage/[id]/index.vue
index 1b2fd2fbe..459f84005 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/index.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/index.vue
@@ -1,11 +1,7 @@
 <template>
-  <div
-    v-if="isConnected && !isWsAuthIncorrect"
-    class="relative flex select-none flex-col gap-6"
-    data-pyro-server-manager-root
-  >
+  <div class="relative flex select-none flex-col gap-6" data-pyro-server-manager-root>
     <div
-      v-if="inspectingError"
+      v-if="inspectingError && isConnected && !isWsAuthIncorrect"
       data-pyro-servers-inspecting-error
       class="flex justify-between rounded-2xl border-2 border-solid border-red bg-bg-red p-4 font-semibold text-contrast"
     >
@@ -77,26 +73,34 @@
         </ButtonStyled>
       </div>
     </div>
+
     <div class="flex flex-col-reverse gap-6 md:flex-col">
-      <UiServersServerStats :data="stats" />
+      <UiServersServerStats
+        :data="isConnected && !isWsAuthIncorrect ? stats : undefined"
+        :loading="!isConnected || isWsAuthIncorrect"
+      />
+
       <div
         class="relative flex h-[700px] w-full flex-col gap-3 overflow-hidden rounded-2xl border border-divider bg-bg-raised p-4 transition-all duration-300 ease-in-out md:p-8"
+        :class="{ 'border-0': !isConnected || isWsAuthIncorrect }"
       >
         <div class="flex items-center justify-between">
           <div class="flex items-center gap-4">
             <h2 class="m-0 text-3xl font-extrabold text-contrast">Console</h2>
-
-            <UiServersPanelServerStatus :state="serverPowerState" />
+            <UiServersPanelServerStatus
+              v-if="isConnected && !isWsAuthIncorrect"
+              :state="serverPowerState"
+            />
           </div>
         </div>
-        <!-- <div class="flex flex-row items-center gap-2 text-sm font-medium">
-          <InfoIcon class="hidden sm:block" />
-          Click and drag to select lines, then CMD+C to copy
-        </div> -->
-        <UiServersPanelTerminal :full-screen="fullScreen">
+
+        <UiServersPanelTerminal
+          :full-screen="fullScreen"
+          :loading="!isConnected || isWsAuthIncorrect"
+        >
           <div class="relative w-full px-4 pt-4">
             <ul
-              v-if="suggestions.length"
+              v-if="suggestions.length && isConnected && !isWsAuthIncorrect"
               id="command-suggestions"
               ref="suggestionsList"
               class="mt-1 max-h-60 w-full list-none overflow-auto rounded-md border border-divider bg-bg-raised p-0 shadow-lg"
@@ -120,7 +124,7 @@
             </ul>
             <div class="relative flex items-center">
               <span
-                v-if="bestSuggestion"
+                v-if="bestSuggestion && isConnected && !isWsAuthIncorrect"
                 class="pointer-events-none absolute left-[26px] transform select-none text-gray-400"
               >
                 <span class="ml-[23.5px] whitespace-pre">{{
@@ -142,7 +146,7 @@
                 <TerminalSquareIcon class="ml-3 h-5 w-5" />
               </div>
               <input
-                v-if="isServerRunning"
+                v-if="isServerRunning && isConnected && !isWsAuthIncorrect"
                 v-model="commandInput"
                 type="text"
                 placeholder="Send a command"
@@ -168,29 +172,25 @@
         </UiServersPanelTerminal>
       </div>
     </div>
-  </div>
-  <UiServersOverviewLoading v-else-if="!isConnected && !isWsAuthIncorrect" />
-  <div v-else-if="isWsAuthIncorrect" class="flex flex-col">
-    <h2>Could not connect to the server.</h2>
-    <p>
-      An error occurred while attempting to connect to your server. Please try refreshing the page.
-      (WebSocket Authentication Failed)
-    </p>
-  </div>
-  <div v-else class="flex flex-col">
-    <h2>Could not connect to the server.</h2>
-    <p>
-      An error occurred while attempting to connect to your server. Please try refreshing the page.
-      (No further information)
-    </p>
+
+    <div
+      v-if="isWsAuthIncorrect"
+      class="absolute inset-0 flex flex-col items-center justify-center bg-bg"
+    >
+      <h2>Could not connect to the server.</h2>
+      <p>
+        An error occurred while attempting to connect to your server. Please try refreshing the
+        page. (WebSocket Authentication Failed)
+      </p>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import { TerminalSquareIcon, XIcon, IssuesIcon } from "@modrinth/assets";
 import { ButtonStyled } from "@modrinth/ui";
-import type { ServerState, Stats } from "~/types/servers";
-import type { Server } from "~/composables/pyroServers";
+import type { ServerState, Stats } from "@modrinth/utils";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 type ServerProps = {
   socket: WebSocket | null;
@@ -203,7 +203,7 @@ type ServerProps = {
     exit_code?: number;
   };
   isServerRunning: boolean;
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 };
 
 const props = defineProps<ServerProps>();
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options.vue b/apps/frontend/src/pages/servers/manage/[id]/options.vue
index fec9cbd2f..ec4e48582 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options.vue
@@ -17,14 +17,14 @@ import {
   UserIcon,
   WrenchIcon,
 } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
 
 const route = useRoute();
 const serverId = route.params.id as string;
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   backupInProgress?: BackupInProgressReason;
 }>();
 
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/index.vue b/apps/frontend/src/pages/servers/manage/[id]/options/index.vue
index 2c2c61af2..c1c1911c4 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/index.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/index.vue
@@ -114,11 +114,10 @@
 <script setup lang="ts">
 import { EditIcon, TransferIcon } from "@modrinth/assets";
 import ButtonStyled from "@modrinth/ui/src/components/base/ButtonStyled.vue";
-
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const data = computed(() => props.server.general);
@@ -156,26 +155,18 @@ const saveGeneral = async () => {
     if (serverSubdomain.value !== data.value?.net?.domain) {
       try {
         // type shit backend makes me do
-        const response = await props.server.network?.checkSubdomainAvailability(
+        const available = await props.server.network?.checkSubdomainAvailability(
           serverSubdomain.value,
         );
-        if (response === undefined) {
-          throw new Error("Failed to check subdomain availability");
-        }
 
-        if (typeof response === "object" && response !== null && "available" in response) {
-          const typedResponse = response as { available: boolean };
-          if (!typedResponse.available) {
-            addNotification({
-              group: "serverOptions",
-              type: "error",
-              title: "Subdomain not available",
-              text: "The subdomain you entered is already in use.",
-            });
-            return;
-          }
-        } else {
-          throw new Error("Invalid response format from availability check");
+        if (!available) {
+          addNotification({
+            group: "serverOptions",
+            type: "error",
+            title: "Subdomain not available",
+            text: "The subdomain you entered is already in use.",
+          });
+          return;
         }
 
         await props.server.network?.changeSubdomain(serverSubdomain.value);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/info.vue b/apps/frontend/src/pages/servers/manage/[id]/options/info.vue
index d5d9031a8..d888c40fd 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/info.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/info.vue
@@ -117,13 +117,13 @@
 <script setup lang="ts">
 import { ButtonStyled } from "@modrinth/ui";
 import { CopyIcon, ExternalIcon, EyeIcon, EyeOffIcon } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const route = useNativeRoute();
 const serverId = route.params.id as string;
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const data = computed(() => props.server.general);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
index ef45166a7..4420e1afb 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
@@ -1,269 +1,22 @@
 <template>
-  <LazyUiServersPlatformVersionSelectModal
-    ref="versionSelectModal"
+  <ServerInstallation
     :server="props.server"
-    :current-loader="data?.loader as Loaders"
-    :backup-in-progress="backupInProgress"
-    @reinstall="emit('reinstall', $event)"
-  />
-
-  <LazyUiServersPlatformMrpackModal
-    ref="mrpackModal"
-    :server="props.server"
-    @reinstall="emit('reinstall', $event)"
-  />
-
-  <LazyUiServersPlatformChangeModpackVersionModal
-    ref="modpackVersionModal"
-    :server="props.server"
-    :project="data?.project"
-    :versions="Array.isArray(versions) ? versions : []"
-    :current-version="currentVersion"
-    :current-version-id="data?.upstream?.version_id"
-    :server-status="data?.status"
+    :backup-in-progress="props.backupInProgress"
     @reinstall="emit('reinstall')"
   />
-
-  <div class="flex h-full w-full flex-col">
-    <div v-if="data && versions" class="flex w-full flex-col">
-      <div class="card flex flex-col gap-4">
-        <div class="flex select-none flex-col items-center justify-between gap-2 lg:flex-row">
-          <div class="flex flex-row items-center gap-2">
-            <h2 class="m-0 text-lg font-bold text-contrast">Modpack</h2>
-            <div
-              v-if="updateAvailable"
-              class="rounded-full bg-bg-orange px-2 py-1 text-xs font-medium text-orange"
-            >
-              <span>Update available</span>
-            </div>
-          </div>
-          <div v-if="data.upstream" class="flex gap-4">
-            <ButtonStyled>
-              <button
-                class="!w-full sm:!w-auto"
-                :disabled="isInstalling"
-                @click="mrpackModal.show()"
-              >
-                <UploadIcon class="size-4" /> Import .mrpack
-              </button>
-            </ButtonStyled>
-            <!-- dumb hack to make a button link not a link -->
-            <ButtonStyled>
-              <template v-if="isInstalling">
-                <button :disabled="isInstalling">
-                  <TransferIcon class="size-4" />
-                  Switch modpack
-                </button>
-              </template>
-              <nuxt-link v-else :to="`/modpacks?sid=${props.server.serverId}`">
-                <TransferIcon class="size-4" />
-                Switch modpack
-              </nuxt-link>
-            </ButtonStyled>
-          </div>
-        </div>
-        <div v-if="data.upstream" class="flex flex-col gap-2">
-          <div
-            v-if="versionsError || currentVersionError"
-            class="rounded-2xl border border-solid border-red p-4 text-contrast"
-          >
-            <p class="m-0 font-bold">Something went wrong while loading your modpack.</p>
-            <p class="m-0 mb-2 mt-1 text-sm">
-              {{ versionsError || currentVersionError }}
-            </p>
-            <ButtonStyled>
-              <button :disabled="isInstalling" @click="refreshData">Retry</button>
-            </ButtonStyled>
-          </div>
-
-          <NewProjectCard
-            v-if="!versionsError && !currentVersionError"
-            class="!cursor-default !bg-bg !filter-none"
-            :project="projectCardData"
-            :categories="data.project?.categories || []"
-          >
-            <template #actions>
-              <ButtonStyled color="brand">
-                <button :disabled="isInstalling" @click="modpackVersionModal.show()">
-                  <SettingsIcon class="size-4" />
-                  Change version
-                </button>
-              </ButtonStyled>
-            </template>
-          </NewProjectCard>
-        </div>
-        <div v-else class="flex w-full flex-col items-center gap-2 sm:w-fit sm:flex-row">
-          <ButtonStyled>
-            <nuxt-link
-              v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
-              :class="{ disabled: backupInProgress }"
-              class="!w-full sm:!w-auto"
-              :to="`/modpacks?sid=${props.server.serverId}`"
-            >
-              <CompassIcon class="size-4" /> Find a modpack
-            </nuxt-link>
-          </ButtonStyled>
-          <span class="hidden sm:block">or</span>
-          <ButtonStyled>
-            <button
-              v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
-              :disabled="!!backupInProgress"
-              class="!w-full sm:!w-auto"
-              @click="mrpackModal.show()"
-            >
-              <UploadIcon class="size-4" /> Upload .mrpack file
-            </button>
-          </ButtonStyled>
-        </div>
-      </div>
-
-      <div class="card flex flex-col gap-4">
-        <div class="flex flex-col gap-2">
-          <h2 class="m-0 text-lg font-bold text-contrast">Platform</h2>
-          <p class="m-0">Your server's platform is the software that runs mods and plugins.</p>
-          <div v-if="data.upstream" class="mt-2 flex items-center gap-2">
-            <InfoIcon class="hidden sm:block" />
-            <span class="text-sm text-secondary">
-              The current platform was automatically selected based on your modpack.
-            </span>
-          </div>
-        </div>
-        <div
-          class="flex w-full flex-col gap-1 rounded-2xl"
-          :class="{
-            'pointer-events-none cursor-not-allowed select-none opacity-50':
-              props.server.general?.status === 'installing',
-          }"
-          :tabindex="props.server.general?.status === 'installing' ? -1 : 0"
-        >
-          <UiServersLoaderSelector
-            :data="data"
-            :is-installing="isInstalling"
-            @select-loader="selectLoader"
-          />
-        </div>
-      </div>
-    </div>
-
-    <div v-else />
-  </div>
 </template>
 
 <script setup lang="ts">
-import { ButtonStyled, NewProjectCard } from "@modrinth/ui";
-import { TransferIcon, UploadIcon, InfoIcon, CompassIcon, SettingsIcon } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
-import type { Loaders } from "~/types/servers";
 import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
-
-const { formatMessage } = useVIntl();
+import ServerInstallation from "~/components/ui/servers/ServerInstallation.vue";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
   backupInProgress?: BackupInProgressReason;
 }>();
 
 const emit = defineEmits<{
   reinstall: [any?];
 }>();
-
-const isInstalling = computed(() => props.server.general?.status === "installing");
-
-const versionSelectModal = ref();
-const mrpackModal = ref();
-const modpackVersionModal = ref();
-
-const data = computed(() => props.server.general);
-
-const {
-  data: versions,
-  error: versionsError,
-  refresh: refreshVersions,
-} = await useAsyncData(
-  `content-loader-versions-${data.value?.upstream?.project_id}`,
-  async () => {
-    if (!data.value?.upstream?.project_id) return [];
-    try {
-      const result = await useBaseFetch(`project/${data.value.upstream.project_id}/version`);
-      return result || [];
-    } catch (e) {
-      console.error("couldnt fetch all versions:", e);
-      throw new Error("Failed to load modpack versions.");
-    }
-  },
-  { default: () => [] },
-);
-
-const {
-  data: currentVersion,
-  error: currentVersionError,
-  refresh: refreshCurrentVersion,
-} = await useAsyncData(
-  `content-loader-version-${data.value?.upstream?.version_id}`,
-  async () => {
-    if (!data.value?.upstream?.version_id) return null;
-    try {
-      const result = await useBaseFetch(`version/${data.value.upstream.version_id}`);
-      return result || null;
-    } catch (e) {
-      console.error("couldnt fetch version:", e);
-      throw new Error("Failed to load modpack version.");
-    }
-  },
-  { default: () => null },
-);
-
-const projectCardData = computed(() => ({
-  icon_url: data.value?.project?.icon_url,
-  title: data.value?.project?.title,
-  description: data.value?.project?.description,
-  downloads: data.value?.project?.downloads,
-  follows: data.value?.project?.followers,
-  // @ts-ignore
-  date_modified: currentVersion.value?.date_published || data.value?.project?.updated,
-}));
-
-const selectLoader = (loader: string) => {
-  versionSelectModal.value?.show(loader as Loaders);
-};
-
-const refreshData = async () => {
-  await Promise.all([refreshVersions(), refreshCurrentVersion()]);
-};
-
-const updateAvailable = computed(() => {
-  // so sorry
-  // @ts-ignore
-  if (!data.value?.upstream || !versions.value?.length || !currentVersion.value) {
-    return false;
-  }
-
-  // @ts-ignore
-  const latestVersion = versions.value[0];
-  // @ts-ignore
-  return latestVersion.id !== currentVersion.value.id;
-});
-
-watch(
-  () => props.server.general?.status,
-  async (newStatus, oldStatus) => {
-    if (oldStatus === "installing" && newStatus === "available") {
-      await Promise.all([
-        refreshVersions(),
-        refreshCurrentVersion(),
-        props.server.refresh(["general"]),
-      ]);
-    }
-  },
-);
 </script>
-
-<style scoped>
-.stylized-toggle:checked::after {
-  background: var(--color-accent-contrast) !important;
-}
-
-.button-base:active {
-  scale: none !important;
-}
-</style>
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/network.vue b/apps/frontend/src/pages/servers/manage/[id]/options/network.vue
index c364b1f34..21dcb1bcb 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/network.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/network.vue
@@ -60,7 +60,7 @@
 
     <div class="relative h-full w-full overflow-y-auto">
       <div
-        v-if="server.network?.error"
+        v-if="server.moduleErrors.network"
         class="flex w-full flex-col items-center justify-center gap-4 p-4"
       >
         <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
@@ -73,7 +73,9 @@
             </div>
             <p class="text-lg text-secondary">
               We couldn't load your server's network settings. Here's what we know:
-              <span class="break-all font-mono">{{ JSON.stringify(server.network.error) }}</span>
+              <span class="break-all font-mono">{{
+                JSON.stringify(server.moduleErrors.network.error)
+              }}</span>
             </p>
             <ButtonStyled size="large" color="brand" @click="() => server.refresh(['network'])">
               <button class="mt-6 !w-full">Retry</button>
@@ -273,10 +275,10 @@ import {
 } from "@modrinth/assets";
 import { ButtonStyled, NewModal, ConfirmModal } from "@modrinth/ui";
 import { ref, computed, nextTick } from "vue";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const isUpdating = ref(false);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/preferences.vue b/apps/frontend/src/pages/servers/manage/[id]/options/preferences.vue
index 83dec554d..c739e01c2 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/preferences.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/preferences.vue
@@ -43,13 +43,13 @@
 
 <script setup lang="ts">
 import { useStorage } from "@vueuse/core";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const route = useNativeRoute();
 const serverId = route.params.id as string;
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const preferences = {
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue b/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue
index e207f493a..c8b3227a8 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/properties.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="relative h-full w-full select-none overflow-y-auto">
-    <div v-if="server.fs?.error" class="flex w-full flex-col items-center justify-center gap-4 p-4">
+    <div
+      v-if="server.moduleErrors.fs"
+      class="flex w-full flex-col items-center justify-center gap-4 p-4"
+    >
       <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
         <div class="flex flex-col items-center text-center">
           <div class="flex flex-col items-center gap-4">
@@ -11,7 +14,9 @@
           </div>
           <p class="text-lg text-secondary">
             We couldn't access your server's properties. Here's what we know:
-            <span class="break-all font-mono">{{ JSON.stringify(server.fs.error) }}</span>
+            <span class="break-all font-mono">{{
+              JSON.stringify(server.moduleErrors.fs.error)
+            }}</span>
           </p>
           <ButtonStyled size="large" color="brand" @click="() => server.refresh(['fs'])">
             <button class="mt-6 !w-full">Retry</button>
@@ -141,10 +146,10 @@
 import { ref, watch, computed, inject } from "vue";
 import { EyeIcon, SearchIcon, IssuesIcon } from "@modrinth/assets";
 import Fuse from "fuse.js";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const tags = useTags();
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
index 99fc09ca5..bd9a7edd4 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative h-full w-full">
     <div
-      v-if="server.startup?.error"
+      v-if="server.moduleErrors.startup"
       class="flex w-full flex-col items-center justify-center gap-4 p-4"
     >
       <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
@@ -16,7 +16,9 @@
             We couldn't load your server's startup settings. Here's what we know:
           </p>
           <p>
-            <span class="break-all font-mono">{{ JSON.stringify(server.startup.error) }}</span>
+            <span class="break-all font-mono">{{
+              JSON.stringify(server.moduleErrors.startup.error)
+            }}</span>
           </p>
           <ButtonStyled size="large" color="brand" @click="() => server.refresh(['startup'])">
             <button class="mt-6 !w-full">Retry</button>
@@ -112,10 +114,10 @@
 <script setup lang="ts">
 import { UpdatedIcon, IssuesIcon } from "@modrinth/assets";
 import { ButtonStyled } from "@modrinth/ui";
-import type { Server } from "~/composables/pyroServers";
+import { ModrinthServer } from "~/composables/servers/modrinth-servers.ts";
 
 const props = defineProps<{
-  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  server: ModrinthServer;
 }>();
 
 const data = computed(() => props.server.general);
diff --git a/apps/frontend/src/pages/servers/manage/index.vue b/apps/frontend/src/pages/servers/manage/index.vue
index 32b69676f..7b9c99df0 100644
--- a/apps/frontend/src/pages/servers/manage/index.vue
+++ b/apps/frontend/src/pages/servers/manage/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     data-pyro-server-list-root
-    class="experimental-styles-within relative mx-auto flex min-h-screen w-full max-w-[1280px] flex-col px-6"
+    class="experimental-styles-within relative mx-auto mb-6 flex min-h-screen w-full max-w-[1280px] flex-col px-6"
   >
     <div
       v-if="hasError || fetchError"
@@ -36,7 +36,7 @@
             <li v-if="fetchError" class="text-red">
               <p>Error details:</p>
               <UiCopyCode
-                :text="(fetchError as PyroFetchError).message || 'Unknown error'"
+                :text="(fetchError as ModrinthServersFetchError).message || 'Unknown error'"
                 :copyable="false"
                 :selectable="false"
                 :language="'json'"
@@ -89,7 +89,10 @@
         </div>
       </div>
 
-      <ul v-if="filteredData.length > 0" class="m-0 flex flex-col gap-4 p-0">
+      <ul
+        v-if="filteredData.length > 0 || isPollingForNewServers"
+        class="m-0 flex flex-col gap-4 p-0"
+      >
         <UiServersServerListing
           v-for="server in filteredData"
           :key="server.server_id"
@@ -102,6 +105,7 @@
           :mc_version="server.mc_version"
           :upstream="server.upstream"
           :net="server.net"
+          :flows="server.flows"
         />
         <LazyUiServersServerListingSkeleton v-if="isPollingForNewServers" />
       </ul>
@@ -117,9 +121,9 @@ import { ref, computed, onMounted, onUnmounted, watch } from "vue";
 import Fuse from "fuse.js";
 import { HammerIcon, PlusIcon, SearchIcon } from "@modrinth/assets";
 import { ButtonStyled } from "@modrinth/ui";
+import type { Server, ModrinthServersFetchError } from "@modrinth/utils";
 import { reloadNuxtApp } from "#app";
-import type { PyroFetchError } from "~/composables/pyroFetch";
-import type { Server } from "~/types/servers";
+import { useServersFetch } from "~/composables/servers/servers-fetch.ts";
 
 definePageMeta({
   middleware: "auth",
@@ -133,6 +137,7 @@ interface ServerResponse {
   servers: Server[];
 }
 
+const router = useRouter();
 const route = useRoute();
 const hasError = ref(false);
 const isPollingForNewServers = ref(false);
@@ -141,7 +146,9 @@ const {
   data: serverResponse,
   error: fetchError,
   refresh,
-} = await useAsyncData<ServerResponse>("ServerList", () => usePyroFetch<ServerResponse>("servers"));
+} = await useAsyncData<ServerResponse>("ServerList", () =>
+  useServersFetch<ServerResponse>("servers"),
+);
 
 watch([fetchError, serverResponse], ([error, response]) => {
   hasError.value = !!error || !response;
@@ -163,11 +170,19 @@ const fuse = computed(() => {
   });
 });
 
+function introToTop(array: Server[]): Server[] {
+  return array.slice().sort((a, b) => {
+    return Number(b.flows?.intro) - Number(a.flows?.intro);
+  });
+}
+
 const filteredData = computed(() => {
   if (!searchInput.value.trim()) {
-    return serverList.value;
+    return introToTop(serverList.value);
   }
-  return fuse.value ? fuse.value.search(searchInput.value).map((result) => result.item) : [];
+  return fuse.value
+    ? introToTop(fuse.value.search(searchInput.value).map((result) => result.item))
+    : [];
 });
 
 const previousServerList = ref<Server[]>([]);
@@ -179,6 +194,7 @@ const checkForNewServers = async () => {
   if (JSON.stringify(previousServerList.value) !== JSON.stringify(serverList.value)) {
     isPollingForNewServers.value = false;
     clearInterval(intervalId);
+    router.replace({ query: {} });
   } else if (refreshCount.value >= 5) {
     isPollingForNewServers.value = false;
     clearInterval(intervalId);
diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue
index 4b3fc7a86..96ace83c5 100644
--- a/apps/frontend/src/pages/settings/billing/index.vue
+++ b/apps/frontend/src/pages/settings/billing/index.vue
@@ -330,8 +330,7 @@
                     <ButtonStyled
                       v-if="
                         getPyroCharge(subscription) &&
-                        getPyroCharge(subscription).status !== 'cancelled' &&
-                        getPyroCharge(subscription).status !== 'failed'
+                        getPyroCharge(subscription).status !== 'cancelled'
                       "
                     >
                       <button @click="showCancellationSurvey(subscription)">
@@ -444,39 +443,13 @@
       :return-url="`${config.public.siteUrl}/servers/manage`"
       :server-name="`${auth?.user?.username}'s server`"
     />
-    <NewModal ref="addPaymentMethodModal">
-      <template #title>
-        <span class="text-lg font-extrabold text-contrast">
-          {{ formatMessage(messages.paymentMethodTitle) }}
-        </span>
-      </template>
-      <div class="min-h-[16rem] md:w-[600px]">
-        <div
-          v-show="loadingPaymentMethodModal !== 2"
-          class="flex min-h-[16rem] items-center justify-center"
-        >
-          <AnimatedLogo class="w-[80px]" />
-        </div>
-        <div v-show="loadingPaymentMethodModal === 2" class="min-h-[16rem] p-1">
-          <div id="address-element"></div>
-          <div id="payment-element" class="mt-4"></div>
-        </div>
-        <div v-show="loadingPaymentMethodModal === 2" class="input-group mt-auto pt-4">
-          <ButtonStyled color="brand">
-            <button :disabled="loadingAddMethod" @click="submit">
-              <PlusIcon />
-              {{ formatMessage(messages.paymentMethodAdd) }}
-            </button>
-          </ButtonStyled>
-          <ButtonStyled>
-            <button @click="$refs.addPaymentMethodModal.hide()">
-              <XIcon />
-              {{ formatMessage(commonMessages.cancelButton) }}
-            </button>
-          </ButtonStyled>
-        </div>
-      </div>
-    </NewModal>
+    <AddPaymentMethodModal
+      ref="addPaymentMethodModal"
+      :publishable-key="config.public.stripePublishableKey"
+      :return-url="`${config.public.siteUrl}/settings/billing`"
+      :create-setup-intent="createSetupIntent"
+      :on-error="handleError"
+    />
     <div class="header__row">
       <div class="header__title">
         <h2 class="text-2xl">{{ formatMessage(messages.paymentMethodTitle) }}</h2>
@@ -590,9 +563,8 @@
 <script setup>
 import {
   ConfirmModal,
-  NewModal,
+  AddPaymentMethodModal,
   OverflowMenu,
-  AnimatedLogo,
   PurchaseModal,
   ButtonStyled,
   CopyCode,
@@ -617,8 +589,9 @@ import {
   UpdatedIcon,
   HistoryIcon,
 } from "@modrinth/assets";
-import { calculateSavings, formatPrice, createStripeElements, getCurrency } from "@modrinth/utils";
+import { calculateSavings, formatPrice, getCurrency } from "@modrinth/utils";
 import { ref, computed } from "vue";
+import { useServersFetch } from "~/composables/servers/servers-fetch.ts";
 import { products } from "~/generated/state.json";
 
 definePageMeta({
@@ -754,19 +727,6 @@ const paymentMethodTypes = defineMessages({
   },
 });
 
-let stripe = null;
-let elements = null;
-
-function loadStripe() {
-  try {
-    if (!stripe) {
-      stripe = Stripe(config.public.stripePublishableKey);
-    }
-  } catch (error) {
-    console.error("Error loading Stripe:", error);
-  }
-}
-
 const [
   { data: paymentMethods, refresh: refreshPaymentMethods },
   { data: charges, refresh: refreshCharges },
@@ -784,7 +744,7 @@ const [
     useBaseFetch("billing/subscriptions", { internal: true }),
   ),
   useAsyncData("billing/products", () => useBaseFetch("billing/products", { internal: true })),
-  useAsyncData("servers", () => usePyroFetch("servers")),
+  useAsyncData("servers", () => useServersFetch("servers")),
 ]);
 
 const midasProduct = ref(products.find((x) => x.metadata?.type === "midas"));
@@ -842,69 +802,16 @@ const primaryPaymentMethodId = computed(() => {
 });
 
 const addPaymentMethodModal = ref();
-const loadingPaymentMethodModal = ref(0);
-async function addPaymentMethod() {
-  try {
-    loadingPaymentMethodModal.value = 0;
-    addPaymentMethodModal.value.show();
 
-    const result = await useBaseFetch("billing/payment_method", {
-      internal: true,
-      method: "POST",
-    });
-
-    loadStripe();
-    const {
-      elements: elementsVal,
-      addressElement,
-      paymentElement,
-    } = createStripeElements(stripe, paymentMethods.value, {
-      clientSecret: result.client_secret,
-    });
-
-    elements = elementsVal;
-    paymentElement.on("ready", () => {
-      loadingPaymentMethodModal.value += 1;
-    });
-    addressElement.on("ready", () => {
-      loadingPaymentMethodModal.value += 1;
-    });
-  } catch (err) {
-    data.$notify({
-      group: "main",
-      title: "An error occurred",
-      text: err.data ? err.data.description : err,
-      type: "error",
-    });
-  }
+function addPaymentMethod() {
+  addPaymentMethodModal.value.show(paymentMethods.value);
 }
 
-const loadingAddMethod = ref(false);
-async function submit() {
-  startLoading();
-  loadingAddMethod.value = true;
-
-  loadStripe();
-  const { error } = await stripe.confirmSetup({
-    elements,
-    confirmParams: {
-      return_url: `${config.public.siteUrl}/settings/billing`,
-    },
+async function createSetupIntent() {
+  return await useBaseFetch("billing/payment_method", {
+    internal: true,
+    method: "POST",
   });
-
-  if (error && error.type !== "validation_error") {
-    data.$notify({
-      group: "main",
-      title: "An error occurred",
-      text: error.message,
-      type: "error",
-    });
-  } else if (!error) {
-    await refresh();
-    addPaymentMethodModal.value.close();
-  }
-  loadingAddMethod.value = false;
-  stopLoading();
 }
 
 const removePaymentMethodIndex = ref();
@@ -1077,7 +984,7 @@ async function fetchCapacityStatuses(serverId, product) {
   if (product) {
     try {
       return {
-        custom: await usePyroFetch(`servers/${serverId}/upgrade-stock`, {
+        custom: await useServersFetch(`servers/${serverId}/upgrade-stock`, {
           method: "POST",
           body: {
             cpu: product.metadata.cpu,
diff --git a/apps/frontend/src/pages/settings/pats.vue b/apps/frontend/src/pages/settings/pats.vue
index a8f67019c..56b0397ef 100644
--- a/apps/frontend/src/pages/settings/pats.vue
+++ b/apps/frontend/src/pages/settings/pats.vue
@@ -205,6 +205,7 @@
 import { PlusIcon, XIcon, TrashIcon, EditIcon, SaveIcon } from "@modrinth/assets";
 import {
   Checkbox,
+  CopyCode,
   ConfirmModal,
   commonSettingsMessages,
   commonMessages,
@@ -219,7 +220,6 @@ import {
   getScopeValue,
 } from "~/composables/auth/scopes.ts";
 
-import CopyCode from "~/components/ui/CopyCode.vue";
 import Modal from "~/components/ui/Modal.vue";
 
 const { formatMessage } = useVIntl();
diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue
index 89b859de6..ec8beeef2 100644
--- a/apps/frontend/src/pages/user/[id].vue
+++ b/apps/frontend/src/pages/user/[id].vue
@@ -303,7 +303,7 @@
           <h2 class="text-lg text-contrast">{{ formatMessage(messages.profileOrganizations) }}</h2>
           <div class="flex flex-wrap gap-2">
             <nuxt-link
-              v-for="org in organizations"
+              v-for="org in sortedOrgs"
               :key="org.id"
               v-tooltip="org.name"
               class="organization"
@@ -355,6 +355,7 @@ import {
   GlobeIcon,
 } from "@modrinth/assets";
 import {
+  Avatar,
   OverflowMenu,
   ButtonStyled,
   ContentPageHeader,
@@ -377,7 +378,6 @@ import BetaTesterBadge from "~/assets/images/badges/beta-tester.svg?component";
 
 import UpToDate from "~/assets/images/illustrations/up_to_date.svg?component";
 import ModalCreation from "~/components/ui/ModalCreation.vue";
-import Avatar from "~/components/ui/Avatar.vue";
 import CollectionCreateModal from "~/components/ui/CollectionCreateModal.vue";
 // import AdPlaceholder from "~/components/ui/AdPlaceholder.vue";
 
@@ -516,6 +516,8 @@ try {
   });
 }
 
+const sortedOrgs = computed(() => organizations.value.sort((a, b) => a.name.localeCompare(b.name)));
+
 if (!user.value) {
   throw createError({
     fatal: true,
diff --git a/apps/frontend/src/store/console.ts b/apps/frontend/src/store/console.ts
index 387fb4c63..cc452d19c 100644
--- a/apps/frontend/src/store/console.ts
+++ b/apps/frontend/src/store/console.ts
@@ -18,7 +18,7 @@ const initialBatchSize = 256;
  * @property {function(string): void} addConsoleOutput - Method to add a new console output line
  * @property {function(): void} clear - Method to clear all console output
  */
-export const usePyroConsole = createGlobalState(() => {
+export const useModrinthServersConsole = createGlobalState(() => {
   /**
    * Reactive array storing console output lines
    * @type {Ref<string[]>}
diff --git a/apps/frontend/src/types/servers.ts b/apps/frontend/src/types/servers.ts
deleted file mode 100644
index 6131b6ac1..000000000
--- a/apps/frontend/src/types/servers.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-// export interface Mod {
-//   id: string;
-//   filename: string;
-//   modrinth_ids: {
-//     project_id: string;
-//     version_id: string;
-//   };
-// }
-
-interface License {
-  id: string;
-  name: string;
-  url: string;
-}
-
-interface DonationUrl {
-  id: string;
-  platform: string;
-  url: string;
-}
-
-interface GalleryItem {
-  url: string;
-  featured: boolean;
-  title: string;
-  description: string;
-  created: string;
-  ordering: number;
-}
-
-export interface Project {
-  slug: string;
-  title: string;
-  description: string;
-  categories: string[];
-  client_side: "required" | "optional";
-  server_side: "required" | "optional";
-  body: string;
-  status: "approved" | "pending" | "rejected";
-  requested_status: "approved" | "pending" | "rejected";
-  additional_categories: string[];
-  issues_url: string;
-  source_url: string;
-  wiki_url: string;
-  discord_url: string;
-  donation_urls: DonationUrl[];
-  project_type: "mod" | "resourcepack" | "map" | "plugin";
-  downloads: number;
-  icon_url: string;
-  color: number;
-  thread_id: string;
-  monetization_status: "monetized" | "non-monetized";
-  id: string;
-  team: string;
-  body_url: string | null;
-  moderator_message: string | null;
-  published: string;
-  updated: string;
-  approved: string;
-  queued: string;
-  followers: number;
-  license: License;
-  versions: string[];
-  game_versions: string[];
-  loaders: string[];
-  gallery: GalleryItem[];
-}
-
-export interface ServerBackup {
-  id: string;
-  name: string;
-  created_at: string;
-}
-
-export interface Allocation {
-  name: string;
-  port: number;
-}
-
-export interface Server {
-  server_id: string;
-  name: string;
-  status: string;
-  net: {
-    ip: string;
-    port: number;
-    domain: string;
-    allocations: Allocation[];
-  };
-  game: string;
-  loader: string | null;
-  loader_version: string | null;
-  mc_version: string | null;
-  backup_quota: number;
-  used_backup_quota: number;
-  backups: ServerBackup[];
-  mods: Mod[];
-  project: Project | null;
-  suspension_reason: string | null;
-  image: string | null;
-  upstream?: {
-    kind: "modpack";
-    project_id: string;
-    version_id: string;
-  };
-  motd: string;
-}
-
-export interface Stats {
-  current: {
-    cpu_percent: number;
-    ram_usage_bytes: number;
-    ram_total_bytes: number;
-    storage_usage_bytes: number;
-    storage_total_bytes: number;
-  };
-  past: {
-    cpu_percent: number;
-    ram_usage_bytes: number;
-    ram_total_bytes: number;
-    storage_usage_bytes: number;
-    storage_total_bytes: number;
-  };
-  graph: {
-    cpu: number[];
-    ram: number[];
-  };
-}
-
-export interface WSAuth {
-  url: string;
-  token: string;
-}
-
-export type ServerState = "running" | "stopped" | "crashed";
-// export type WebsocketEventType =
-//   | "log"
-//   | "auth"
-//   | "stats"
-//   | "power-state"
-//   | "auth-expiring"
-//   | "auth-incorrect"
-//   | "installation-result"
-//   | (string & {});
-
-// export interface WSEvent {
-//   event: WebsocketEventType;
-//   message: string;
-//   state: ServerState;
-// }
-
-export type Loaders =
-  | "Fabric"
-  | "Quilt"
-  | "Forge"
-  | "NeoForge"
-  | "Paper"
-  | "Spigot"
-  | "Bukkit"
-  | "Vanilla"
-  | "Purpur";
-
-export interface WSLogEvent {
-  event: "log";
-  message: string;
-}
-
-type CurrentStats = Stats["current"];
-
-export interface WSStatsEvent extends CurrentStats {
-  event: "stats";
-}
-
-export interface WSAuthExpiringEvent {
-  event: "auth-expiring";
-}
-
-export interface WSPowerStateEvent {
-  event: "power-state";
-  state: ServerState;
-  // if state "crashed"
-  oom_killed?: boolean;
-  exit_code?: number;
-}
-
-export interface WSAuthIncorrectEvent {
-  event: "auth-incorrect";
-}
-
-export interface WSInstallationResultOkEvent {
-  event: "installation-result";
-  result: "ok";
-}
-
-export interface WSInstallationResultErrEvent {
-  event: "installation-result";
-  result: "err";
-  reason: string;
-}
-export type WSInstallationResultEvent = WSInstallationResultOkEvent | WSInstallationResultErrEvent;
-
-export interface WSAuthOkEvent {
-  event: "auth-ok";
-}
-
-export interface WSUptimeEvent {
-  event: "uptime";
-  uptime: number; // seconds
-}
-
-export interface WSNewModEvent {
-  event: "new-mod";
-}
-
-export type WSBackupTask = "file" | "create" | "restore";
-export type WSBackupState = "ongoing" | "done" | "failed" | "cancelled" | "unchanged";
-
-export interface WSBackupProgressEvent {
-  event: "backup-progress";
-  task: WSBackupTask;
-  id: string;
-  progress: number; // percentage
-  state: WSBackupState;
-  ready: boolean;
-}
-
-export type FSQueuedOpUnarchive = {
-  op: "unarchive";
-  src: string;
-};
-
-export type FSQueuedOp = FSQueuedOpUnarchive;
-
-export type FSOpUnarchive = {
-  op: "unarchive";
-  progress: number; // Note: 1 does not mean it's done
-  id: string; // UUID
-
-  mime: string;
-  src: string;
-  state:
-    | "queued"
-    | "ongoing"
-    | "cancelled"
-    | "done"
-    | "failed-corrupted"
-    | "failed-invalid-path"
-    | "failed-cf-no-serverpack"
-    | "failed-cf-not-available"
-    | "failed-not-reachable";
-
-  current_file: string | null;
-  failed_path?: string;
-  bytes_processed: number;
-  files_processed: number;
-  started: string;
-};
-
-export type FilesystemOp = FSOpUnarchive;
-
-export interface WSFilesystemOpsEvent {
-  event: "filesystem-ops";
-  all: FilesystemOp[];
-}
-
-export type WSEvent =
-  | WSLogEvent
-  | WSStatsEvent
-  | WSPowerStateEvent
-  | WSAuthExpiringEvent
-  | WSAuthIncorrectEvent
-  | WSInstallationResultEvent
-  | WSAuthOkEvent
-  | WSUptimeEvent
-  | WSNewModEvent
-  | WSBackupProgressEvent
-  | WSFilesystemOpsEvent;
-
-export interface Servers {
-  servers: Server[];
-}
diff --git a/apps/frontend/src/utils/fetch-helpers.ts b/apps/frontend/src/utils/fetch-helpers.ts
new file mode 100644
index 000000000..81c5e88d2
--- /dev/null
+++ b/apps/frontend/src/utils/fetch-helpers.ts
@@ -0,0 +1,26 @@
+function segmentData<T>(data: T[], segmentSize: number): T[][] {
+  return data.reduce((acc: T[][], curr, index) => {
+    const segment = Math.floor(index / segmentSize);
+
+    if (!acc[segment]) {
+      acc[segment] = [];
+    }
+    acc[segment].push(curr);
+    return acc;
+  }, []);
+}
+
+export function fetchSegmented<T>(
+  data: T[],
+  createUrl: (ids: T[]) => string,
+  options = {},
+  segmentSize = 800,
+): Promise<any> {
+  return Promise.all(
+    segmentData(data, segmentSize).map((ids) => useBaseFetch(createUrl(ids), options)),
+  ).then((results) => results.flat());
+}
+
+export function asEncodedJsonArray<T>(data: T[]): string {
+  return encodeURIComponent(JSON.stringify(data));
+}
diff --git a/apps/labrinth/.env.example b/apps/labrinth/.env.local
similarity index 90%
rename from apps/labrinth/.env.example
rename to apps/labrinth/.env.local
index 1fbb8eebd..880ac9385 100644
--- a/apps/labrinth/.env.example
+++ b/apps/labrinth/.env.local
@@ -2,8 +2,9 @@ DEBUG=true
 RUST_LOG=info,sqlx::query=warn
 SENTRY_DSN=none
 
-SITE_URL=https://modrinth.com
-CDN_URL=https://staging-cdn.modrinth.com
+SITE_URL=http://localhost:3000
+# This CDN URL matches the local storage backend set below, which uses MOCK_FILE_PATH
+CDN_URL=file:///tmp/modrinth
 LABRINTH_ADMIN_KEY=feedbeef
 RATE_LIMIT_IGNORE_KEY=feedbeef
 
@@ -25,7 +26,6 @@ PUBLIC_DISCORD_WEBHOOK=
 CLOUDFLARE_INTEGRATION=false
 
 STORAGE_BACKEND=local
-
 MOCK_FILE_PATH=/tmp/modrinth
 
 BACKBLAZE_KEY_ID=none
@@ -87,8 +87,8 @@ SMTP_HOST=none
 SMTP_PORT=465
 SMTP_TLS=tls
 
-SITE_VERIFY_EMAIL_PATH=none
-SITE_RESET_PASSWORD_PATH=none
+SITE_VERIFY_EMAIL_PATH=auth/verify-email
+SITE_RESET_PASSWORD_PATH=auth/reset-password
 SITE_BILLING_PATH=none
 
 SENDY_URL=none
diff --git a/apps/labrinth/.sqlx/query-010cafcafb6adc25b00e3c81d844736b0245e752a90334c58209d8a02536c800.json b/apps/labrinth/.sqlx/query-010cafcafb6adc25b00e3c81d844736b0245e752a90334c58209d8a02536c800.json
deleted file mode 100644
index 1336c5438..000000000
--- a/apps/labrinth/.sqlx/query-010cafcafb6adc25b00e3c81d844736b0245e752a90334c58209d8a02536c800.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        UPDATE mods\n                        SET moderation_message = NULL, moderation_message_body = NULL, queued = NOW()\n                        WHERE (id = $1)\n                        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "010cafcafb6adc25b00e3c81d844736b0245e752a90334c58209d8a02536c800"
-}
diff --git a/apps/labrinth/.sqlx/query-0d01a3991e7551a8b7936bf8f4cc1760d2e89af99dd71849eda35d6c6820aa43.json b/apps/labrinth/.sqlx/query-0d01a3991e7551a8b7936bf8f4cc1760d2e89af99dd71849eda35d6c6820aa43.json
new file mode 100644
index 000000000..4a8e5af6a
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-0d01a3991e7551a8b7936bf8f4cc1760d2e89af99dd71849eda35d6c6820aa43.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH random_id_point AS (\n            SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point\n        )\n        SELECT id FROM mods\n        WHERE status = ANY($1)\n        ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point)\n        LIMIT $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "0d01a3991e7551a8b7936bf8f4cc1760d2e89af99dd71849eda35d6c6820aa43"
+}
diff --git a/apps/labrinth/.sqlx/query-124fbf0544ea6989d6dc5e840405dbc76d7385276a38ad79d9093c53c73bbde2.json b/apps/labrinth/.sqlx/query-124fbf0544ea6989d6dc5e840405dbc76d7385276a38ad79d9093c53c73bbde2.json
deleted file mode 100644
index ecf7f3118..000000000
--- a/apps/labrinth/.sqlx/query-124fbf0544ea6989d6dc5e840405dbc76d7385276a38ad79d9093c53c73bbde2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                            UPDATE mods\n                            SET webhook_sent = TRUE\n                            WHERE id = $1\n                            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "124fbf0544ea6989d6dc5e840405dbc76d7385276a38ad79d9093c53c73bbde2"
-}
diff --git a/apps/labrinth/.sqlx/query-186d0e933ece20163915926293a01754ff571de4f06e521bb4f7c0207268e03b.json b/apps/labrinth/.sqlx/query-186d0e933ece20163915926293a01754ff571de4f06e521bb4f7c0207268e03b.json
deleted file mode 100644
index e31392b44..000000000
--- a/apps/labrinth/.sqlx/query-186d0e933ece20163915926293a01754ff571de4f06e521bb4f7c0207268e03b.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        DELETE FROM mods_links\n                        WHERE joining_mod_id = $1 AND joining_platform_id IN (\n                            SELECT id FROM link_platforms WHERE name = ANY($2)\n                        )\n                        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "TextArray"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "186d0e933ece20163915926293a01754ff571de4f06e521bb4f7c0207268e03b"
-}
diff --git a/apps/labrinth/.sqlx/query-19dc22c4d6d14222f8e8bace74c2961761c53b7375460ade15af921754d5d7da.json b/apps/labrinth/.sqlx/query-19dc22c4d6d14222f8e8bace74c2961761c53b7375460ade15af921754d5d7da.json
deleted file mode 100644
index 9254267e3..000000000
--- a/apps/labrinth/.sqlx/query-19dc22c4d6d14222f8e8bace74c2961761c53b7375460ade15af921754d5d7da.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET license = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "19dc22c4d6d14222f8e8bace74c2961761c53b7375460ade15af921754d5d7da"
-}
diff --git a/apps/labrinth/.sqlx/query-299b8ea6e7a0048fa389cc4432715dc2a09e227d2f08e91167a43372a7ac6e35.json b/apps/labrinth/.sqlx/query-299b8ea6e7a0048fa389cc4432715dc2a09e227d2f08e91167a43372a7ac6e35.json
new file mode 100644
index 000000000..eecc67513
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-299b8ea6e7a0048fa389cc4432715dc2a09e227d2f08e91167a43372a7ac6e35.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                DELETE FROM mods_categories\n                WHERE joining_mod_id = $1 AND is_additional = FALSE\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "299b8ea6e7a0048fa389cc4432715dc2a09e227d2f08e91167a43372a7ac6e35"
+}
diff --git a/apps/labrinth/.sqlx/query-374c234b92b838b0bd65de100a9008b0fb78c79976fd858e0599e1ccb7f08b82.json b/apps/labrinth/.sqlx/query-374c234b92b838b0bd65de100a9008b0fb78c79976fd858e0599e1ccb7f08b82.json
new file mode 100644
index 000000000..4e906d600
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-374c234b92b838b0bd65de100a9008b0fb78c79976fd858e0599e1ccb7f08b82.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET side_types_migration_review_status = $1\n            WHERE id = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "374c234b92b838b0bd65de100a9008b0fb78c79976fd858e0599e1ccb7f08b82"
+}
diff --git a/apps/labrinth/.sqlx/query-3fcfed18cbfb37866e0fa57a4e95efb326864f8219941d1b696add39ed333ad1.json b/apps/labrinth/.sqlx/query-3fcfed18cbfb37866e0fa57a4e95efb326864f8219941d1b696add39ed333ad1.json
new file mode 100644
index 000000000..73e76e5ed
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-3fcfed18cbfb37866e0fa57a4e95efb326864f8219941d1b696add39ed333ad1.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                DELETE FROM mods_categories\n                WHERE joining_mod_id = $1 AND is_additional = TRUE\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3fcfed18cbfb37866e0fa57a4e95efb326864f8219941d1b696add39ed333ad1"
+}
diff --git a/apps/labrinth/.sqlx/query-40f7c5bec98fe3503d6bd6db2eae5a4edb8d5d6efda9b9dc124f344ae5c60e08.json b/apps/labrinth/.sqlx/query-40f7c5bec98fe3503d6bd6db2eae5a4edb8d5d6efda9b9dc124f344ae5c60e08.json
deleted file mode 100644
index 4190c1eb4..000000000
--- a/apps/labrinth/.sqlx/query-40f7c5bec98fe3503d6bd6db2eae5a4edb8d5d6efda9b9dc124f344ae5c60e08.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        DELETE FROM mods_categories\n                        WHERE joining_mod_id = $1 AND is_additional = TRUE\n                        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "40f7c5bec98fe3503d6bd6db2eae5a4edb8d5d6efda9b9dc124f344ae5c60e08"
-}
diff --git a/apps/labrinth/.sqlx/query-4e9f9eafbfd705dfc94571018cb747245a98ea61bad3fae4b3ce284229d99955.json b/apps/labrinth/.sqlx/query-4e9f9eafbfd705dfc94571018cb747245a98ea61bad3fae4b3ce284229d99955.json
deleted file mode 100644
index be21454a5..000000000
--- a/apps/labrinth/.sqlx/query-4e9f9eafbfd705dfc94571018cb747245a98ea61bad3fae4b3ce284229d99955.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET description = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "4e9f9eafbfd705dfc94571018cb747245a98ea61bad3fae4b3ce284229d99955"
-}
diff --git a/apps/labrinth/.sqlx/query-4fb5bd341369b4beb6b4a88de296b608ea5441a96db9f7360fbdccceb4628202.json b/apps/labrinth/.sqlx/query-4fb5bd341369b4beb6b4a88de296b608ea5441a96db9f7360fbdccceb4628202.json
deleted file mode 100644
index 279dbcf75..000000000
--- a/apps/labrinth/.sqlx/query-4fb5bd341369b4beb6b4a88de296b608ea5441a96db9f7360fbdccceb4628202.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET slug = LOWER($1)\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "4fb5bd341369b4beb6b4a88de296b608ea5441a96db9f7360fbdccceb4628202"
-}
diff --git a/apps/labrinth/.sqlx/query-595f4e7432d5b41002988c6cc6b0b1f09273ad02c319e6631c74d80a9b278328.json b/apps/labrinth/.sqlx/query-595f4e7432d5b41002988c6cc6b0b1f09273ad02c319e6631c74d80a9b278328.json
new file mode 100644
index 000000000..5474a7c6b
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-595f4e7432d5b41002988c6cc6b0b1f09273ad02c319e6631c74d80a9b278328.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET summary = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "595f4e7432d5b41002988c6cc6b0b1f09273ad02c319e6631c74d80a9b278328"
+}
diff --git a/apps/labrinth/.sqlx/query-6366891bb34a14278f1ae857b8d6f68dff44badae9ae5c5aceba3c32e8d00356.json b/apps/labrinth/.sqlx/query-6366891bb34a14278f1ae857b8d6f68dff44badae9ae5c5aceba3c32e8d00356.json
deleted file mode 100644
index b262237e9..000000000
--- a/apps/labrinth/.sqlx/query-6366891bb34a14278f1ae857b8d6f68dff44badae9ae5c5aceba3c32e8d00356.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                                INSERT INTO mods_links (joining_mod_id, joining_platform_id, url)\n                                VALUES ($1, $2, $3)\n                                ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int4",
-        "Varchar"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "6366891bb34a14278f1ae857b8d6f68dff44badae9ae5c5aceba3c32e8d00356"
-}
diff --git a/apps/labrinth/.sqlx/query-66b06ddcd0a4cf01e716331befa393a12631fe6752a7d078bda06b24d50daae2.json b/apps/labrinth/.sqlx/query-66b06ddcd0a4cf01e716331befa393a12631fe6752a7d078bda06b24d50daae2.json
deleted file mode 100644
index f2e83cf92..000000000
--- a/apps/labrinth/.sqlx/query-66b06ddcd0a4cf01e716331befa393a12631fe6752a7d078bda06b24d50daae2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET requested_status = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "66b06ddcd0a4cf01e716331befa393a12631fe6752a7d078bda06b24d50daae2"
-}
diff --git a/apps/labrinth/.sqlx/query-70be97b02e402de0490ade5866c47232f9c341add2f3838cc3ae1a07a310d561.json b/apps/labrinth/.sqlx/query-70be97b02e402de0490ade5866c47232f9c341add2f3838cc3ae1a07a310d561.json
new file mode 100644
index 000000000..c75b97c5d
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-70be97b02e402de0490ade5866c47232f9c341add2f3838cc3ae1a07a310d561.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET name = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "70be97b02e402de0490ade5866c47232f9c341add2f3838cc3ae1a07a310d561"
+}
diff --git a/apps/labrinth/.sqlx/query-79040825457845cc078be7b3293804d6fb2e05ffce07e7b4248d8705d6fc6e61.json b/apps/labrinth/.sqlx/query-79040825457845cc078be7b3293804d6fb2e05ffce07e7b4248d8705d6fc6e61.json
new file mode 100644
index 000000000..5c989cc2a
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-79040825457845cc078be7b3293804d6fb2e05ffce07e7b4248d8705d6fc6e61.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET moderation_message_body = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "79040825457845cc078be7b3293804d6fb2e05ffce07e7b4248d8705d6fc6e61"
+}
diff --git a/apps/labrinth/.sqlx/query-7916fe4f04067324ae05598ec9dc6f97f18baf9eda30c64f32677158ada87478.json b/apps/labrinth/.sqlx/query-7916fe4f04067324ae05598ec9dc6f97f18baf9eda30c64f32677158ada87478.json
deleted file mode 100644
index 6996aa840..000000000
--- a/apps/labrinth/.sqlx/query-7916fe4f04067324ae05598ec9dc6f97f18baf9eda30c64f32677158ada87478.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET monetization_status = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "7916fe4f04067324ae05598ec9dc6f97f18baf9eda30c64f32677158ada87478"
-}
diff --git a/apps/labrinth/.sqlx/query-5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763.json b/apps/labrinth/.sqlx/query-7a6d6a91e6bd27f7be34b8cc7955a66c4175ebd1c55e437f187f61efca681c62.json
similarity index 79%
rename from apps/labrinth/.sqlx/query-5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763.json
rename to apps/labrinth/.sqlx/query-7a6d6a91e6bd27f7be34b8cc7955a66c4175ebd1c55e437f187f61efca681c62.json
index 53b085320..f7cb84084 100644
--- a/apps/labrinth/.sqlx/query-5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763.json
+++ b/apps/labrinth/.sqlx/query-7a6d6a91e6bd27f7be34b8cc7955a66c4175ebd1c55e437f187f61efca681c62.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n                    m.icon_url icon_url, m.raw_icon_url raw_icon_url, m.description description, m.published published,\n                    m.approved approved, m.queued, m.status status, m.requested_status requested_status,\n                    m.license_url license_url,\n                    m.team_id team_id, m.organization_id organization_id, m.license license, m.slug slug, m.moderation_message moderation_message, m.moderation_message_body moderation_message_body,\n                    m.webhook_sent, m.color,\n                    t.id thread_id, m.monetization_status monetization_status,\n                    ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is false) categories,\n                    ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is true) additional_categories\n                    FROM mods m\n                    INNER JOIN threads t ON t.mod_id = m.id\n                    LEFT JOIN mods_categories mc ON mc.joining_mod_id = m.id\n                    LEFT JOIN categories c ON mc.joining_category_id = c.id\n                    WHERE m.id = ANY($1) OR m.slug = ANY($2)\n                    GROUP BY t.id, m.id;\n                    ",
+  "query": "\n                    SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n                    m.icon_url icon_url, m.raw_icon_url raw_icon_url, m.description description, m.published published,\n                    m.approved approved, m.queued, m.status status, m.requested_status requested_status,\n                    m.license_url license_url,\n                    m.team_id team_id, m.organization_id organization_id, m.license license, m.slug slug, m.moderation_message moderation_message, m.moderation_message_body moderation_message_body,\n                    m.webhook_sent, m.color,\n                    t.id thread_id, m.monetization_status monetization_status,\n                    m.side_types_migration_review_status side_types_migration_review_status,\n                    ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is false) categories,\n                    ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is true) additional_categories\n                    FROM mods m\n                    INNER JOIN threads t ON t.mod_id = m.id\n                    LEFT JOIN mods_categories mc ON mc.joining_mod_id = m.id\n                    LEFT JOIN categories c ON mc.joining_category_id = c.id\n                    WHERE m.id = ANY($1) OR m.slug = ANY($2)\n                    GROUP BY t.id, m.id;\n                    ",
   "describe": {
     "columns": [
       {
@@ -125,11 +125,16 @@
       },
       {
         "ordinal": 24,
+        "name": "side_types_migration_review_status",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 25,
         "name": "categories",
         "type_info": "VarcharArray"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "additional_categories",
         "type_info": "VarcharArray"
       }
@@ -165,9 +170,10 @@
       true,
       false,
       false,
+      false,
       null,
       null
     ]
   },
-  "hash": "5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763"
+  "hash": "7a6d6a91e6bd27f7be34b8cc7955a66c4175ebd1c55e437f187f61efca681c62"
 }
diff --git a/apps/labrinth/.sqlx/query-7e403d399ddd3279c4c65db7b9ea850cdd9fef3df1b3f7d5f62e079b4522f2ca.json b/apps/labrinth/.sqlx/query-7e403d399ddd3279c4c65db7b9ea850cdd9fef3df1b3f7d5f62e079b4522f2ca.json
new file mode 100644
index 000000000..8226261f5
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-7e403d399ddd3279c4c65db7b9ea850cdd9fef3df1b3f7d5f62e079b4522f2ca.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET slug = LOWER($1)\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "7e403d399ddd3279c4c65db7b9ea850cdd9fef3df1b3f7d5f62e079b4522f2ca"
+}
diff --git a/apps/labrinth/.sqlx/query-1cefe4924d3c1f491739858ce844a22903d2dbe26f255219299f1833a10ce3d7.json b/apps/labrinth/.sqlx/query-889a4f79b7031436b3ed31d1005dc9b378ca9c97a128366cae97649503d5dfdf.json
similarity index 52%
rename from apps/labrinth/.sqlx/query-1cefe4924d3c1f491739858ce844a22903d2dbe26f255219299f1833a10ce3d7.json
rename to apps/labrinth/.sqlx/query-889a4f79b7031436b3ed31d1005dc9b378ca9c97a128366cae97649503d5dfdf.json
index 6e0fd619f..7c0dbbdb8 100644
--- a/apps/labrinth/.sqlx/query-1cefe4924d3c1f491739858ce844a22903d2dbe26f255219299f1833a10ce3d7.json
+++ b/apps/labrinth/.sqlx/query-889a4f79b7031436b3ed31d1005dc9b378ca9c97a128366cae97649503d5dfdf.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT id FROM mods TABLESAMPLE SYSTEM_ROWS($1) WHERE status = ANY($2)\n            ",
+  "query": "\n            SELECT id FROM users\n            WHERE LOWER(email) = LOWER($1)\n            ",
   "describe": {
     "columns": [
       {
@@ -11,13 +11,12 @@
     ],
     "parameters": {
       "Left": [
-        "Int8",
-        "TextArray"
+        "Text"
       ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "1cefe4924d3c1f491739858ce844a22903d2dbe26f255219299f1833a10ce3d7"
+  "hash": "889a4f79b7031436b3ed31d1005dc9b378ca9c97a128366cae97649503d5dfdf"
 }
diff --git a/apps/labrinth/.sqlx/query-92d805d2e13cfc0f2220f15b0a35ff71e654e5e6b386766e6c6047cf3861b26e.json b/apps/labrinth/.sqlx/query-92d805d2e13cfc0f2220f15b0a35ff71e654e5e6b386766e6c6047cf3861b26e.json
new file mode 100644
index 000000000..d627ef2dc
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-92d805d2e13cfc0f2220f15b0a35ff71e654e5e6b386766e6c6047cf3861b26e.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE mods\n                SET approved = NOW()\n                WHERE id = $1 AND approved IS NULL\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "92d805d2e13cfc0f2220f15b0a35ff71e654e5e6b386766e6c6047cf3861b26e"
+}
diff --git a/apps/labrinth/.sqlx/query-9482a3419337911ac6a10eeaf065e29589ee1b707729344e81d183c713aa0d28.json b/apps/labrinth/.sqlx/query-9482a3419337911ac6a10eeaf065e29589ee1b707729344e81d183c713aa0d28.json
new file mode 100644
index 000000000..babe8ad64
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-9482a3419337911ac6a10eeaf065e29589ee1b707729344e81d183c713aa0d28.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET license_url = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9482a3419337911ac6a10eeaf065e29589ee1b707729344e81d183c713aa0d28"
+}
diff --git a/apps/labrinth/.sqlx/query-a0148ff25855202e7bb220b6a2bc9220a95e309fb0dae41d9a05afa86e6b33af.json b/apps/labrinth/.sqlx/query-a0148ff25855202e7bb220b6a2bc9220a95e309fb0dae41d9a05afa86e6b33af.json
deleted file mode 100644
index a8ec2492d..000000000
--- a/apps/labrinth/.sqlx/query-a0148ff25855202e7bb220b6a2bc9220a95e309fb0dae41d9a05afa86e6b33af.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        DELETE FROM mods_categories\n                        WHERE joining_mod_id = $1 AND is_additional = FALSE\n                        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "a0148ff25855202e7bb220b6a2bc9220a95e309fb0dae41d9a05afa86e6b33af"
-}
diff --git a/apps/labrinth/.sqlx/query-a11d613479d09dff5fcdc45ab7a0341fb1b4738f0ede71572d939ef0984bd65f.json b/apps/labrinth/.sqlx/query-a11d613479d09dff5fcdc45ab7a0341fb1b4738f0ede71572d939ef0984bd65f.json
deleted file mode 100644
index 4b97bd691..000000000
--- a/apps/labrinth/.sqlx/query-a11d613479d09dff5fcdc45ab7a0341fb1b4738f0ede71572d939ef0984bd65f.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        UPDATE mods\n                        SET approved = NOW()\n                        WHERE id = $1 AND approved IS NULL\n                        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "a11d613479d09dff5fcdc45ab7a0341fb1b4738f0ede71572d939ef0984bd65f"
-}
diff --git a/apps/labrinth/.sqlx/query-a5ae1fe0ca4ca8432736398fed25687173b2fbde3405340a5579c5ef68cb5218.json b/apps/labrinth/.sqlx/query-a5ae1fe0ca4ca8432736398fed25687173b2fbde3405340a5579c5ef68cb5218.json
new file mode 100644
index 000000000..799ce4489
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-a5ae1fe0ca4ca8432736398fed25687173b2fbde3405340a5579c5ef68cb5218.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET license = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a5ae1fe0ca4ca8432736398fed25687173b2fbde3405340a5579c5ef68cb5218"
+}
diff --git a/apps/labrinth/.sqlx/query-a74230ad1bb1b13bab850e204436e7746a96f9605afe2ca62d6d8337530cb5ad.json b/apps/labrinth/.sqlx/query-a74230ad1bb1b13bab850e204436e7746a96f9605afe2ca62d6d8337530cb5ad.json
new file mode 100644
index 000000000..73d8a8eec
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-a74230ad1bb1b13bab850e204436e7746a96f9605afe2ca62d6d8337530cb5ad.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET status = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a74230ad1bb1b13bab850e204436e7746a96f9605afe2ca62d6d8337530cb5ad"
+}
diff --git a/apps/labrinth/.sqlx/query-abf790170e3a807ffe8b3a188da620c89e6398f38ff066220fdadffe8e7481c1.json b/apps/labrinth/.sqlx/query-abf790170e3a807ffe8b3a188da620c89e6398f38ff066220fdadffe8e7481c1.json
deleted file mode 100644
index 20e672605..000000000
--- a/apps/labrinth/.sqlx/query-abf790170e3a807ffe8b3a188da620c89e6398f38ff066220fdadffe8e7481c1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                      SELECT EXISTS(SELECT 1 FROM mods WHERE slug = LOWER($1))\n                      ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "exists",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "abf790170e3a807ffe8b3a188da620c89e6398f38ff066220fdadffe8e7481c1"
-}
diff --git a/apps/labrinth/.sqlx/query-b677e66031752e66d2219079a559e368c6cea1800da8a5f9d50ba5b1ac3a15fc.json b/apps/labrinth/.sqlx/query-b677e66031752e66d2219079a559e368c6cea1800da8a5f9d50ba5b1ac3a15fc.json
deleted file mode 100644
index a66547009..000000000
--- a/apps/labrinth/.sqlx/query-b677e66031752e66d2219079a559e368c6cea1800da8a5f9d50ba5b1ac3a15fc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET summary = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "b677e66031752e66d2219079a559e368c6cea1800da8a5f9d50ba5b1ac3a15fc"
-}
diff --git a/apps/labrinth/.sqlx/query-c100a3be0e1b7bf449576c4052d87494979cb89d194805a5ce9e928eef796ae9.json b/apps/labrinth/.sqlx/query-c100a3be0e1b7bf449576c4052d87494979cb89d194805a5ce9e928eef796ae9.json
deleted file mode 100644
index fff83ae5a..000000000
--- a/apps/labrinth/.sqlx/query-c100a3be0e1b7bf449576c4052d87494979cb89d194805a5ce9e928eef796ae9.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET license_url = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c100a3be0e1b7bf449576c4052d87494979cb89d194805a5ce9e928eef796ae9"
-}
diff --git a/apps/labrinth/.sqlx/query-c6693ea80ab1675dd2da72d70add734a92bb25f17a0536968e4b9a4dbe05cf5b.json b/apps/labrinth/.sqlx/query-c6693ea80ab1675dd2da72d70add734a92bb25f17a0536968e4b9a4dbe05cf5b.json
new file mode 100644
index 000000000..dc7aa810b
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-c6693ea80ab1675dd2da72d70add734a92bb25f17a0536968e4b9a4dbe05cf5b.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE mods\n                SET moderation_message = NULL, moderation_message_body = NULL, queued = NOW()\n                WHERE (id = $1)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c6693ea80ab1675dd2da72d70add734a92bb25f17a0536968e4b9a4dbe05cf5b"
+}
diff --git a/apps/labrinth/.sqlx/query-9c1b6ba7cbe2619ff767ee7bbfb01725dc3324d284b2f20cf393574ab3bc655f.json b/apps/labrinth/.sqlx/query-cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b.json
similarity index 55%
rename from apps/labrinth/.sqlx/query-9c1b6ba7cbe2619ff767ee7bbfb01725dc3324d284b2f20cf393574ab3bc655f.json
rename to apps/labrinth/.sqlx/query-cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b.json
index 5152ba222..5a26ce08b 100644
--- a/apps/labrinth/.sqlx/query-9c1b6ba7cbe2619ff767ee7bbfb01725dc3324d284b2f20cf393574ab3bc655f.json
+++ b/apps/labrinth/.sqlx/query-cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b.json
@@ -1,15 +1,14 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET name = $1\n                    WHERE (id = $2)\n                    ",
+  "query": "\n                    UPDATE mods\n                    SET webhook_sent = TRUE\n                    WHERE id = $1\n                    ",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
-        "Varchar",
         "Int8"
       ]
     },
     "nullable": []
   },
-  "hash": "9c1b6ba7cbe2619ff767ee7bbfb01725dc3324d284b2f20cf393574ab3bc655f"
+  "hash": "cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b"
 }
diff --git a/apps/labrinth/.sqlx/query-d010207297e1c4f2ebfb0a81caf45481c94edb1e8d8ac47db13ec0ff9b2f5328.json b/apps/labrinth/.sqlx/query-d010207297e1c4f2ebfb0a81caf45481c94edb1e8d8ac47db13ec0ff9b2f5328.json
new file mode 100644
index 000000000..507b49c6c
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-d010207297e1c4f2ebfb0a81caf45481c94edb1e8d8ac47db13ec0ff9b2f5328.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET moderation_message = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d010207297e1c4f2ebfb0a81caf45481c94edb1e8d8ac47db13ec0ff9b2f5328"
+}
diff --git a/apps/labrinth/.sqlx/query-d331ca8f22da418cf654985c822ce4466824beaa00dea64cde90dc651a03024b.json b/apps/labrinth/.sqlx/query-d331ca8f22da418cf654985c822ce4466824beaa00dea64cde90dc651a03024b.json
deleted file mode 100644
index 9df5df701..000000000
--- a/apps/labrinth/.sqlx/query-d331ca8f22da418cf654985c822ce4466824beaa00dea64cde90dc651a03024b.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET moderation_message = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "d331ca8f22da418cf654985c822ce4466824beaa00dea64cde90dc651a03024b"
-}
diff --git a/apps/labrinth/.sqlx/query-d5ad5a67fe53351b760335b80501f09a2799bf575af90beeac94193fe8c4388b.json b/apps/labrinth/.sqlx/query-d5ad5a67fe53351b760335b80501f09a2799bf575af90beeac94193fe8c4388b.json
new file mode 100644
index 000000000..3d9785e4d
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-d5ad5a67fe53351b760335b80501f09a2799bf575af90beeac94193fe8c4388b.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT tm.user_id id\n                FROM team_members tm\n                WHERE tm.team_id = $1 AND tm.accepted\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "d5ad5a67fe53351b760335b80501f09a2799bf575af90beeac94193fe8c4388b"
+}
diff --git a/apps/labrinth/.sqlx/query-e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998.json b/apps/labrinth/.sqlx/query-e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998.json
new file mode 100644
index 000000000..e42fc661e
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET requested_status = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998"
+}
diff --git a/apps/labrinth/.sqlx/query-e7654740161726b2aef4f7c9a26eb00efcac9f6285a39d8df06d606613684ba3.json b/apps/labrinth/.sqlx/query-e7654740161726b2aef4f7c9a26eb00efcac9f6285a39d8df06d606613684ba3.json
new file mode 100644
index 000000000..ef8f7b22c
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-e7654740161726b2aef4f7c9a26eb00efcac9f6285a39d8df06d606613684ba3.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET description = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e7654740161726b2aef4f7c9a26eb00efcac9f6285a39d8df06d606613684ba3"
+}
diff --git a/apps/labrinth/.sqlx/query-e925b15ec46f0263c7775ba1ba00ed11cfd6749fa792d4eabed73b619f230585.json b/apps/labrinth/.sqlx/query-e925b15ec46f0263c7775ba1ba00ed11cfd6749fa792d4eabed73b619f230585.json
deleted file mode 100644
index 52bc085af..000000000
--- a/apps/labrinth/.sqlx/query-e925b15ec46f0263c7775ba1ba00ed11cfd6749fa792d4eabed73b619f230585.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET status = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e925b15ec46f0263c7775ba1ba00ed11cfd6749fa792d4eabed73b619f230585"
-}
diff --git a/apps/labrinth/.sqlx/query-ea1525cbe7460d0d9e9da8f448c661f7209bc1a7a04e2ea0026fa69c3f550a14.json b/apps/labrinth/.sqlx/query-ea1525cbe7460d0d9e9da8f448c661f7209bc1a7a04e2ea0026fa69c3f550a14.json
deleted file mode 100644
index dcdaa6f99..000000000
--- a/apps/labrinth/.sqlx/query-ea1525cbe7460d0d9e9da8f448c661f7209bc1a7a04e2ea0026fa69c3f550a14.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        SELECT tm.user_id id\n                        FROM team_members tm\n                        WHERE tm.team_id = $1 AND tm.accepted\n                        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "ea1525cbe7460d0d9e9da8f448c661f7209bc1a7a04e2ea0026fa69c3f550a14"
-}
diff --git a/apps/labrinth/.sqlx/query-ed1d5d9433bc7f4a360431ecfdd9430c5e58cd6d1c623c187d8661200400b1a4.json b/apps/labrinth/.sqlx/query-ed1d5d9433bc7f4a360431ecfdd9430c5e58cd6d1c623c187d8661200400b1a4.json
deleted file mode 100644
index 4bcf71fd8..000000000
--- a/apps/labrinth/.sqlx/query-ed1d5d9433bc7f4a360431ecfdd9430c5e58cd6d1c623c187d8661200400b1a4.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE mods\n                    SET moderation_message_body = $1\n                    WHERE (id = $2)\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "ed1d5d9433bc7f4a360431ecfdd9430c5e58cd6d1c623c187d8661200400b1a4"
-}
diff --git a/apps/labrinth/.sqlx/query-bcbcac3c0b2b2b0327577d3095fa744ab42f7f1dcd2b7f3c3dace12b899b3f38.json b/apps/labrinth/.sqlx/query-ee74bbff42dd29ab5a23d5811ea18e62ac199fe5e68275bf1bc7c71ace630702.json
similarity index 60%
rename from apps/labrinth/.sqlx/query-bcbcac3c0b2b2b0327577d3095fa744ab42f7f1dcd2b7f3c3dace12b899b3f38.json
rename to apps/labrinth/.sqlx/query-ee74bbff42dd29ab5a23d5811ea18e62ac199fe5e68275bf1bc7c71ace630702.json
index 1de75299c..af9bf42e5 100644
--- a/apps/labrinth/.sqlx/query-bcbcac3c0b2b2b0327577d3095fa744ab42f7f1dcd2b7f3c3dace12b899b3f38.json
+++ b/apps/labrinth/.sqlx/query-ee74bbff42dd29ab5a23d5811ea18e62ac199fe5e68275bf1bc7c71ace630702.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO mods (\n                id, team_id, name, summary, description,\n                published, downloads, icon_url, raw_icon_url, status, requested_status,\n                license_url, license,\n                slug, color, monetization_status, organization_id\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6,\n                $7, $8, $9, $10, $11,\n                $12, $13,\n                LOWER($14), $15, $16, $17\n            )\n            ",
+  "query": "\n            INSERT INTO mods (\n                id, team_id, name, summary, description,\n                published, downloads, icon_url, raw_icon_url, status, requested_status,\n                license_url, license,\n                slug, color, monetization_status, organization_id,\n                side_types_migration_review_status\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6,\n                $7, $8, $9, $10, $11,\n                $12, $13,\n                LOWER($14), $15, $16, $17,\n                $18\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -21,10 +21,11 @@
         "Text",
         "Int4",
         "Varchar",
-        "Int8"
+        "Int8",
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "bcbcac3c0b2b2b0327577d3095fa744ab42f7f1dcd2b7f3c3dace12b899b3f38"
+  "hash": "ee74bbff42dd29ab5a23d5811ea18e62ac199fe5e68275bf1bc7c71ace630702"
 }
diff --git a/apps/labrinth/.sqlx/query-f34bbe639ad21801258dc8beaab9877229a451761be07f85a1dd04d027832329.json b/apps/labrinth/.sqlx/query-f34bbe639ad21801258dc8beaab9877229a451761be07f85a1dd04d027832329.json
deleted file mode 100644
index ec3004f9c..000000000
--- a/apps/labrinth/.sqlx/query-f34bbe639ad21801258dc8beaab9877229a451761be07f85a1dd04d027832329.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        SELECT EXISTS(SELECT 1 FROM mods WHERE id=$1)\n                        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "exists",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "f34bbe639ad21801258dc8beaab9877229a451761be07f85a1dd04d027832329"
-}
diff --git a/apps/labrinth/.sqlx/query-fa874e2c55995feaa5e0d3cd54db82b88af15477d616d0d3b3c6967b31d967f7.json b/apps/labrinth/.sqlx/query-fa874e2c55995feaa5e0d3cd54db82b88af15477d616d0d3b3c6967b31d967f7.json
new file mode 100644
index 000000000..24a5dbb41
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-fa874e2c55995feaa5e0d3cd54db82b88af15477d616d0d3b3c6967b31d967f7.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE mods\n            SET monetization_status = $1\n            WHERE (id = $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fa874e2c55995feaa5e0d3cd54db82b88af15477d616d0d3b3c6967b31d967f7"
+}
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 53f30a27c..b49aefabf 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -2,7 +2,7 @@
 name = "labrinth"
 version = "2.7.0"
 authors = ["geometrically <jai@modrinth.com>"]
-edition = "2024"
+edition.workspace = true
 license = "AGPL-3.0"
 
 # This seems redundant, but it's necessary for Docker to work
@@ -131,3 +131,6 @@ actix-http.workspace = true
 dotenv-build.workspace = true
 chrono.workspace = true
 iana-time-zone.workspace = true
+
+[lints]
+workspace = true
diff --git a/apps/labrinth/Dockerfile b/apps/labrinth/Dockerfile
index 8ed142c92..effa9c07d 100644
--- a/apps/labrinth/Dockerfile
+++ b/apps/labrinth/Dockerfile
@@ -1,9 +1,8 @@
-FROM rust:1.86.0 AS build
+FROM rust:1.87.0 AS build
 ENV PKG_CONFIG_ALLOW_CROSS=1
 
 WORKDIR /usr/src/labrinth
 COPY . .
-ENV SQLX_OFFLINE=true
 COPY apps/labrinth/.sqlx/ .sqlx/
 RUN cargo build --release --package labrinth
 
diff --git a/apps/labrinth/migrations/20250523174544_project-versions-environments.sql b/apps/labrinth/migrations/20250523174544_project-versions-environments.sql
new file mode 100644
index 000000000..80b862a7d
--- /dev/null
+++ b/apps/labrinth/migrations/20250523174544_project-versions-environments.sql
@@ -0,0 +1,122 @@
+DO LANGUAGE plpgsql $$
+DECLARE
+    VAR_env_field_id INT;
+    VAR_env_field_enum_id INT := 4; -- Known available ID for a new enum type
+BEGIN
+
+-- Define a new loader field for environment
+INSERT INTO loader_field_enums (id, enum_name, ordering, hidable)
+    VALUES (VAR_env_field_enum_id, 'environment', NULL, TRUE);
+
+INSERT INTO loader_field_enum_values (enum_id, value, ordering, created, metadata)
+    VALUES
+        -- Must be installed on both client and (integrated) server
+        (VAR_env_field_enum_id, 'client_and_server', NULL, NOW(), NULL),
+        -- Must be installed only on the client
+        (VAR_env_field_enum_id, 'client_only', NULL, NOW(), NULL),
+        -- Must be installed on the client, may be installed on a (integrated) server. To be displayed as a
+        -- client mod
+        (VAR_env_field_enum_id, 'client_only_server_optional', NULL, NOW(), NULL),
+        -- Must be installed only on the integrated singleplayer server. To be displayed as a server mod for
+        -- singleplayer exclusively
+        (VAR_env_field_enum_id, 'singleplayer_only', NULL, NOW(), NULL),
+        -- Must be installed only on a (integrated) server
+        (VAR_env_field_enum_id, 'server_only', NULL, NOW(), NULL),
+        -- Must be installed on the server, may be installed on the client. To be displayed as a
+        -- singleplayer-compatible server mod
+        (VAR_env_field_enum_id, 'server_only_client_optional', NULL, NOW(), NULL),
+        -- Must be installed only on a dedicated multiplayer server (not the integrated singleplayer server).
+        -- To be displayed as an server mod for multiplayer exclusively
+        (VAR_env_field_enum_id, 'dedicated_server_only', NULL, NOW(), NULL),
+        -- Can be installed on both client and server, with no strong preference for either. To be displayed
+        -- as both a client and server mod
+        (VAR_env_field_enum_id, 'client_or_server', NULL, NOW(), NULL),
+        -- Can be installed on both client and server, with a preference for being installed on both. To be
+        -- displayed as a client and server mod
+        (VAR_env_field_enum_id, 'client_or_server_prefers_both', NULL, NOW(), NULL),
+        (VAR_env_field_enum_id, 'unknown', NULL, NOW(), NULL);
+
+INSERT INTO loader_fields (field, field_type, enum_type, optional)
+    VALUES ('environment', 'enum', VAR_env_field_enum_id, FALSE)
+    RETURNING id INTO VAR_env_field_id;
+
+-- Update version_fields to have the new environment field, initializing it from the
+-- values of the previous fields
+INSERT INTO version_fields (version_id, field_id, enum_value)
+    SELECT vf.version_id, VAR_env_field_id, (
+        SELECT id
+        FROM loader_field_enum_values
+        WHERE enum_id = VAR_env_field_enum_id
+        AND value = (
+            CASE jsonb_object_agg(lf.field, vf.int_value)
+                WHEN '{ "server_only": 0, "singleplayer": 0, "client_and_server": 0, "client_only": 1 }'::jsonb THEN 'client_only'
+                WHEN '{ "server_only": 0, "singleplayer": 0, "client_and_server": 1, "client_only": 0 }'::jsonb THEN 'client_and_server'
+                WHEN '{ "server_only": 0, "singleplayer": 0, "client_and_server": 1, "client_only": 1 }'::jsonb THEN 'client_only_server_optional'
+                WHEN '{ "server_only": 0, "singleplayer": 1, "client_and_server": 0, "client_only": 0 }'::jsonb THEN 'singleplayer_only'
+                WHEN '{ "server_only": 0, "singleplayer": 1, "client_and_server": 0, "client_only": 1 }'::jsonb THEN 'client_only'
+                WHEN '{ "server_only": 0, "singleplayer": 1, "client_and_server": 1, "client_only": 0 }'::jsonb THEN 'client_and_server'
+                WHEN '{ "server_only": 0, "singleplayer": 1, "client_and_server": 1, "client_only": 1 }'::jsonb THEN 'client_only_server_optional'
+                WHEN '{ "server_only": 1, "singleplayer": 0, "client_and_server": 0, "client_only": 0 }'::jsonb THEN 'server_only'
+                WHEN '{ "server_only": 1, "singleplayer": 0, "client_and_server": 0, "client_only": 1 }'::jsonb THEN 'client_or_server'
+                WHEN '{ "server_only": 1, "singleplayer": 0, "client_and_server": 1, "client_only": 0 }'::jsonb THEN 'server_only_client_optional'
+                WHEN '{ "server_only": 1, "singleplayer": 0, "client_and_server": 1, "client_only": 1 }'::jsonb THEN 'client_or_server_prefers_both'
+                WHEN '{ "server_only": 1, "singleplayer": 1, "client_and_server": 0, "client_only": 0 }'::jsonb THEN 'server_only'
+                WHEN '{ "server_only": 1, "singleplayer": 1, "client_and_server": 0, "client_only": 1 }'::jsonb THEN 'client_or_server'
+                WHEN '{ "server_only": 1, "singleplayer": 1, "client_and_server": 1, "client_only": 0 }'::jsonb THEN 'server_only_client_optional'
+                WHEN '{ "server_only": 1, "singleplayer": 1, "client_and_server": 1, "client_only": 1 }'::jsonb THEN 'client_or_server_prefers_both'
+                ELSE 'unknown'
+            END
+        )
+    )
+    FROM version_fields vf
+    JOIN loader_fields lf ON vf.field_id = lf.id
+    WHERE lf.field IN ('server_only', 'singleplayer', 'client_and_server', 'client_only')
+    GROUP BY vf.version_id
+    HAVING COUNT(DISTINCT lf.field) = 4;
+
+-- Clean up old fields from the project versions
+DELETE FROM version_fields
+    WHERE field_id IN (
+        SELECT id
+        FROM loader_fields
+        WHERE field IN ('server_only', 'singleplayer', 'client_and_server', 'client_only')
+    );
+
+-- Switch loader fields definitions on the available loaders to use the new environment field
+ALTER TABLE loader_fields_loaders DROP CONSTRAINT unique_loader_field;
+ALTER TABLE loader_fields_loaders DROP CONSTRAINT loader_fields_loaders_pkey;
+
+UPDATE loader_fields_loaders
+    SET loader_field_id = VAR_env_field_id
+    WHERE loader_field_id IN (
+        SELECT id
+        FROM loader_fields
+        WHERE field IN ('server_only', 'singleplayer', 'client_and_server', 'client_only')
+    );
+
+-- Remove duplicate (loader_id, loader_field_id) pairs that may have been created due to several
+-- old fields being converted to a single new field
+DELETE FROM loader_fields_loaders
+    WHERE ctid NOT IN (
+        SELECT MIN(ctid)
+        FROM loader_fields_loaders
+        GROUP BY loader_id, loader_field_id
+    );
+
+-- Having both a PK and UNIQUE constraint for the same columns is redundant, so only restore the PK
+ALTER TABLE loader_fields_loaders ADD PRIMARY KEY (loader_id, loader_field_id);
+
+-- Finally, remove the old loader fields
+DELETE FROM loader_fields
+    WHERE field IN ('server_only', 'singleplayer', 'client_and_server', 'client_only');
+
+-- Add a field to the projects table to track whether the new environment field value has been
+-- reviewed to be appropriate after automated migration
+ALTER TABLE mods
+    ADD COLUMN side_types_migration_review_status VARCHAR(64) NOT NULL DEFAULT 'reviewed'
+    CHECK (side_types_migration_review_status IN ('reviewed', 'pending'));
+
+UPDATE mods SET side_types_migration_review_status = 'pending';
+
+END;
+$$
diff --git a/apps/labrinth/migrations/20250608183828_random-project-index.sql b/apps/labrinth/migrations/20250608183828_random-project-index.sql
new file mode 100644
index 000000000..9d35a65b3
--- /dev/null
+++ b/apps/labrinth/migrations/20250608183828_random-project-index.sql
@@ -0,0 +1,12 @@
+-- This index substantially brings down the cost of the query plan for the
+-- hot query at `labrinth::routes::v3::projects::random_projects_get`, from
+-- 354.04..363.39 to 171.33..180.68 (~2x improvement).
+--
+-- The numbers above were calculated in a clean PostgreSQL 17.5.0 container
+-- with 10k mods created with the SQL below.
+--
+-- WITH seq AS (SELECT n FROM GENERATE_SERIES(1, 10000) AS n)
+-- INSERT INTO mods (id, team_id, name, summary, icon_url, license_url, slug, status)
+-- 	SELECT n, 1, n, '', '', '', n, (ARRAY['approved', 'pending'])[n % 2 + 1] from seq;
+
+CREATE INDEX mods_status ON mods(status);
diff --git a/apps/labrinth/migrations/20250609134334_spatial-random-project-index.sql b/apps/labrinth/migrations/20250609134334_spatial-random-project-index.sql
new file mode 100644
index 000000000..fb471b286
--- /dev/null
+++ b/apps/labrinth/migrations/20250609134334_spatial-random-project-index.sql
@@ -0,0 +1,12 @@
+-- The spatial query for retrieving random searchable projects is greatly sped
+-- up by this index on a fixture of 1M mods, bringing down the total cost of
+-- the query plan and runtime to be comparable to primary key lookups. See the
+-- `labrinth::routes::v3::projects::random_projects_get` function and the
+-- previous 20250608183828_random-project-index.sql migration for more details.
+--
+-- That previous migration created a non-spatial index for the status column which
+-- does not get used in the new spatial query, but may still be useful for other
+-- queries that filter mods by status.
+
+CREATE INDEX mods_searchable_ids_gist ON mods USING gist (POINT(id, 0))
+    WHERE status = ANY(ARRAY['approved', 'archived']);
diff --git a/apps/labrinth/migrations/20250611164523_lowercase-user-email-index.sql b/apps/labrinth/migrations/20250611164523_lowercase-user-email-index.sql
new file mode 100644
index 000000000..80ff690a2
--- /dev/null
+++ b/apps/labrinth/migrations/20250611164523_lowercase-user-email-index.sql
@@ -0,0 +1 @@
+CREATE INDEX users_lowercase_email ON users (LOWER(email));
diff --git a/apps/labrinth/package.json b/apps/labrinth/package.json
index 03e662511..4d01f2043 100644
--- a/apps/labrinth/package.json
+++ b/apps/labrinth/package.json
@@ -2,10 +2,13 @@
   "name": "@modrinth/labrinth",
   "scripts": {
     "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix",
+    "lint": "cargo fmt --check && cargo clippy --all-targets",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
     "dev": "cargo run",
-    "//": "CI will fail since test takes up too much disk space. So we have it named differently.",
-    "test-labrinth": "cargo test"
+    "//": "Labrinth integration tests require a lot of disk space, so in the standard GitHub Actions",
+    "//": "runners we must remove useless development tools from the base image, which frees up ~20 GiB.",
+    "//": "The command commented out below can be used in CI to debug what is taking up space:",
+    "//": "sudo du -xh --max-depth=4 / | sort -rh | curl -X POST --data-urlencode content@/dev/fd/0 https://api.mclo.gs/1/log",
+    "test": "if-ci sudo rm -rf /usr/local/lib/android /usr/local/.ghcup /opt/hostedtoolcache/CodeQL /usr/share/swift && cargo nextest run --all-targets --no-fail-fast"
   }
 }
diff --git a/apps/labrinth/src/auth/checks.rs b/apps/labrinth/src/auth/checks.rs
index 07c6e436c..9a1c74f36 100644
--- a/apps/labrinth/src/auth/checks.rs
+++ b/apps/labrinth/src/auth/checks.rs
@@ -100,10 +100,7 @@ pub async fn filter_visible_project_ids(
             project.status.is_searchable()
         } else {
             !project.status.is_hidden()
-        }) || user_option
-            .as_ref()
-            .map(|x| x.role.is_mod())
-            .unwrap_or(false)
+        }) || user_option.as_ref().is_some_and(|x| x.role.is_mod())
         {
             return_projects.push(project.id);
         } else if user_option.is_some() {
@@ -158,7 +155,7 @@ pub async fn filter_enlisted_projects_ids(
         )
         .fetch(pool)
         .map_ok(|row| {
-            for x in projects.iter() {
+            for x in &projects {
                 let bool =
                     Some(x.id.0) == row.id && Some(x.team_id.0) == row.team_id;
                 if bool {
@@ -238,7 +235,6 @@ pub async fn filter_visible_version_ids(
     redis: &RedisPool,
 ) -> Result<Vec<crate::database::models::DBVersionId>, ApiError> {
     let mut return_versions = Vec::new();
-    let mut check_versions = Vec::new();
 
     // First, filter out versions belonging to projects we can't see
     // (ie: a hidden project, but public version, should still be hidden)
@@ -271,15 +267,10 @@ pub async fn filter_visible_version_ids(
         // - we are enlisted on the team of the mod
         if (!version.status.is_hidden()
             && visible_project_ids.contains(&version.project_id))
-            || user_option
-                .as_ref()
-                .map(|x| x.role.is_mod())
-                .unwrap_or(false)
+            || user_option.as_ref().is_some_and(|x| x.role.is_mod())
             || enlisted_version_ids.contains(&version.id)
         {
             return_versions.push(version.id);
-        } else if user_option.is_some() {
-            check_versions.push(version);
         }
     }
 
@@ -310,10 +301,7 @@ pub async fn filter_enlisted_version_ids(
     .await?;
 
     for version in versions {
-        if user_option
-            .as_ref()
-            .map(|x| x.role.is_mod())
-            .unwrap_or(false)
+        if user_option.as_ref().is_some_and(|x| x.role.is_mod())
             || (user_option.is_some()
                 && authorized_project_ids.contains(&version.project_id))
         {
@@ -349,10 +337,7 @@ pub async fn filter_visible_collections(
 
     for collection in collections {
         if !collection.status.is_hidden()
-            || user_option
-                .as_ref()
-                .map(|x| x.role.is_mod())
-                .unwrap_or(false)
+            || user_option.as_ref().is_some_and(|x| x.role.is_mod())
         {
             return_collections.push(collection.into());
         } else if user_option.is_some() {
diff --git a/apps/labrinth/src/auth/oauth/mod.rs b/apps/labrinth/src/auth/oauth/mod.rs
index 488b0ae2b..5a5d54670 100644
--- a/apps/labrinth/src/auth/oauth/mod.rs
+++ b/apps/labrinth/src/auth/oauth/mod.rs
@@ -1,3 +1,5 @@
+use std::fmt::Write;
+
 use crate::auth::get_user_from_headers;
 use crate::auth::oauth::uris::{OAuthRedirectUris, ValidatedRedirectUri};
 use crate::auth::validate::extract_authorization_header;
@@ -17,7 +19,7 @@ use crate::queue::session::AuthQueue;
 use actix_web::http::header::{CACHE_CONTROL, LOCATION, PRAGMA};
 use actix_web::web::{Data, Query, ServiceConfig};
 use actix_web::{HttpRequest, HttpResponse, get, post, web};
-use chrono::Duration;
+use chrono::{DateTime, Duration};
 use rand::distributions::Alphanumeric;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha20Rng;
@@ -68,7 +70,7 @@ pub async fn init_oauth(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_AUTH_WRITE]),
+        Scopes::USER_AUTH_WRITE,
     )
     .await?
     .1;
@@ -280,8 +282,8 @@ pub async fn request_token(
                 authorization_id,
                 token_hash,
                 scopes,
-                created: Default::default(),
-                expires: Default::default(),
+                created: DateTime::default(),
+                expires: DateTime::default(),
                 last_used: None,
                 client_id,
                 user_id,
@@ -323,7 +325,7 @@ pub async fn accept_or_reject_client_scopes(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -456,7 +458,7 @@ fn append_params_to_uri(uri: &str, params: &[impl AsRef<str>]) -> String {
     let mut uri = uri.to_string();
     let mut connector = if uri.contains('?') { "&" } else { "?" };
     for param in params {
-        uri.push_str(&format!("{}{}", connector, param.as_ref()));
+        write!(&mut uri, "{connector}{}", param.as_ref()).unwrap();
         connector = "&";
     }
 
diff --git a/apps/labrinth/src/auth/validate.rs b/apps/labrinth/src/auth/validate.rs
index fd88eb9e7..21d085839 100644
--- a/apps/labrinth/src/auth/validate.rs
+++ b/apps/labrinth/src/auth/validate.rs
@@ -15,7 +15,7 @@ pub async fn get_user_from_headers<'a, E>(
     executor: E,
     redis: &RedisPool,
     session_queue: &AuthQueue,
-    required_scopes: Option<&[Scopes]>,
+    required_scopes: Scopes,
 ) -> Result<(Scopes, User), AuthenticationError>
 where
     E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
@@ -33,12 +33,8 @@ where
 
     let user = User::from_full(db_user);
 
-    if let Some(required_scopes) = required_scopes {
-        for scope in required_scopes {
-            if !scopes.contains(*scope) {
-                return Err(AuthenticationError::InvalidCredentials);
-            }
-        }
+    if !scopes.contains(required_scopes) {
+        return Err(AuthenticationError::InvalidCredentials);
     }
 
     Ok((scopes, user))
@@ -97,12 +93,11 @@ where
                     .await?;
 
             let rate_limit_ignore = dotenvy::var("RATE_LIMIT_IGNORE_KEY")?;
-            if !req
+            if req
                 .headers()
                 .get("x-ratelimit-key")
                 .and_then(|x| x.to_str().ok())
-                .map(|x| x == rate_limit_ignore)
-                .unwrap_or(false)
+                .is_none_or(|x| x != rate_limit_ignore)
             {
                 let metadata = get_session_metadata(req).await?;
                 session_queue.add_session(session.id, metadata).await;
@@ -134,7 +129,7 @@ where
 
             user.map(|u| (access_token.scopes, u))
         }
-        Some(("github", _)) | Some(("gho", _)) | Some(("ghp", _)) => {
+        Some(("github" | "gho" | "ghp", _)) => {
             let user = AuthProvider::GitHub.get_user(token).await?;
             let id =
                 AuthProvider::GitHub.get_user_id(&user.id, executor).await?;
@@ -175,7 +170,7 @@ pub async fn check_is_moderator_from_headers<'a, 'b, E>(
     executor: E,
     redis: &RedisPool,
     session_queue: &AuthQueue,
-    required_scopes: Option<&[Scopes]>,
+    required_scopes: Scopes,
 ) -> Result<User, AuthenticationError>
 where
     E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
diff --git a/apps/labrinth/src/database/models/friend_item.rs b/apps/labrinth/src/database/models/friend_item.rs
index d39d627e6..1514057d1 100644
--- a/apps/labrinth/src/database/models/friend_item.rs
+++ b/apps/labrinth/src/database/models/friend_item.rs
@@ -105,7 +105,7 @@ impl DBFriend {
             created: row.created,
             accepted: row.accepted,
         })
-        .filter(|x| accepted.map(|y| y == x.accepted).unwrap_or(true))
+        .filter(|x| accepted.is_none_or(|y| y == x.accepted))
         .collect::<Vec<_>>();
 
         Ok(friends)
diff --git a/apps/labrinth/src/database/models/loader_fields.rs b/apps/labrinth/src/database/models/loader_fields.rs
index fcfcd9593..da293ae6c 100644
--- a/apps/labrinth/src/database/models/loader_fields.rs
+++ b/apps/labrinth/src/database/models/loader_fields.rs
@@ -675,7 +675,7 @@ impl LoaderFieldEnumValue {
             .into_iter()
             .filter(|x| {
                 let mut bool = true;
-                for (key, value) in filter.iter() {
+                for (key, value) in &filter {
                     if let Some(metadata_value) = x.metadata.get(key) {
                         bool &= metadata_value == value;
                     } else {
@@ -713,7 +713,7 @@ impl VersionField {
                     query_version_fields.push(base.clone().with_string_value(s))
                 }
                 VersionFieldValue::Boolean(b) => query_version_fields
-                    .push(base.clone().with_int_value(if b { 1 } else { 0 })),
+                    .push(base.clone().with_int_value(b as i32)),
                 VersionFieldValue::ArrayInteger(v) => {
                     for i in v {
                         query_version_fields
@@ -728,9 +728,8 @@ impl VersionField {
                 }
                 VersionFieldValue::ArrayBoolean(v) => {
                     for b in v {
-                        query_version_fields.push(
-                            base.clone().with_int_value(if b { 1 } else { 0 }),
-                        );
+                        query_version_fields
+                            .push(base.clone().with_int_value(b as i32));
                     }
                 }
                 VersionFieldValue::Enum(_, v) => query_version_fields
@@ -757,7 +756,7 @@ impl VersionField {
                     l.field_id.0,
                     l.version_id.0,
                     l.int_value,
-                    l.enum_value.as_ref().map(|e| e.0).unwrap_or(-1),
+                    l.enum_value.as_ref().map_or(-1, |e| e.0),
                     l.string_value.clone(),
                 )
             })
@@ -849,12 +848,11 @@ impl VersionField {
         query_loader_fields
             .iter()
             .flat_map(|q| {
-                let loader_field_type = match LoaderFieldType::build(
+                let Some(loader_field_type) = LoaderFieldType::build(
                     &q.field_type,
                     q.enum_type.map(|l| l.0),
-                ) {
-                    Some(lft) => lft,
-                    None => return vec![],
+                ) else {
+                    return vec![];
                 };
                 let loader_field = LoaderField {
                     id: q.id,
@@ -1085,23 +1083,17 @@ impl VersionFieldValue {
         };
 
         // Check errors- version_id must all be the same
+        // If the field type is a non-array, then the reason for multiple version ids is that there are multiple versions being aggregated, and those version ids are contained within.
+        // If the field type is an array, then the reason for multiple version ids is that there are multiple values for a single version
+        // (or a greater aggregation between multiple arrays, in which case the per-field version is lost, so we just take the first one and use it for that)
         let version_id = qvfs
             .iter()
             .map(|qvf| qvf.version_id)
             .unique()
-            .collect::<Vec<_>>();
-        // If the field type is a non-array, then the reason for multiple version ids is that there are multiple versions being aggregated, and those version ids are contained within.
-        // If the field type is an array, then the reason for multiple version ids is that there are multiple values for a single version
-        // (or a greater aggregation between multiple arrays, in which case the per-field version is lost, so we just take the first one and use it for that)
-        let version_id =
-            version_id.into_iter().next().unwrap_or(DBVersionId(0));
+            .next()
+            .unwrap_or(DBVersionId(0));
 
-        let field_id = qvfs
-            .iter()
-            .map(|qvf| qvf.field_id)
-            .unique()
-            .collect::<Vec<_>>();
-        if field_id.len() > 1 {
+        if qvfs.iter().map(|qvf| qvf.field_id).unique().count() > 1 {
             return Err(DatabaseError::SchemaError(format!(
                 "Multiple field ids for field {field_name}"
             )));
@@ -1274,7 +1266,7 @@ impl VersionFieldValue {
         };
 
         // Sort arrayenums by ordering, then by created
-        for (_, v) in value.iter_mut() {
+        for (_, v) in &mut value {
             if let VersionFieldValue::ArrayEnum(_, v) = v {
                 v.sort_by(|a, b| {
                     a.ordering.cmp(&b.ordering).then(a.created.cmp(&b.created))
@@ -1317,8 +1309,8 @@ impl VersionFieldValue {
         }
     }
 
-    // For conversion to an interanl string(s), such as for search facets, filtering, or direct hardcoding
-    // No matter the type, it will be converted to a Vec<String>, whre the non-array types will have a single element
+    // For conversion to an internal string(s), such as for search facets, filtering, or direct hardcoding
+    // No matter the type, it will be converted to a Vec<String>, where the non-array types will have a single element
     pub fn as_strings(&self) -> Vec<String> {
         match self {
             VersionFieldValue::Integer(i) => vec![i.to_string()],
@@ -1343,22 +1335,19 @@ impl VersionFieldValue {
             VersionFieldValue::Integer(i) => value.as_i64() == Some(*i as i64),
             VersionFieldValue::Text(s) => value.as_str() == Some(s),
             VersionFieldValue::Boolean(b) => value.as_bool() == Some(*b),
-            VersionFieldValue::ArrayInteger(v) => value
-                .as_i64()
-                .map(|i| v.contains(&(i as i32)))
-                .unwrap_or(false),
-            VersionFieldValue::ArrayText(v) => value
-                .as_str()
-                .map(|s| v.contains(&s.to_string()))
-                .unwrap_or(false),
+            VersionFieldValue::ArrayInteger(v) => {
+                value.as_i64().is_some_and(|i| v.contains(&(i as i32)))
+            }
+            VersionFieldValue::ArrayText(v) => {
+                value.as_str().is_some_and(|s| v.contains(&s.to_string()))
+            }
             VersionFieldValue::ArrayBoolean(v) => {
-                value.as_bool().map(|b| v.contains(&b)).unwrap_or(false)
+                value.as_bool().is_some_and(|b| v.contains(&b))
             }
             VersionFieldValue::Enum(_, v) => value.as_str() == Some(&v.value),
             VersionFieldValue::ArrayEnum(_, v) => value
                 .as_str()
-                .map(|s| v.iter().any(|v| v.value == s))
-                .unwrap_or(false),
+                .is_some_and(|s| v.iter().any(|v| v.value == s)),
         }
     }
 }
diff --git a/apps/labrinth/src/database/models/organization_item.rs b/apps/labrinth/src/database/models/organization_item.rs
index 30922bf24..56637d01f 100644
--- a/apps/labrinth/src/database/models/organization_item.rs
+++ b/apps/labrinth/src/database/models/organization_item.rs
@@ -122,7 +122,7 @@ impl DBOrganization {
                 |ids| async move {
                     let org_ids: Vec<i64> = ids
                         .iter()
-                        .flat_map(|x| parse_base62(&x.to_string()).ok())
+                        .filter_map(|x| parse_base62(&x.to_string()).ok())
                         .map(|x| x as i64)
                         .collect();
                     let slugs = ids
diff --git a/apps/labrinth/src/database/models/pat_item.rs b/apps/labrinth/src/database/models/pat_item.rs
index 6cf308213..5f760d579 100644
--- a/apps/labrinth/src/database/models/pat_item.rs
+++ b/apps/labrinth/src/database/models/pat_item.rs
@@ -108,7 +108,7 @@ impl DBPersonalAccessToken {
                 |ids| async move {
                     let pat_ids: Vec<i64> = ids
                         .iter()
-                        .flat_map(|x| parse_base62(&x.to_string()).ok())
+                        .filter_map(|x| parse_base62(&x.to_string()).ok())
                         .map(|x| x as i64)
                         .collect();
                     let slugs = ids.into_iter().map(|x| x.to_string()).collect::<Vec<_>>();
diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs
index b22c4cb54..362907bda 100644
--- a/apps/labrinth/src/database/models/project_item.rs
+++ b/apps/labrinth/src/database/models/project_item.rs
@@ -6,7 +6,9 @@ use super::{DBUser, ids::*};
 use crate::database::models;
 use crate::database::models::DatabaseError;
 use crate::database::redis::RedisPool;
-use crate::models::projects::{MonetizationStatus, ProjectStatus};
+use crate::models::projects::{
+    MonetizationStatus, ProjectStatus, SideTypesMigrationReviewStatus,
+};
 use ariadne::ids::base62_impl::parse_base62;
 use chrono::{DateTime, Utc};
 use dashmap::{DashMap, DashSet};
@@ -210,6 +212,8 @@ impl ProjectBuilder {
             webhook_sent: false,
             color: self.color,
             monetization_status: self.monetization_status,
+            side_types_migration_review_status:
+                SideTypesMigrationReviewStatus::Reviewed,
             loaders: vec![],
         };
         project_struct.insert(&mut *transaction).await?;
@@ -288,6 +292,7 @@ pub struct DBProject {
     pub webhook_sent: bool,
     pub color: Option<u32>,
     pub monetization_status: MonetizationStatus,
+    pub side_types_migration_review_status: SideTypesMigrationReviewStatus,
     pub loaders: Vec<String>,
 }
 
@@ -302,13 +307,15 @@ impl DBProject {
                 id, team_id, name, summary, description,
                 published, downloads, icon_url, raw_icon_url, status, requested_status,
                 license_url, license,
-                slug, color, monetization_status, organization_id
+                slug, color, monetization_status, organization_id,
+                side_types_migration_review_status
             )
             VALUES (
                 $1, $2, $3, $4, $5, $6,
                 $7, $8, $9, $10, $11,
                 $12, $13,
-                LOWER($14), $15, $16, $17
+                LOWER($14), $15, $16, $17,
+                $18
             )
             ",
             self.id as DBProjectId,
@@ -328,6 +335,7 @@ impl DBProject {
             self.color.map(|x| x as i32),
             self.monetization_status.as_str(),
             self.organization_id.map(|x| x.0 as i64),
+            self.side_types_migration_review_status.as_str()
         )
         .execute(&mut **transaction)
         .await?;
@@ -545,7 +553,7 @@ impl DBProject {
                 let mut exec = exec.acquire().await?;
                 let project_ids_parsed: Vec<i64> = ids
                     .iter()
-                    .flat_map(|x| parse_base62(&x.to_string()).ok())
+                    .filter_map(|x| parse_base62(&x.to_string()).ok())
                     .map(|x| x as i64)
                     .collect();
                 let slugs = ids
@@ -723,7 +731,7 @@ impl DBProject {
 
                         // Add loader fields to the set we need to fetch
                         let loader_loader_field_ids = m.loader_fields.unwrap_or_default().into_iter().map(LoaderFieldId).collect::<Vec<_>>();
-                        for loader_field_id in loader_loader_field_ids.iter() {
+                        for loader_field_id in &loader_loader_field_ids {
                             loader_field_ids.insert(*loader_field_id);
                         }
 
@@ -770,6 +778,7 @@ impl DBProject {
                     m.team_id team_id, m.organization_id organization_id, m.license license, m.slug slug, m.moderation_message moderation_message, m.moderation_message_body moderation_message_body,
                     m.webhook_sent, m.color,
                     t.id thread_id, m.monetization_status monetization_status,
+                    m.side_types_migration_review_status side_types_migration_review_status,
                     ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is false) categories,
                     ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is true) additional_categories
                     FROM mods m
@@ -835,6 +844,9 @@ impl DBProject {
                                 monetization_status: MonetizationStatus::from_string(
                                     &m.monetization_status,
                                 ),
+                                side_types_migration_review_status: SideTypesMigrationReviewStatus::from_string(
+                                    &m.side_types_migration_review_status,
+                                ),
                                 loaders,
                             },
                             categories: m.categories.unwrap_or_default(),
diff --git a/apps/labrinth/src/database/models/session_item.rs b/apps/labrinth/src/database/models/session_item.rs
index c728a8367..0203d52e6 100644
--- a/apps/labrinth/src/database/models/session_item.rs
+++ b/apps/labrinth/src/database/models/session_item.rs
@@ -153,7 +153,7 @@ impl DBSession {
             |ids| async move {
                 let session_ids: Vec<i64> = ids
                     .iter()
-                    .flat_map(|x| parse_base62(&x.to_string()).ok())
+                    .filter_map(|x| parse_base62(&x.to_string()).ok())
                     .map(|x| x as i64)
                     .collect();
                 let slugs = ids
diff --git a/apps/labrinth/src/database/models/team_item.rs b/apps/labrinth/src/database/models/team_item.rs
index 641b89fb1..ec32a143b 100644
--- a/apps/labrinth/src/database/models/team_item.rs
+++ b/apps/labrinth/src/database/models/team_item.rs
@@ -45,7 +45,7 @@ impl TeamBuilder {
         .await?;
 
         let mut team_member_ids = Vec::new();
-        for _ in self.members.iter() {
+        for _ in &self.members {
             team_member_ids.push(generate_team_member_id(transaction).await?.0);
         }
         let TeamBuilder { members } = self;
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index 4f9af3b88..b29687094 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -163,7 +163,7 @@ impl DBUser {
             |ids| async move {
                 let user_ids: Vec<i64> = ids
                     .iter()
-                    .flat_map(|x| parse_base62(&x.to_string()).ok())
+                    .filter_map(|x| parse_base62(&x.to_string()).ok())
                     .map(|x| x as i64)
                     .collect();
                 let slugs = ids
@@ -224,24 +224,46 @@ impl DBUser {
         Ok(val)
     }
 
-    pub async fn get_email<'a, E>(
+    pub async fn get_by_email<'a, E>(
         email: &str,
         exec: E,
     ) -> Result<Option<DBUserId>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
-        let user_pass = sqlx::query!(
+        let user = sqlx::query!(
             "
             SELECT id FROM users
             WHERE email = $1
             ",
             email
         )
+        .map(|row| DBUserId(row.id))
         .fetch_optional(exec)
         .await?;
 
-        Ok(user_pass.map(|x| DBUserId(x.id)))
+        Ok(user)
+    }
+
+    pub async fn get_by_case_insensitive_email<'a, E>(
+        email: &str,
+        exec: E,
+    ) -> Result<Vec<DBUserId>, sqlx::Error>
+    where
+        E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
+    {
+        let users = sqlx::query!(
+            "
+            SELECT id FROM users
+            WHERE LOWER(email) = LOWER($1)
+            ",
+            email
+        )
+        .map(|row| DBUserId(row.id))
+        .fetch_all(exec)
+        .await?;
+
+        Ok(users)
     }
 
     pub async fn get_projects<'a, E>(
diff --git a/apps/labrinth/src/database/models/version_item.rs b/apps/labrinth/src/database/models/version_item.rs
index 3a4edb765..0aae95b29 100644
--- a/apps/labrinth/src/database/models/version_item.rs
+++ b/apps/labrinth/src/database/models/version_item.rs
@@ -52,7 +52,7 @@ impl DependencyBuilder {
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         let mut project_ids = Vec::new();
-        for dependency in builders.iter() {
+        for dependency in &builders {
             project_ids.push(
                 dependency
                     .try_get_project_id(transaction)
@@ -333,9 +333,7 @@ impl DBVersion {
     ) -> Result<Option<()>, DatabaseError> {
         let result = Self::get(id, &mut **transaction, redis).await?;
 
-        let result = if let Some(result) = result {
-            result
-        } else {
+        let Some(result) = result else {
             return Ok(None);
         };
 
@@ -550,7 +548,7 @@ impl DBVersion {
 
                         // Add loader fields to the set we need to fetch
                         let loader_loader_field_ids = m.loader_fields.unwrap_or_default().into_iter().map(LoaderFieldId).collect::<Vec<_>>();
-                        for loader_field_id in loader_loader_field_ids.iter() {
+                        for loader_field_id in &loader_loader_field_ids {
                             loader_field_ids.insert(*loader_field_id);
                         }
 
@@ -756,7 +754,7 @@ impl DBVersion {
                                 let mut files = files.into_iter().map(|x| {
                                     let mut file_hashes = HashMap::new();
 
-                                    for hash in hashes.iter() {
+                                    for hash in &hashes {
                                         if hash.file_id == x.id {
                                             file_hashes.insert(
                                                 hash.algorithm.clone(),
@@ -852,7 +850,7 @@ impl DBVersion {
                     ORDER BY v.date_published
                     ",
                     algorithm,
-                    &file_ids.into_iter().flat_map(|x| x.split('_').last().map(|x| x.as_bytes().to_vec())).collect::<Vec<_>>(),
+                    &file_ids.into_iter().filter_map(|x| x.split('_').last().map(|x| x.as_bytes().to_vec())).collect::<Vec<_>>(),
                 )
                     .fetch(executor)
                     .try_fold(DashMap::new(), |acc, f| {
@@ -1042,14 +1040,14 @@ mod tests {
             date_published,
             project_id: DBProjectId(0),
             author_id: DBUserId(0),
-            name: Default::default(),
-            version_number: Default::default(),
-            changelog: Default::default(),
-            downloads: Default::default(),
-            version_type: Default::default(),
-            featured: Default::default(),
+            name: String::new(),
+            version_number: String::new(),
+            changelog: String::new(),
+            downloads: 0,
+            version_type: String::new(),
+            featured: false,
             status: VersionStatus::Listed,
-            requested_status: Default::default(),
+            requested_status: None,
         }
     }
 }
diff --git a/apps/labrinth/src/database/redis.rs b/apps/labrinth/src/database/redis.rs
index 913701ed1..9d3197c48 100644
--- a/apps/labrinth/src/database/redis.rs
+++ b/apps/labrinth/src/database/redis.rs
@@ -3,6 +3,7 @@ use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use chrono::{TimeZone, Utc};
 use dashmap::DashMap;
 use deadpool_redis::{Config, Runtime};
+use futures::future::Either;
 use prometheus::{IntGauge, Registry};
 use redis::{Cmd, ExistenceCheck, SetExpiry, SetOptions, cmd};
 use serde::de::DeserializeOwned;
@@ -11,7 +12,6 @@ use std::collections::HashMap;
 use std::fmt::{Debug, Display};
 use std::future::Future;
 use std::hash::Hash;
-use std::pin::Pin;
 use std::time::Duration;
 
 const DEFAULT_EXPIRY: i64 = 60 * 60 * 12; // 12 hours
@@ -378,22 +378,10 @@ impl RedisPool {
             }
         }
 
-        #[allow(clippy::type_complexity)]
-        let mut fetch_tasks: Vec<
-            Pin<
-                Box<
-                    dyn Future<
-                        Output = Result<
-                            HashMap<K, RedisValue<T, K, S>>,
-                            DatabaseError,
-                        >,
-                    >,
-                >,
-            >,
-        > = Vec::new();
+        let mut fetch_tasks = Vec::new();
 
         if !ids.is_empty() {
-            fetch_tasks.push(Box::pin(async {
+            fetch_tasks.push(Either::Left(async {
                 let fetch_ids =
                     ids.iter().map(|x| x.value().clone()).collect::<Vec<_>>();
 
@@ -491,7 +479,7 @@ impl RedisPool {
         }
 
         if !subscribe_ids.is_empty() {
-            fetch_tasks.push(Box::pin(async {
+            fetch_tasks.push(Either::Right(async {
                 let mut interval =
                     tokio::time::interval(Duration::from_millis(100));
                 let start = Utc::now();
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index 66007a9a2..99a75a2e2 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -313,13 +313,16 @@ pub fn app_config(
     .app_data(labrinth_config.automated_moderation_queue.clone())
     .app_data(web::Data::new(labrinth_config.stripe_client.clone()))
     .app_data(labrinth_config.rate_limiter.clone())
-    .configure(
-        #[allow(unused_variables)]
-        |cfg| {
-            #[cfg(target_os = "linux")]
-            routes::debug::config(cfg)
-        },
-    )
+    .configure({
+        #[cfg(target_os = "linux")]
+        {
+            |cfg| routes::debug::config(cfg)
+        }
+        #[cfg(not(target_os = "linux"))]
+        {
+            |_cfg| ()
+        }
+    })
     .configure(routes::v2::config)
     .configure(routes::v3::config)
     .configure(routes::internal::config)
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index 25a7b9f3f..065239a18 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -8,6 +8,7 @@ use labrinth::file_hosting::S3Host;
 use labrinth::search;
 use labrinth::util::ratelimit::rate_limit_middleware;
 use labrinth::{check_env_vars, clickhouse, database, file_hosting, queue};
+use std::ffi::CStr;
 use std::sync::Arc;
 use tracing::{error, info};
 use tracing_actix_web::TracingLogger;
@@ -16,10 +17,8 @@ use tracing_actix_web::TracingLogger;
 #[global_allocator]
 static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
-#[allow(non_upper_case_globals)]
 #[unsafe(export_name = "malloc_conf")]
-pub static malloc_conf: &[u8] =
-    b"prof:true,prof_active:true,lg_prof_sample:19\0";
+pub static MALLOC_CONF: &CStr = c"prof:true,prof_active:true,lg_prof_sample:19";
 
 #[derive(Clone)]
 pub struct Pepper {
diff --git a/apps/labrinth/src/models/v2/projects.rs b/apps/labrinth/src/models/v2/projects.rs
index 35a340f0b..0af1e53fe 100644
--- a/apps/labrinth/src/models/v2/projects.rs
+++ b/apps/labrinth/src/models/v2/projects.rs
@@ -127,7 +127,7 @@ impl LegacyProject {
             .collect();
 
         if let Some(versions_item) = versions_item {
-            // Extract side types from remaining fields (singleplayer, client_only, etc)
+            // Extract side types from remaining fields
             let fields = versions_item
                 .version_fields
                 .iter()
@@ -135,10 +135,11 @@ impl LegacyProject {
                     (f.field_name.clone(), f.value.clone().serialize_internal())
                 })
                 .collect::<HashMap<_, _>>();
-            (client_side, server_side) = v2_reroute::convert_side_types_v2(
-                &fields,
-                Some(&*og_project_type),
-            );
+            (client_side, server_side) =
+                v2_reroute::convert_v3_side_types_to_v2_side_types(
+                    &fields,
+                    Some(&*og_project_type),
+                );
 
             // - if loader is mrpack, this is a modpack
             // the loaders are whatever the corresponding loader fields are
diff --git a/apps/labrinth/src/models/v2/search.rs b/apps/labrinth/src/models/v2/search.rs
index dfc9356b7..1aabaca14 100644
--- a/apps/labrinth/src/models/v2/search.rs
+++ b/apps/labrinth/src/models/v2/search.rs
@@ -102,28 +102,20 @@ impl LegacyResultSearchProject {
 
         let project_loader_fields =
             result_search_project.project_loader_fields.clone();
-        let get_one_bool_loader_field = |key: &str| {
+        let get_one_string_loader_field = |key: &str| {
             project_loader_fields
                 .get(key)
-                .cloned()
-                .unwrap_or_default()
+                .map_or(&[][..], |values| values.as_slice())
                 .first()
-                .and_then(|s| s.as_bool())
+                .and_then(|s| s.as_str())
         };
 
-        let singleplayer = get_one_bool_loader_field("singleplayer");
-        let client_only =
-            get_one_bool_loader_field("client_only").unwrap_or(false);
-        let server_only =
-            get_one_bool_loader_field("server_only").unwrap_or(false);
-        let client_and_server = get_one_bool_loader_field("client_and_server");
+        let environment =
+            get_one_string_loader_field("environment").unwrap_or("unknown");
 
         let (client_side, server_side) =
-            v2_reroute::convert_side_types_v2_bools(
-                singleplayer,
-                client_only,
-                server_only,
-                client_and_server,
+            v2_reroute::convert_v3_environment_to_v2_side_types(
+                environment,
                 Some(&*og_project_type),
             );
         let client_side = client_side.to_string();
diff --git a/apps/labrinth/src/models/v3/billing.rs b/apps/labrinth/src/models/v3/billing.rs
index 1e9055e5d..2757a7fc9 100644
--- a/apps/labrinth/src/models/v3/billing.rs
+++ b/apps/labrinth/src/models/v3/billing.rs
@@ -49,6 +49,7 @@ pub enum Price {
 #[serde(rename_all = "kebab-case")]
 pub enum PriceDuration {
     Monthly,
+    Quarterly,
     Yearly,
 }
 
@@ -56,6 +57,7 @@ impl PriceDuration {
     pub fn duration(&self) -> chrono::Duration {
         match self {
             PriceDuration::Monthly => chrono::Duration::days(30),
+            PriceDuration::Quarterly => chrono::Duration::days(90),
             PriceDuration::Yearly => chrono::Duration::days(365),
         }
     }
@@ -63,19 +65,27 @@ impl PriceDuration {
     pub fn from_string(string: &str) -> PriceDuration {
         match string {
             "monthly" => PriceDuration::Monthly,
+            "quarterly" => PriceDuration::Quarterly,
             "yearly" => PriceDuration::Yearly,
             _ => PriceDuration::Monthly,
         }
     }
+
     pub fn as_str(&self) -> &'static str {
         match self {
             PriceDuration::Monthly => "monthly",
+            PriceDuration::Quarterly => "quarterly",
             PriceDuration::Yearly => "yearly",
         }
     }
 
     pub fn iterator() -> impl Iterator<Item = PriceDuration> {
-        vec![PriceDuration::Monthly, PriceDuration::Yearly].into_iter()
+        vec![
+            PriceDuration::Monthly,
+            PriceDuration::Quarterly,
+            PriceDuration::Yearly,
+        ]
+        .into_iter()
     }
 }
 
@@ -135,7 +145,7 @@ impl SubscriptionStatus {
 #[derive(Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "kebab-case")]
 pub enum SubscriptionMetadata {
-    Pyro { id: String },
+    Pyro { id: String, region: Option<String> },
 }
 
 #[derive(Serialize, Deserialize)]
diff --git a/apps/labrinth/src/models/v3/projects.rs b/apps/labrinth/src/models/v3/projects.rs
index 55631a6f6..56d241d3b 100644
--- a/apps/labrinth/src/models/v3/projects.rs
+++ b/apps/labrinth/src/models/v3/projects.rs
@@ -1,4 +1,5 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
+use std::mem;
 
 use crate::database::models::loader_fields::VersionField;
 use crate::database::models::project_item::{LinkUrl, ProjectQueryResult};
@@ -8,6 +9,7 @@ use crate::models::ids::{
 };
 use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
+use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
@@ -90,24 +92,14 @@ pub struct Project {
     /// The monetization status of this project
     pub monetization_status: MonetizationStatus,
 
+    /// The status of the manual review of the migration of side types of this project
+    pub side_types_migration_review_status: SideTypesMigrationReviewStatus,
+
     /// Aggregated loader-fields across its myriad of versions
     #[serde(flatten)]
     pub fields: HashMap<String, Vec<serde_json::Value>>,
 }
 
-fn remove_duplicates(values: Vec<serde_json::Value>) -> Vec<serde_json::Value> {
-    let mut seen = HashSet::new();
-    values
-        .into_iter()
-        .filter(|value| {
-            // Convert the JSON value to a string for comparison
-            let as_string = value.to_string();
-            // Check if the string is already in the set
-            seen.insert(as_string)
-        })
-        .collect()
-}
-
 // This is a helper function to convert a list of VersionFields into a HashMap of field name to vecs of values
 // This allows for removal of duplicates
 pub fn from_duplicate_version_fields(
@@ -132,9 +124,9 @@ pub fn from_duplicate_version_fields(
         }
     }
 
-    // Remove duplicates by converting to string and back
-    for (_, v) in fields.iter_mut() {
-        *v = remove_duplicates(v.clone());
+    // Remove duplicates
+    for v in fields.values_mut() {
+        *v = mem::take(v).into_iter().unique().collect_vec();
     }
     fields
 }
@@ -217,6 +209,8 @@ impl From<ProjectQueryResult> for Project {
             color: m.color,
             thread_id: data.thread_id.into(),
             monetization_status: m.monetization_status,
+            side_types_migration_review_status: m
+                .side_types_migration_review_status,
             fields,
         }
     }
@@ -530,6 +524,9 @@ impl ProjectStatus {
     }
 
     // Project can be displayed in search
+    // IMPORTANT: if this is changed, make sure to update the `mods_searchable_ids_gist`
+    // index in the DB to keep random project queries fast (see the
+    // `20250609134334_spatial-random-project-index.sql` migration)
     pub fn is_searchable(&self) -> bool {
         matches!(self, ProjectStatus::Approved | ProjectStatus::Archived)
     }
@@ -596,6 +593,35 @@ impl MonetizationStatus {
     }
 }
 
+/// Represents the status of the manual review of the migration of side types of this
+/// project to the new environment field.
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq)]
+#[serde(rename_all = "kebab-case")]
+pub enum SideTypesMigrationReviewStatus {
+    /// The project has been reviewed to use the new environment side types appropriately.
+    Reviewed,
+    /// The project has been automatically migrated to the new environment side types, but
+    /// the appropriateness of such migration has not been reviewed.
+    Pending,
+}
+
+impl SideTypesMigrationReviewStatus {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            SideTypesMigrationReviewStatus::Reviewed => "reviewed",
+            SideTypesMigrationReviewStatus::Pending => "pending",
+        }
+    }
+
+    pub fn from_string(string: &str) -> SideTypesMigrationReviewStatus {
+        match string {
+            "reviewed" => SideTypesMigrationReviewStatus::Reviewed,
+            "pending" => SideTypesMigrationReviewStatus::Pending,
+            _ => SideTypesMigrationReviewStatus::Reviewed,
+        }
+    }
+}
+
 /// A specific version of a project
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Version {
@@ -624,7 +650,7 @@ pub struct Version {
     pub downloads: u32,
     /// The type of the release - `Alpha`, `Beta`, or `Release`.
     pub version_type: VersionType,
-    /// The status of tne version
+    /// The status of the version
     pub status: VersionStatus,
     /// The requested status of the version (used for scheduling)
     pub requested_status: Option<VersionStatus>,
@@ -854,7 +880,6 @@ impl std::fmt::Display for VersionType {
 }
 
 impl VersionType {
-    // These are constant, so this can remove unneccessary allocations (`to_string`)
     pub fn as_str(&self) -> &'static str {
         match self {
             VersionType::Release => "release",
@@ -880,7 +905,7 @@ impl std::fmt::Display for DependencyType {
 }
 
 impl DependencyType {
-    // These are constant, so this can remove unneccessary allocations (`to_string`)
+    // These are constant, so this can remove unnecessary allocations (`to_string`)
     pub fn as_str(&self) -> &'static str {
         match self {
             DependencyType::Required => "required",
diff --git a/apps/labrinth/src/queue/moderation.rs b/apps/labrinth/src/queue/moderation.rs
index 49c2e38c2..b74315839 100644
--- a/apps/labrinth/src/queue/moderation.rs
+++ b/apps/labrinth/src/queue/moderation.rs
@@ -16,6 +16,7 @@ use serde::{Deserialize, Serialize};
 use sha1::Digest;
 use sqlx::PgPool;
 use std::collections::HashMap;
+use std::fmt::Write;
 use std::io::{Cursor, Read};
 use std::time::Duration;
 use zip::ZipArchive;
@@ -33,29 +34,31 @@ impl ModerationMessages {
     }
 
     pub fn markdown(&self, auto_mod: bool) -> String {
-        let mut str = "".to_string();
+        let mut str = String::new();
 
         for message in &self.messages {
-            str.push_str(&format!("## {}\n", message.header()));
-            str.push_str(&format!("{}\n", message.body()));
-            str.push('\n');
+            write!(&mut str, "## {}\n{}\n\n", message.header(), message.body())
+                .unwrap();
         }
 
         for (version_num, messages) in &self.version_specific {
             for message in messages {
-                str.push_str(&format!(
-                    "## Version {}: {}\n",
+                write!(
+                    &mut str,
+                    "### Version {}: {}\n{}\n\n",
                     version_num,
-                    message.header()
-                ));
-                str.push_str(&format!("{}\n", message.body()));
-                str.push('\n');
+                    message.header(),
+                    message.body()
+                )
+                .unwrap();
             }
         }
 
         if auto_mod {
-            str.push_str("<hr />\n\n");
-            str.push_str("🤖 This is an automated message generated by AutoMod (BETA). If you are facing issues, please [contact support](https://support.modrinth.com).");
+            str.push_str(
+                "<hr />\n\n\
+                🤖 This is an automated message generated by AutoMod (BETA). If you are facing issues, please [contact support](https://support.modrinth.com)."
+            );
         }
 
         str
@@ -146,14 +149,13 @@ impl ModerationMessage {
         match self {
             ModerationMessage::NoPrimaryFile => "Please attach a file to this version. All files on Modrinth must have files associated with their versions.\n".to_string(),
             ModerationMessage::PackFilesNotAllowed { files, .. } => {
-                let mut str = "".to_string();
-                str.push_str("This pack redistributes copyrighted material. Please refer to [Modrinth's guide on obtaining modpack permissions](https://support.modrinth.com/en/articles/8797527-obtaining-modpack-permissions) for more information.\n\n");
+                let mut str = String::from("This pack redistributes copyrighted material. Please refer to [Modrinth's guide on obtaining modpack permissions](https://support.modrinth.com/en/articles/8797527-obtaining-modpack-permissions) for more information.\n\n");
 
                 let mut attribute_mods = Vec::new();
                 let mut no_mods = Vec::new();
                 let mut permanent_no_mods = Vec::new();
                 let mut unidentified_mods = Vec::new();
-                for (_, approval) in files.iter() {
+                for approval in files.values() {
                     match approval.status {
                         ApprovalType::Yes | ApprovalType::WithAttributionAndSource  => {}
                         ApprovalType::WithAttribution => attribute_mods.push(&approval.file_name),
@@ -166,7 +168,7 @@ impl ModerationMessage {
                 fn print_mods(projects: Vec<&String>, headline: &str, val: &mut String) {
                     if projects.is_empty() { return }
 
-                    val.push_str(&format!("{headline}\n\n"));
+                    write!(val, "{headline}\n\n").unwrap();
 
                     for project in &projects {
                         let additional_text = if project.contains("ftb-quests") {
@@ -181,11 +183,11 @@ impl ModerationMessage {
                             None
                         };
 
-                        val.push_str(&if let Some(additional_text) = additional_text {
-                            format!("- {project} (consider using [{}](https://modrinth.com/project/{}) instead)\n", additional_text.0, additional_text.1)
+                        if let Some(additional_text) = additional_text {
+                            writeln!(val, "- {project} (consider using [{}](https://modrinth.com/project/{}) instead)", additional_text.0, additional_text.1).unwrap();
                         } else {
-                            format!("- {project}\n")
-                        })
+                            writeln!(val, "- {project}").unwrap();
+                        }
                     }
 
                     if !projects.is_empty() {
@@ -242,7 +244,7 @@ impl AutomatedModerationQueue {
                                 version_specific: HashMap::new(),
                             };
 
-                            if project.project_types.iter().any(|x| ["mod", "modpack"].contains(&&**x)) && !project.aggregate_version_fields.iter().any(|x| ["server_only", "client_only", "client_and_server", "singleplayer"].contains(&&*x.field_name)) {
+                            if project.project_types.iter().any(|x| ["mod", "modpack"].contains(&&**x)) && !project.aggregate_version_fields.iter().any(|x| x.field_name == "environment") {
                                 mod_messages.messages.push(ModerationMessage::NoSideTypes);
                             }
 
@@ -278,10 +280,7 @@ impl AutomatedModerationQueue {
                                     let mut zip = ZipArchive::new(reader)?;
 
                                     let pack: PackFormat = {
-                                        let mut file =
-                                            if let Ok(file) = zip.by_name("modrinth.index.json") {
-                                                file
-                                            } else {
+                                        let Ok(mut file) = zip.by_name("modrinth.index.json") else {
                                                 continue;
                                             };
 
@@ -301,7 +300,7 @@ impl AutomatedModerationQueue {
                                         .files
                                         .clone()
                                         .into_iter()
-                                        .flat_map(|x| {
+                                        .filter_map(|x| {
                                             let hash = x.hashes.get(&PackFileHash::Sha1);
 
                                             if let Some(hash) = hash {
@@ -397,8 +396,8 @@ impl AutomatedModerationQueue {
                                             ",
                                             serde_json::to_value(&MissingMetadata {
                                                 identified: final_hashes,
-                                                flame_files: Default::default(),
-                                                unknown_files: Default::default(),
+                                                flame_files: HashMap::new(),
+                                                unknown_files: HashMap::new(),
                                             })?,
                                             primary_file.id.0
                                         )
@@ -432,8 +431,8 @@ impl AutomatedModerationQueue {
                                     if hashes.is_empty() {
                                         let metadata = MissingMetadata {
                                             identified: final_hashes,
-                                            flame_files: Default::default(),
-                                            unknown_files: Default::default(),
+                                            flame_files: HashMap::new(),
+                                            unknown_files: HashMap::new(),
                                         };
 
                                         sqlx::query!(
@@ -533,8 +532,8 @@ impl AutomatedModerationQueue {
                                     if hashes.is_empty() {
                                         let metadata = MissingMetadata {
                                             identified: final_hashes,
-                                            flame_files: Default::default(),
-                                            unknown_files: Default::default(),
+                                            flame_files: HashMap::new(),
+                                            unknown_files: HashMap::new(),
                                         };
 
                                         sqlx::query!(
@@ -622,8 +621,7 @@ impl AutomatedModerationQueue {
 
                             if !mod_messages.is_empty() {
                                 let first_time = database::models::DBThread::get(project.thread_id, &pool).await?
-                                    .map(|x| x.messages.iter().all(|x| x.author_id == Some(database::models::DBUserId(AUTOMOD_ID)) || x.hide_identity))
-                                    .unwrap_or(true);
+                                    .is_none_or(|x| x.messages.iter().all(|x| x.author_id == Some(database::models::DBUserId(AUTOMOD_ID)) || x.hide_identity));
 
                                 let mut transaction = pool.begin().await?;
                                 let id = ThreadMessageBuilder {
@@ -733,10 +731,12 @@ impl AutomatedModerationQueue {
                         if let Err(err) = res {
                             let err = err.as_api_error();
 
-                            let mut str = String::new();
-                            str.push_str("## Internal AutoMod Error\n\n");
-                            str.push_str(&format!("Error code: {}\n\n", err.error));
-                            str.push_str(&format!("Error description: {}\n\n", err.description));
+                            let str = format!(
+                                "## Internal AutoMod Error\n\n\
+                                Error code: {}\n\n\
+                                Error description: {}\n\n",
+                                err.error, err.description
+                            );
 
                             let mut transaction = pool.begin().await?;
                             ThreadMessageBuilder {
diff --git a/apps/labrinth/src/queue/payouts.rs b/apps/labrinth/src/queue/payouts.rs
index b6e950317..b2742b3ba 100644
--- a/apps/labrinth/src/queue/payouts.rs
+++ b/apps/labrinth/src/queue/payouts.rs
@@ -193,9 +193,12 @@ impl PayoutsQueue {
                 pub error_description: String,
             }
 
-            if let Ok(error) =
+            if let Ok(mut error) =
                 serde_json::from_value::<PayPalError>(value.clone())
             {
+                if error.name == "INSUFFICIENT_FUNDS" {
+                    error.message = "We're currently transferring funds to our PayPal account. Please try again in a couple days.".to_string();
+                }
                 return Err(ApiError::Payments(format!(
                     "error name: {}, message: {}",
                     error.name, error.message
@@ -387,6 +390,7 @@ impl PayoutsQueue {
                     "bank",
                     "ach",
                     "visa_card",
+                    "charity",
                 ];
 
                 if !SUPPORTED_METHODS.contains(&&*product.category)
@@ -437,8 +441,8 @@ impl PayoutsQueue {
                         }
                     } else {
                         PayoutMethodFee {
-                            percentage: Default::default(),
-                            min: Default::default(),
+                            percentage: Decimal::default(),
+                            min: Decimal::default(),
                             max: None,
                         }
                     },
@@ -829,7 +833,7 @@ pub async fn process_payout(
         .map(|x| (x.project_id, x.page_views))
         .collect::<HashMap<u64, u64>>();
 
-    for (key, value) in downloads_values.iter() {
+    for (key, value) in &downloads_values {
         let counter = views_values.entry(*key).or_insert(0);
         *counter += *value;
     }
diff --git a/apps/labrinth/src/routes/analytics.rs b/apps/labrinth/src/routes/analytics.rs
index 9ca6bfeb1..5f4fd5a5a 100644
--- a/apps/labrinth/src/routes/analytics.rs
+++ b/apps/labrinth/src/routes/analytics.rs
@@ -55,10 +55,15 @@ pub async fn page_view_ingest(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let user =
-        get_user_from_headers(&req, &**pool, &redis, &session_queue, None)
-            .await
-            .ok();
+    let user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::empty(),
+    )
+    .await
+    .ok();
     let conn_info = req.connection_info().peer_addr().map(|x| x.to_string());
 
     let url = Url::parse(&url_input.url).map_err(|_| {
@@ -177,7 +182,7 @@ pub async fn playtime_ingest(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PERFORM_ANALYTICS]),
+        Scopes::PERFORM_ANALYTICS,
     )
     .await?;
 
@@ -211,7 +216,7 @@ pub async fn playtime_ingest(
                 version_id: version.inner.id.0 as u64,
                 loader: playtime.loader,
                 game_version: playtime.game_version,
-                parent: playtime.parent.map(|x| x.0).unwrap_or(0),
+                parent: playtime.parent.map_or(0, |x| x.0),
             });
         }
     }
diff --git a/apps/labrinth/src/routes/internal/admin.rs b/apps/labrinth/src/routes/internal/admin.rs
index 817803e94..0833b6500 100644
--- a/apps/labrinth/src/routes/internal/admin.rs
+++ b/apps/labrinth/src/routes/internal/admin.rs
@@ -18,6 +18,7 @@ use actix_web::{HttpRequest, HttpResponse, get, patch, post, web};
 use serde::Deserialize;
 use sqlx::PgPool;
 use std::collections::HashMap;
+use std::fmt::Write;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
 use tracing::info;
@@ -221,9 +222,11 @@ pub async fn delphi_result_ingest(
 
     for (issue, trace) in &body.issues {
         for (path, code) in trace {
-            header.push_str(&format!(
+            write!(
+                &mut header,
                 "\n issue {issue} found at file {path}: \n ```\n{code}\n```"
-            ));
+            )
+            .unwrap();
         }
     }
 
@@ -244,12 +247,15 @@ pub async fn delphi_result_ingest(
 
     for (issue, trace) in &body.issues {
         for path in trace.keys() {
-            thread_header
-                .push_str(&format!("\n\n- issue {issue} found at file {path}"));
+            write!(
+                &mut thread_header,
+                "\n\n- issue {issue} found at file {path}"
+            )
+            .unwrap();
         }
 
         if trace.is_empty() {
-            thread_header.push_str(&format!("\n\n- issue {issue} found",));
+            write!(&mut thread_header, "\n\n- issue {issue} found").unwrap();
         }
     }
 
diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index b0dc2f58e..c4a6f9f28 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -102,7 +102,7 @@ pub async fn subscriptions(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -161,7 +161,7 @@ pub async fn refund_charge(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -325,7 +325,7 @@ pub async fn edit_subscription(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -531,11 +531,9 @@ pub async fn edit_subscription(
 
                 if let Some(payment_method) = &edit_subscription.payment_method
                 {
-                    let payment_method_id = if let Ok(id) =
+                    let Ok(payment_method_id) =
                         PaymentMethodId::from_str(payment_method)
-                    {
-                        id
-                    } else {
+                    else {
                         return Err(ApiError::InvalidInput(
                             "Invalid payment method id".to_string(),
                         ));
@@ -585,7 +583,7 @@ pub async fn user_customer(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -623,7 +621,7 @@ pub async fn charges(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -682,7 +680,7 @@ pub async fn add_payment_method_flow(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -736,16 +734,14 @@ pub async fn edit_payment_method(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
 
     let (id,) = info.into_inner();
 
-    let payment_method_id = if let Ok(id) = PaymentMethodId::from_str(&id) {
-        id
-    } else {
+    let Ok(payment_method_id) = PaymentMethodId::from_str(&id) else {
         return Err(ApiError::NotFound);
     };
 
@@ -766,10 +762,7 @@ pub async fn edit_payment_method(
     )
     .await?;
 
-    if payment_method
-        .customer
-        .map(|x| x.id() == customer)
-        .unwrap_or(false)
+    if payment_method.customer.is_some_and(|x| x.id() == customer)
         || user.role.is_admin()
     {
         stripe::Customer::update(
@@ -805,16 +798,14 @@ pub async fn remove_payment_method(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
 
     let (id,) = info.into_inner();
 
-    let payment_method_id = if let Ok(id) = PaymentMethodId::from_str(&id) {
-        id
-    } else {
+    let Ok(payment_method_id) = PaymentMethodId::from_str(&id) else {
         return Err(ApiError::NotFound);
     };
 
@@ -864,10 +855,7 @@ pub async fn remove_payment_method(
         }
     }
 
-    if payment_method
-        .customer
-        .map(|x| x.id() == customer)
-        .unwrap_or(false)
+    if payment_method.customer.is_some_and(|x| x.id() == customer)
         || user.role.is_admin()
     {
         stripe::PaymentMethod::detach(&stripe_client, &payment_method_id)
@@ -892,7 +880,7 @@ pub async fn payment_methods(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -954,17 +942,19 @@ pub async fn active_servers(
         pub server_id: String,
         pub price_id: crate::models::ids::ProductPriceId,
         pub interval: PriceDuration,
+        pub region: Option<String>,
     }
 
     let server_ids = servers
         .into_iter()
         .filter_map(|x| {
             x.metadata.as_ref().map(|metadata| match metadata {
-                SubscriptionMetadata::Pyro { id } => ActiveServer {
+                SubscriptionMetadata::Pyro { id, region } => ActiveServer {
                     user_id: x.user_id.into(),
                     server_id: id.clone(),
                     price_id: x.price_id.into(),
                     interval: x.interval,
+                    region: region.clone(),
                 },
             })
         })
@@ -997,6 +987,7 @@ pub enum ChargeRequestType {
 pub enum PaymentRequestMetadata {
     Pyro {
         server_name: Option<String>,
+        server_region: Option<String>,
         source: serde_json::Value,
     },
 }
@@ -1019,6 +1010,7 @@ fn infer_currency_code(country: &str) -> String {
         "BE" => "EUR",
         "CY" => "EUR",
         "EE" => "EUR",
+        "ES" => "EUR",
         "FI" => "EUR",
         "FR" => "EUR",
         "DE" => "EUR",
@@ -1065,6 +1057,7 @@ fn infer_currency_code(country: &str) -> String {
         "TW" => "TWD",
         "SA" => "SAR",
         "QA" => "QAR",
+        "SG" => "SGD",
         _ => "USD",
     }
     .to_string()
@@ -1084,7 +1077,7 @@ pub async fn initiate_payment(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -1301,6 +1294,12 @@ pub async fn initiate_payment(
             amount: Some(price),
             currency: Some(stripe_currency),
             customer: Some(customer),
+            metadata: interval.map(|interval| {
+                HashMap::from([(
+                    "modrinth_subscription_interval".to_string(),
+                    interval.as_str().to_string(),
+                )])
+            }),
             ..Default::default()
         };
 
@@ -1426,8 +1425,6 @@ pub async fn stripe_webhook(
             pub user_subscription_item:
                 Option<user_subscription_item::DBUserSubscription>,
             pub payment_metadata: Option<PaymentRequestMetadata>,
-            #[allow(dead_code)]
-            pub charge_type: ChargeType,
         }
 
         #[allow(clippy::too_many_arguments)]
@@ -1442,24 +1439,20 @@ pub async fn stripe_webhook(
             transaction: &mut Transaction<'_, Postgres>,
         ) -> Result<PaymentIntentMetadata, ApiError> {
             'metadata: {
-                let user_id = if let Some(user_id) = metadata
+                let Some(user_id) = metadata
                     .get("modrinth_user_id")
                     .and_then(|x| parse_base62(x).ok())
                     .map(|x| crate::database::models::ids::DBUserId(x as i64))
-                {
-                    user_id
-                } else {
+                else {
                     break 'metadata;
                 };
 
-                let user = if let Some(user) =
+                let Some(user) =
                     crate::database::models::user_item::DBUser::get_id(
                         user_id, pool, redis,
                     )
                     .await?
-                {
-                    user
-                } else {
+                else {
                     break 'metadata;
                 };
 
@@ -1467,22 +1460,20 @@ pub async fn stripe_webhook(
                     .get("modrinth_payment_metadata")
                     .and_then(|x| serde_json::from_str(x).ok());
 
-                let charge_id = if let Some(charge_id) = metadata
+                let Some(charge_id) = metadata
                     .get("modrinth_charge_id")
                     .and_then(|x| parse_base62(x).ok())
-                    .map(|x| crate::database::models::ids::DBChargeId(x as i64))
-                {
-                    charge_id
-                } else {
+                    .map(|x| {
+                        crate::database::models::ids::DBChargeId(x as i64)
+                    })
+                else {
                     break 'metadata;
                 };
 
-                let charge_type = if let Some(charge_type) = metadata
+                let Some(charge_type) = metadata
                     .get("modrinth_charge_type")
                     .map(|x| ChargeType::from_string(x))
-                {
-                    charge_type
-                } else {
+                else {
                     break 'metadata;
                 };
 
@@ -1494,21 +1485,19 @@ pub async fn stripe_webhook(
                     )
                     .await?
                 {
-                    let price = if let Some(price) =
-                        product_item::DBProductPrice::get(charge.price_id, pool)
-                            .await?
-                    {
-                        price
-                    } else {
+                    let Some(price) = product_item::DBProductPrice::get(
+                        charge.price_id,
+                        pool,
+                    )
+                    .await?
+                    else {
                         break 'metadata;
                     };
 
-                    let product = if let Some(product) =
+                    let Some(product) =
                         product_item::DBProduct::get(price.product_id, pool)
                             .await?
-                    {
-                        product
-                    } else {
+                    else {
                         break 'metadata;
                     };
 
@@ -1519,15 +1508,13 @@ pub async fn stripe_webhook(
                     charge.upsert(transaction).await?;
 
                     if let Some(subscription_id) = charge.subscription_id {
-                        let mut subscription = if let Some(subscription) =
+                        let Some(mut subscription) =
                             user_subscription_item::DBUserSubscription::get(
                                 subscription_id,
                                 pool,
                             )
                             .await?
-                        {
-                            subscription
-                        } else {
+                        else {
                             break 'metadata;
                         };
 
@@ -1556,58 +1543,49 @@ pub async fn stripe_webhook(
                         (charge, price, product, None)
                     }
                 } else {
-                    let price_id = if let Some(price_id) = metadata
+                    let Some(price_id) = metadata
                         .get("modrinth_price_id")
                         .and_then(|x| parse_base62(x).ok())
                         .map(|x| {
                             crate::database::models::ids::DBProductPriceId(
                                 x as i64,
                             )
-                        }) {
-                        price_id
-                    } else {
+                        })
+                    else {
                         break 'metadata;
                     };
 
-                    let price = if let Some(price) =
+                    let Some(price) =
                         product_item::DBProductPrice::get(price_id, pool)
                             .await?
-                    {
-                        price
-                    } else {
+                    else {
                         break 'metadata;
                     };
 
-                    let product = if let Some(product) =
+                    let Some(product) =
                         product_item::DBProduct::get(price.product_id, pool)
                             .await?
-                    {
-                        product
-                    } else {
+                    else {
                         break 'metadata;
                     };
 
                     let subscription = match &price.prices {
                         Price::OneTime { .. } => None,
                         Price::Recurring { intervals } => {
-                            let interval = if let Some(interval) = metadata
+                            let Some(interval) = metadata
                                 .get("modrinth_subscription_interval")
                                 .map(|x| PriceDuration::from_string(x))
-                            {
-                                interval
-                            } else {
+                            else {
                                 break 'metadata;
                             };
 
                             if intervals.get(&interval).is_some() {
-                                let subscription_id = if let Some(subscription_id) = metadata
+                                let Some(subscription_id) = metadata
                                     .get("modrinth_subscription_id")
                                     .and_then(|x| parse_base62(x).ok())
                                     .map(|x| {
                                         crate::database::models::ids::DBUserSubscriptionId(x as i64)
-                                    }) {
-                                    subscription_id
-                                } else {
+                                    }) else {
                                     break 'metadata;
                                 };
 
@@ -1676,7 +1654,6 @@ pub async fn stripe_webhook(
                     charge_item: charge,
                     user_subscription_item: subscription,
                     payment_metadata,
-                    charge_type,
                 });
             }
 
@@ -1755,8 +1732,10 @@ pub async fn stripe_webhook(
                             {
                                 let client = reqwest::Client::new();
 
-                                if let Some(SubscriptionMetadata::Pyro { id }) =
-                                    &subscription.metadata
+                                if let Some(SubscriptionMetadata::Pyro {
+                                    id,
+                                    region: _,
+                                }) = &subscription.metadata
                                 {
                                     client
                                         .post(format!(
@@ -1789,33 +1768,39 @@ pub async fn stripe_webhook(
                                         .await?
                                         .error_for_status()?;
                                 } else {
-                                    let (server_name, source) = if let Some(
-                                        PaymentRequestMetadata::Pyro {
-                                            ref server_name,
-                                            ref source,
-                                        },
-                                    ) =
-                                        metadata.payment_metadata
-                                    {
-                                        (server_name.clone(), source.clone())
-                                    } else {
-                                        // Create a server with the latest version of Minecraft
-                                        let minecraft_versions = crate::database::models::legacy_loader_fields::MinecraftGameVersion::list(
-                                            Some("release"),
-                                            None,
-                                            &**pool,
-                                            &redis,
-                                        ).await?;
+                                    let (server_name, server_region, source) =
+                                        if let Some(
+                                            PaymentRequestMetadata::Pyro {
+                                                ref server_name,
+                                                ref server_region,
+                                                ref source,
+                                            },
+                                        ) = metadata.payment_metadata
+                                        {
+                                            (
+                                                server_name.clone(),
+                                                server_region.clone(),
+                                                source.clone(),
+                                            )
+                                        } else {
+                                            // Create a server with the latest version of Minecraft
+                                            let minecraft_versions = crate::database::models::legacy_loader_fields::MinecraftGameVersion::list(
+                                                Some("release"),
+                                                None,
+                                                &**pool,
+                                                &redis,
+                                            ).await?;
 
-                                        (
-                                            None,
-                                            serde_json::json!({
-                                                "loader": "Vanilla",
-                                                "game_version": minecraft_versions.first().map(|x| x.version.clone()),
-                                                "loader_version": ""
-                                            }),
-                                        )
-                                    };
+                                            (
+                                                None,
+                                                None,
+                                                serde_json::json!({
+                                                    "loader": "Vanilla",
+                                                    "game_version": minecraft_versions.first().map(|x| x.version.clone()),
+                                                    "loader_version": ""
+                                                }),
+                                            )
+                                        };
 
                                     let server_name = server_name
                                         .unwrap_or_else(|| {
@@ -1845,9 +1830,11 @@ pub async fn stripe_webhook(
                                                 "swap_mb": swap,
                                                 "storage_mb": storage,
                                             },
+                                            "region": server_region,
                                             "source": source,
                                             "payment_interval": metadata.charge_item.subscription_interval.map(|x| match x {
                                                 PriceDuration::Monthly => 1,
+                                                PriceDuration::Quarterly => 3,
                                                 PriceDuration::Yearly => 12,
                                             })
                                         }))
@@ -1863,6 +1850,7 @@ pub async fn stripe_webhook(
                                         subscription.metadata =
                                             Some(SubscriptionMetadata::Pyro {
                                                 id: res.uuid,
+                                                region: server_region,
                                             });
                                     }
                                 }
@@ -2027,10 +2015,9 @@ pub async fn stripe_webhook(
                         )
                         .await?;
 
-                        if !customer
+                        if customer
                             .invoice_settings
-                            .map(|x| x.default_payment_method.is_some())
-                            .unwrap_or(false)
+                            .is_none_or(|x| x.default_payment_method.is_none())
                         {
                             stripe::Customer::update(
                                 &stripe_client,
@@ -2165,12 +2152,10 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
         .await?;
 
         for charge in all_charges {
-            let subscription = if let Some(subscription) = all_subscriptions
+            let Some(subscription) = all_subscriptions
                 .iter_mut()
                 .find(|x| Some(x.id) == charge.subscription_id)
-            {
-                subscription
-            } else {
+            else {
                 continue;
             };
 
@@ -2178,29 +2163,23 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
                 continue;
             }
 
-            let product_price = if let Some(product_price) = subscription_prices
+            let Some(product_price) = subscription_prices
                 .iter()
                 .find(|x| x.id == subscription.price_id)
-            {
-                product_price
-            } else {
+            else {
                 continue;
             };
 
-            let product = if let Some(product) = subscription_products
+            let Some(product) = subscription_products
                 .iter()
                 .find(|x| x.id == product_price.product_id)
-            {
-                product
-            } else {
+            else {
                 continue;
             };
 
-            let user = if let Some(user) =
+            let Some(user) =
                 users.iter().find(|x| x.id == subscription.user_id)
-            {
-                user
-            } else {
+            else {
                 continue;
             };
 
@@ -2223,7 +2202,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
                     true
                 }
                 ProductMetadata::Pyro { .. } => {
-                    if let Some(SubscriptionMetadata::Pyro { id }) =
+                    if let Some(SubscriptionMetadata::Pyro { id, region: _ }) =
                         &subscription.metadata
                     {
                         let res = reqwest::Client::new()
@@ -2328,19 +2307,14 @@ pub async fn index_billing(
         .await?;
 
         for mut charge in charges_to_do {
-            let product_price = if let Some(price) =
+            let Some(product_price) =
                 prices.iter().find(|x| x.id == charge.price_id)
-            {
-                price
-            } else {
+            else {
                 continue;
             };
 
-            let user = if let Some(user) =
-                users.iter().find(|x| x.id == charge.user_id)
-            {
-                user
-            } else {
+            let Some(user) = users.iter().find(|x| x.id == charge.user_id)
+            else {
                 continue;
             };
 
@@ -2377,17 +2351,14 @@ pub async fn index_billing(
                 )
                 .await?;
 
-                let currency = match Currency::from_str(
+                let Ok(currency) = Currency::from_str(
                     &product_price.currency_code.to_lowercase(),
-                ) {
-                    Ok(x) => x,
-                    Err(_) => {
-                        warn!(
-                            "Could not find currency for {}",
-                            product_price.currency_code
-                        );
-                        continue;
-                    }
+                ) else {
+                    warn!(
+                        "Could not find currency for {}",
+                        product_price.currency_code
+                    );
+                    continue;
                 };
 
                 let mut intent =
diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index 2707693f8..01e35efb0 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -1,6 +1,7 @@
 use crate::auth::email::send_email;
 use crate::auth::validate::get_user_record_from_bearer_token;
 use crate::auth::{AuthProvider, AuthenticationError, get_user_from_headers};
+use crate::database::models::DBUser;
 use crate::database::models::flow_item::DBFlow;
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
@@ -76,7 +77,7 @@ impl TempUser {
         redis: &RedisPool,
     ) -> Result<crate::database::models::DBUserId, AuthenticationError> {
         if let Some(email) = &self.email {
-            if crate::database::models::DBUser::get_email(email, client)
+            if crate::database::models::DBUser::get_by_email(email, client)
                 .await?
                 .is_some()
             {
@@ -1243,12 +1244,12 @@ pub async fn delete_auth_provider(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_AUTH_WRITE]),
+        Scopes::USER_AUTH_WRITE,
     )
     .await?
     .1;
 
-    if !user.auth_providers.map(|x| x.len() > 1).unwrap_or(false)
+    if user.auth_providers.is_none_or(|x| x.len() <= 1)
         && !user.has_password.unwrap_or(false)
     {
         return Err(ApiError::InvalidInput(
@@ -1385,9 +1386,12 @@ pub async fn create_account_with_password(
         .hash_password(new_account.password.as_bytes(), &salt)?
         .to_string();
 
-    if crate::database::models::DBUser::get_email(&new_account.email, &**pool)
-        .await?
-        .is_some()
+    if crate::database::models::DBUser::get_by_email(
+        &new_account.email,
+        &**pool,
+    )
+    .await?
+    .is_some()
     {
         return Err(ApiError::InvalidInput(
             "Email is already registered on Modrinth!".to_string(),
@@ -1450,7 +1454,8 @@ pub async fn create_account_with_password(
 
 #[derive(Deserialize, Validate)]
 pub struct Login {
-    pub username: String,
+    #[serde(rename = "username")]
+    pub username_or_email: String,
     pub password: String,
     pub challenge: String,
 }
@@ -1466,14 +1471,17 @@ pub async fn login_password(
         return Err(ApiError::Turnstile);
     }
 
-    let user = if let Some(user) =
-        crate::database::models::DBUser::get(&login.username, &**pool, &redis)
-            .await?
+    let user = if let Some(user) = crate::database::models::DBUser::get(
+        &login.username_or_email,
+        &**pool,
+        &redis,
+    )
+    .await?
     {
         user
     } else {
-        let user = crate::database::models::DBUser::get_email(
-            &login.username,
+        let user = crate::database::models::DBUser::get_by_email(
+            &login.username_or_email,
             &**pool,
         )
         .await?
@@ -1663,7 +1671,7 @@ pub async fn begin_2fa_flow(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_AUTH_WRITE]),
+        Scopes::USER_AUTH_WRITE,
     )
     .await?
     .1;
@@ -1708,7 +1716,7 @@ pub async fn finish_2fa_flow(
             &**pool,
             &redis,
             &session_queue,
-            Some(&[Scopes::USER_AUTH_WRITE]),
+            Scopes::USER_AUTH_WRITE,
         )
         .await?
         .1;
@@ -1903,7 +1911,8 @@ pub async fn remove_2fa(
 
 #[derive(Deserialize)]
 pub struct ResetPassword {
-    pub username: String,
+    #[serde(rename = "username")]
+    pub username_or_email: String,
     pub challenge: String,
 }
 
@@ -1918,46 +1927,77 @@ pub async fn reset_password_begin(
         return Err(ApiError::Turnstile);
     }
 
-    let user = if let Some(user_id) =
-        crate::database::models::DBUser::get_email(
-            &reset_password.username,
+    let user =
+        match crate::database::models::DBUser::get_by_case_insensitive_email(
+            &reset_password.username_or_email,
             &**pool,
         )
-        .await?
-    {
-        crate::database::models::DBUser::get_id(user_id, &**pool, &redis)
-            .await?
-    } else {
-        crate::database::models::DBUser::get(
-            &reset_password.username,
-            &**pool,
-            &redis,
-        )
-        .await?
-    };
+        .await?[..]
+        {
+            [] => {
+                // Try finding by username or ID
+                crate::database::models::DBUser::get(
+                    &reset_password.username_or_email,
+                    &**pool,
+                    &redis,
+                )
+                .await?
+            }
+            [user_id] => {
+                // If there is only one user with the given email, ignoring case,
+                // we can assume it's the user we want to reset the password for
+                crate::database::models::DBUser::get_id(
+                    user_id, &**pool, &redis,
+                )
+                .await?
+            }
+            _ => {
+                // When several users use variations of the same email with
+                // different cases, we cannot reliably tell which user should
+                // receive the password reset email, so fall back to case sensitive
+                // search to avoid spamming multiple users
+                if let Some(user_id) =
+                    crate::database::models::DBUser::get_by_email(
+                        &reset_password.username_or_email,
+                        &**pool,
+                    )
+                    .await?
+                {
+                    crate::database::models::DBUser::get_id(
+                        user_id, &**pool, &redis,
+                    )
+                    .await?
+                } else {
+                    None
+                }
+            }
+        };
 
-    if let Some(user) = user {
-        let flow = DBFlow::ForgotPassword { user_id: user.id }
+    if let Some(DBUser {
+        id: user_id,
+        email: Some(email),
+        ..
+    }) = user
+    {
+        let flow = DBFlow::ForgotPassword { user_id }
             .insert(Duration::hours(24), &redis)
             .await?;
 
-        if let Some(email) = user.email {
-            send_email(
-                email,
-                "Reset your password",
-                "Please visit the following link below to reset your password. If the button does not work, you can copy the link and paste it into your browser.",
-                "If you did not request for your password to be reset, you can safely ignore this email.",
-                Some((
-                    "Reset password",
-                    &format!(
-                        "{}/{}?flow={}",
-                        dotenvy::var("SITE_URL")?,
-                        dotenvy::var("SITE_RESET_PASSWORD_PATH")?,
-                        flow
-                    ),
-                )),
-            )?;
-        }
+        send_email(
+            email,
+            "Reset your password",
+            "Please visit the following link below to reset your password. If the button does not work, you can copy the link and paste it into your browser.",
+            "If you did not request for your password to be reset, you can safely ignore this email.",
+            Some((
+                "Reset password",
+                &format!(
+                    "{}/{}?flow={}",
+                    dotenvy::var("SITE_URL")?,
+                    dotenvy::var("SITE_RESET_PASSWORD_PATH")?,
+                    flow
+                ),
+            )),
+        )?;
     }
 
     Ok(HttpResponse::Ok().finish())
@@ -2140,7 +2180,7 @@ pub async fn set_email(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_AUTH_WRITE]),
+        Scopes::USER_AUTH_WRITE,
     )
     .await?
     .1;
@@ -2223,7 +2263,7 @@ pub async fn resend_verify_email(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_AUTH_WRITE]),
+        Scopes::USER_AUTH_WRITE,
     )
     .await?
     .1;
@@ -2328,7 +2368,7 @@ pub async fn subscribe_newsletter(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_AUTH_WRITE]),
+        Scopes::USER_AUTH_WRITE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/internal/gdpr.rs b/apps/labrinth/src/routes/internal/gdpr.rs
index 37ac90af3..ecc8b9848 100644
--- a/apps/labrinth/src/routes/internal/gdpr.rs
+++ b/apps/labrinth/src/routes/internal/gdpr.rs
@@ -22,7 +22,7 @@ pub async fn export(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/internal/moderation.rs b/apps/labrinth/src/routes/internal/moderation.rs
index e889f8731..797d11334 100644
--- a/apps/labrinth/src/routes/internal/moderation.rs
+++ b/apps/labrinth/src/routes/internal/moderation.rs
@@ -39,7 +39,7 @@ pub async fn get_projects(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await?;
 
@@ -82,7 +82,7 @@ pub async fn get_project_meta(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await?;
 
@@ -234,7 +234,7 @@ pub async fn set_project_meta(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await?;
 
diff --git a/apps/labrinth/src/routes/internal/pats.rs b/apps/labrinth/src/routes/internal/pats.rs
index aa1116822..ad0ebe942 100644
--- a/apps/labrinth/src/routes/internal/pats.rs
+++ b/apps/labrinth/src/routes/internal/pats.rs
@@ -39,7 +39,7 @@ pub async fn get_pats(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAT_READ]),
+        Scopes::PAT_READ,
     )
     .await?
     .1;
@@ -99,7 +99,7 @@ pub async fn create_pat(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAT_CREATE]),
+        Scopes::PAT_CREATE,
     )
     .await?
     .1;
@@ -174,7 +174,7 @@ pub async fn edit_pat(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAT_WRITE]),
+        Scopes::PAT_WRITE,
     )
     .await?
     .1;
@@ -266,7 +266,7 @@ pub async fn delete_pat(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAT_DELETE]),
+        Scopes::PAT_DELETE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/internal/session.rs b/apps/labrinth/src/routes/internal/session.rs
index a647206e3..63ac84bd8 100644
--- a/apps/labrinth/src/routes/internal/session.rs
+++ b/apps/labrinth/src/routes/internal/session.rs
@@ -141,7 +141,7 @@ pub async fn list(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_READ]),
+        Scopes::SESSION_READ,
     )
     .await?
     .1;
@@ -178,7 +178,7 @@ pub async fn delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_DELETE]),
+        Scopes::SESSION_DELETE,
     )
     .await?
     .1;
@@ -212,10 +212,15 @@ pub async fn refresh(
     redis: Data<RedisPool>,
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let current_user =
-        get_user_from_headers(&req, &**pool, &redis, &session_queue, None)
-            .await?
-            .1;
+    let current_user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::empty(),
+    )
+    .await?
+    .1;
     let session = req
         .headers()
         .get(AUTHORIZATION)
diff --git a/apps/labrinth/src/routes/internal/statuses.rs b/apps/labrinth/src/routes/internal/statuses.rs
index 0f4efae44..7be8d40ea 100644
--- a/apps/labrinth/src/routes/internal/statuses.rs
+++ b/apps/labrinth/src/routes/internal/statuses.rs
@@ -217,8 +217,7 @@ pub async fn ws_init(
                         if status
                             .profile_name
                             .as_ref()
-                            .map(|x| x.len() > 64)
-                            .unwrap_or(false)
+                            .is_some_and(|x| x.len() > 64)
                         {
                             return;
                         }
diff --git a/apps/labrinth/src/routes/maven.rs b/apps/labrinth/src/routes/maven.rs
index db209410a..878f6dabc 100644
--- a/apps/labrinth/src/routes/maven.rs
+++ b/apps/labrinth/src/routes/maven.rs
@@ -88,7 +88,7 @@ pub async fn maven_metadata(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -250,7 +250,7 @@ fn find_file<'a>(
     // Minecraft mods are not going to be both a mod and a modpack, so this minecraft-specific handling is fine
     // As there can be multiple project types, returns the first allowable match
     let mut fileexts = vec![];
-    for project_type in version.project_types.iter() {
+    for project_type in &version.project_types {
         match project_type.as_str() {
             "mod" => fileexts.push("jar"),
             "modpack" => fileexts.push("mrpack"),
@@ -294,7 +294,7 @@ pub async fn version_file(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -360,7 +360,7 @@ pub async fn version_file_sha1(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -381,8 +381,10 @@ pub async fn version_file_sha1(
 
     Ok(find_file(&project_id, &vnum, &version, &file)
         .and_then(|file| file.hashes.get("sha1"))
-        .map(|hash_str| HttpResponse::Ok().body(hash_str.clone()))
-        .unwrap_or_else(|| HttpResponse::NotFound().body("")))
+        .map_or_else(
+            || HttpResponse::NotFound().body(""),
+            |hash_str| HttpResponse::Ok().body(hash_str.clone()),
+        ))
 }
 
 #[get("maven/modrinth/{id}/{versionnum}/{file}.sha512")]
@@ -405,7 +407,7 @@ pub async fn version_file_sha512(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -426,6 +428,8 @@ pub async fn version_file_sha512(
 
     Ok(find_file(&project_id, &vnum, &version, &file)
         .and_then(|file| file.hashes.get("sha512"))
-        .map(|hash_str| HttpResponse::Ok().body(hash_str.clone()))
-        .unwrap_or_else(|| HttpResponse::NotFound().body("")))
+        .map_or_else(
+            || HttpResponse::NotFound().body(""),
+            |hash_str| HttpResponse::Ok().body(hash_str.clone()),
+        ))
 }
diff --git a/apps/labrinth/src/routes/updates.rs b/apps/labrinth/src/routes/updates.rs
index 05d9b2403..08fe83fbe 100644
--- a/apps/labrinth/src/routes/updates.rs
+++ b/apps/labrinth/src/routes/updates.rs
@@ -51,7 +51,7 @@ pub async fn forge_updates(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
diff --git a/apps/labrinth/src/routes/v2/project_creation.rs b/apps/labrinth/src/routes/v2/project_creation.rs
index 540b3a6e1..9a4562430 100644
--- a/apps/labrinth/src/routes/v2/project_creation.rs
+++ b/apps/labrinth/src/routes/v2/project_creation.rs
@@ -158,10 +158,12 @@ pub async fn project_create(
                 .into_iter()
                 .map(|v| {
                     let mut fields = HashMap::new();
-                    fields.extend(v2_reroute::convert_side_types_v3(
-                        client_side,
-                        server_side,
-                    ));
+                    fields.extend(
+                        v2_reroute::convert_v2_side_types_to_v3_side_types(
+                            client_side,
+                            server_side,
+                        ),
+                    );
                     fields.insert(
                         "game_versions".to_string(),
                         json!(v.game_versions),
diff --git a/apps/labrinth/src/routes/v2/projects.rs b/apps/labrinth/src/routes/v2/projects.rs
index 4915b3ad0..c4a91b877 100644
--- a/apps/labrinth/src/routes/v2/projects.rs
+++ b/apps/labrinth/src/routes/v2/projects.rs
@@ -83,7 +83,7 @@ pub async fn project_search(
                                     val
                                 )
                             } else {
-                                facet.to_string()
+                                facet
                             }
                         })
                         .collect::<Vec<_>>()
@@ -511,6 +511,7 @@ pub async fn project_edit(
         moderation_message: v2_new_project.moderation_message,
         moderation_message_body: v2_new_project.moderation_message_body,
         monetization_status: v2_new_project.monetization_status,
+        side_types_migration_review_status: None, // Not to be exposed in v2
     };
 
     // This returns 204 or failure so we don't need to do anything with it
@@ -547,10 +548,12 @@ pub async fn project_edit(
             let version = Version::from(version);
             let mut fields = version.fields;
             let (current_client_side, current_server_side) =
-                v2_reroute::convert_side_types_v2(&fields, None);
+                v2_reroute::convert_v3_side_types_to_v2_side_types(
+                    &fields, None,
+                );
             let client_side = client_side.unwrap_or(current_client_side);
             let server_side = server_side.unwrap_or(current_server_side);
-            fields.extend(v2_reroute::convert_side_types_v3(
+            fields.extend(v2_reroute::convert_v2_side_types_to_v3_side_types(
                 client_side,
                 server_side,
             ));
diff --git a/apps/labrinth/src/routes/v2/version_creation.rs b/apps/labrinth/src/routes/v2/version_creation.rs
index 093f1736b..9406ce556 100644
--- a/apps/labrinth/src/routes/v2/version_creation.rs
+++ b/apps/labrinth/src/routes/v2/version_creation.rs
@@ -105,7 +105,7 @@ pub async fn version_create(
                     json!(legacy_create.game_versions),
                 );
 
-                // Get all possible side-types for loaders given- we will use these to check if we need to convert/apply singleplayer, etc.
+                // Get all possible side-types for loaders given- we will use these to check if we need to convert/apply side types
                 let loaders =
                     match v3::tags::loader_list(client.clone(), redis.clone())
                         .await
@@ -136,53 +136,32 @@ pub async fn version_create(
                     .collect::<Vec<_>>();
 
                 // Copies side types of another version of the project.
-                // If no version exists, defaults to all false.
+                // If no version exists, defaults to an unknown side type.
                 // This is inherently lossy, but not much can be done about it, as side types are no longer associated with projects,
-                // so the 'missing' ones can't be easily accessed, and versions do need to have these fields explicitly set.
-                let side_type_loader_field_names = [
-                    "singleplayer",
-                    "client_and_server",
-                    "client_only",
-                    "server_only",
-                ];
+                // so the 'missing' ones can't be easily accessed, and versions do need to have that field explicitly set.
 
-                // Check if loader_fields_aggregate contains any of these side types
+                // Check if loader_fields_aggregate contains the side types
                 // We assume these four fields are linked together.
                 if loader_fields_aggregate
                     .iter()
-                    .any(|f| side_type_loader_field_names.contains(&f.as_str()))
+                    .any(|field| field == "environment")
                 {
-                    // If so, we get the fields of the example version of the project, and set the side types to match.
-                    fields.extend(
-                        side_type_loader_field_names
-                            .iter()
-                            .map(|f| (f.to_string(), json!(false))),
-                    );
-                    if let Some(example_version_fields) =
+                    // If so, we get the field of an example version of the project, and set the side types to match.
+                    fields.insert(
+                        "environment".into(),
                         get_example_version_fields(
                             legacy_create.project_id,
                             client,
                             &redis,
                         )
                         .await?
-                    {
-                        fields.extend(
-                            example_version_fields.into_iter().filter_map(
-                                |f| {
-                                    if side_type_loader_field_names
-                                        .contains(&f.field_name.as_str())
-                                    {
-                                        Some((
-                                            f.field_name,
-                                            f.value.serialize_internal(),
-                                        ))
-                                    } else {
-                                        None
-                                    }
-                                },
-                            ),
-                        );
-                    }
+                        .into_iter()
+                        .flatten()
+                        .find(|f| f.field_name == "environment")
+                        .map_or(json!("unknown"), |f| {
+                            f.value.serialize_internal()
+                        }),
+                    );
                 }
                 // Handle project type via file extension prediction
                 let mut project_type = None;
@@ -283,28 +262,23 @@ async fn get_example_version_fields(
     pool: Data<PgPool>,
     redis: &RedisPool,
 ) -> Result<Option<Vec<VersionField>>, CreateError> {
-    let project_id = match project_id {
-        Some(project_id) => project_id,
-        None => return Ok(None),
+    let Some(project_id) = project_id else {
+        return Ok(None);
     };
 
-    let vid = match project_item::DBProject::get_id(
-        project_id.into(),
-        &**pool,
-        redis,
-    )
-    .await?
-    .and_then(|p| p.versions.first().cloned())
-    {
-        Some(vid) => vid,
-        None => return Ok(None),
+    let Some(vid) =
+        project_item::DBProject::get_id(project_id.into(), &**pool, redis)
+            .await?
+            .and_then(|p| p.versions.first().copied())
+    else {
+        return Ok(None);
     };
 
-    let example_version =
-        match version_item::DBVersion::get(vid, &**pool, redis).await? {
-            Some(version) => version,
-            None => return Ok(None),
-        };
+    let Some(example_version) =
+        version_item::DBVersion::get(vid, &**pool, redis).await?
+    else {
+        return Ok(None);
+    };
     Ok(Some(example_version.version_fields))
 }
 
diff --git a/apps/labrinth/src/routes/v2_reroute.rs b/apps/labrinth/src/routes/v2_reroute.rs
index a73baac4d..0a99b0796 100644
--- a/apps/labrinth/src/routes/v2_reroute.rs
+++ b/apps/labrinth/src/routes/v2_reroute.rs
@@ -164,69 +164,46 @@ where
     Ok(new_multipart)
 }
 
-// Converts a "client_side" and "server_side" pair into the new v3 corresponding fields
-pub fn convert_side_types_v3(
+/// Converts V2 side types to V3 side types.
+pub fn convert_v2_side_types_to_v3_side_types(
     client_side: LegacySideType,
     server_side: LegacySideType,
 ) -> HashMap<String, Value> {
-    use LegacySideType::{Optional, Required};
+    use LegacySideType::{Optional, Required, Unsupported};
 
-    let singleplayer = client_side == Required
-        || client_side == Optional
-        || server_side == Required
-        || server_side == Optional;
-    let client_and_server = singleplayer;
-    let client_only = (client_side == Required || client_side == Optional)
-        && server_side != Required;
-    let server_only = (server_side == Required || server_side == Optional)
-        && client_side != Required;
+    let environment = match (client_side, server_side) {
+        (Required, Required) => "client_and_server", // Or "singleplayer_only"
+        (Required, Unsupported) => "client_only",
+        (Required, Optional) => "client_only_server_optional",
+        (Unsupported, Required) => "server_only", // Or "dedicated_server_only"
+        (Optional, Required) => "server_only_client_optional",
+        (Optional, Optional) => "client_or_server", // Or "client_or_server_prefers_both"
+        _ => "unknown",
+    };
 
-    let mut fields = HashMap::new();
-    fields.insert("singleplayer".to_string(), json!(singleplayer));
-    fields.insert("client_and_server".to_string(), json!(client_and_server));
-    fields.insert("client_only".to_string(), json!(client_only));
-    fields.insert("server_only".to_string(), json!(server_only));
-    fields
+    [("environment".to_string(), json!(environment))]
+        .into_iter()
+        .collect()
 }
 
-// Convert search facets from V3 back to v2
-// this is not lossless. (See tests)
-pub fn convert_side_types_v2(
+/// Converts a V3 side types map into the corresponding V2 side types.
+pub fn convert_v3_side_types_to_v2_side_types(
     side_types: &HashMap<String, Value>,
     project_type: Option<&str>,
 ) -> (LegacySideType, LegacySideType) {
-    let client_and_server = side_types
-        .get("client_and_server")
-        .and_then(|x| x.as_bool())
-        .unwrap_or(false);
-    let singleplayer = side_types
-        .get("singleplayer")
-        .and_then(|x| x.as_bool())
-        .unwrap_or(client_and_server);
-    let client_only = side_types
-        .get("client_only")
-        .and_then(|x| x.as_bool())
-        .unwrap_or(false);
-    let server_only = side_types
-        .get("server_only")
-        .and_then(|x| x.as_bool())
-        .unwrap_or(false);
-
-    convert_side_types_v2_bools(
-        Some(singleplayer),
-        client_only,
-        server_only,
-        Some(client_and_server),
+    convert_v3_environment_to_v2_side_types(
+        side_types
+            .get("environment")
+            .and_then(|x| x.as_str())
+            .unwrap_or("unknown"),
         project_type,
     )
 }
 
-// Client side, server side
-pub fn convert_side_types_v2_bools(
-    singleplayer: Option<bool>,
-    client_only: bool,
-    server_only: bool,
-    client_and_server: Option<bool>,
+/// Converts a V3 environment and project type into the corresponding V2 side types.
+/// The first side type is for the client, the second is for the server.
+pub fn convert_v3_environment_to_v2_side_types(
+    environment: &str,
     project_type: Option<&str>,
 ) -> (LegacySideType, LegacySideType) {
     use LegacySideType::{Optional, Required, Unknown, Unsupported};
@@ -236,39 +213,27 @@ pub fn convert_side_types_v2_bools(
         Some("datapack") => (Optional, Required),
         Some("shader") => (Required, Unsupported),
         Some("resourcepack") => (Required, Unsupported),
-        _ => {
-            let singleplayer =
-                singleplayer.or(client_and_server).unwrap_or(false);
-
-            match (singleplayer, client_only, server_only) {
-                // Only singleplayer
-                (true, false, false) => (Required, Required),
-
-                // Client only and not server only
-                (false, true, false) => (Required, Unsupported),
-                (true, true, false) => (Required, Unsupported),
-
-                // Server only and not client only
-                (false, false, true) => (Unsupported, Required),
-                (true, false, true) => (Unsupported, Required),
-
-                // Both server only and client only
-                (true, true, true) => (Optional, Optional),
-                (false, true, true) => (Optional, Optional),
-
-                // Bad type
-                (false, false, false) => (Unknown, Unknown),
-            }
-        }
+        _ => match environment {
+            "client_and_server" => (Required, Required),
+            "client_only" => (Required, Unsupported),
+            "client_only_server_optional" => (Required, Optional),
+            "singleplayer_only" => (Required, Required),
+            "server_only" => (Unsupported, Required),
+            "server_only_client_optional" => (Optional, Required),
+            "dedicated_server_only" => (Unsupported, Required),
+            "client_or_server" => (Optional, Optional),
+            "client_or_server_prefers_both" => (Optional, Optional),
+            _ => (Unknown, Unknown), // "unknown"
+        },
     }
 }
 
 pub fn capitalize_first(input: &str) -> String {
-    let mut result = input.to_owned();
-    if let Some(first_char) = result.get_mut(0..1) {
-        first_char.make_ascii_uppercase();
-    }
-    result
+    input
+        .chars()
+        .enumerate()
+        .map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
+        .collect()
 }
 
 #[cfg(test)]
@@ -279,13 +244,14 @@ mod tests {
     };
 
     #[test]
-    fn convert_types() {
-        // Converting types from V2 to V3 and back should be idempotent- for certain pairs
+    fn v2_v3_side_type_conversion() {
+        // Only nonsensical V2 side types cannot be round-tripped from V2 to V3 and back.
+        // When converting from V3 to V2, only additional information about the
+        // singleplayer-only, multiplayer-only, or install on both sides nature of the
+        // project is lost.
         let lossy_pairs = [
             (Optional, Unsupported),
             (Unsupported, Optional),
-            (Required, Optional),
-            (Optional, Required),
             (Unsupported, Unsupported),
         ];
 
@@ -294,10 +260,13 @@ mod tests {
                 if lossy_pairs.contains(&(client_side, server_side)) {
                     continue;
                 }
-                let side_types =
-                    convert_side_types_v3(client_side, server_side);
+                let side_types = convert_v2_side_types_to_v3_side_types(
+                    client_side,
+                    server_side,
+                );
                 let (client_side2, server_side2) =
-                    convert_side_types_v2(&side_types, None);
+                    convert_v3_side_types_to_v2_side_types(&side_types, None);
+
                 assert_eq!(client_side, client_side2);
                 assert_eq!(server_side, server_side2);
             }
diff --git a/apps/labrinth/src/routes/v3/analytics_get.rs b/apps/labrinth/src/routes/v3/analytics_get.rs
index 2696a5a23..b32f5b0f8 100644
--- a/apps/labrinth/src/routes/v3/analytics_get.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get.rs
@@ -82,7 +82,7 @@ pub async fn playtimes_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ANALYTICS]),
+        Scopes::ANALYTICS,
     )
     .await
     .map(|x| x.1)?;
@@ -151,7 +151,7 @@ pub async fn views_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ANALYTICS]),
+        Scopes::ANALYTICS,
     )
     .await
     .map(|x| x.1)?;
@@ -220,7 +220,7 @@ pub async fn downloads_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ANALYTICS]),
+        Scopes::ANALYTICS,
     )
     .await
     .map(|x| x.1)?;
@@ -289,7 +289,7 @@ pub async fn revenue_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAYOUTS_READ]),
+        Scopes::PAYOUTS_READ,
     )
     .await
     .map(|x| x.1)?;
@@ -430,7 +430,7 @@ pub async fn countries_downloads_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ANALYTICS]),
+        Scopes::ANALYTICS,
     )
     .await
     .map(|x| x.1)?;
@@ -503,7 +503,7 @@ pub async fn countries_views_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ANALYTICS]),
+        Scopes::ANALYTICS,
     )
     .await
     .map(|x| x.1)?;
diff --git a/apps/labrinth/src/routes/v3/collections.rs b/apps/labrinth/src/routes/v3/collections.rs
index 5d9268e06..071cefadd 100644
--- a/apps/labrinth/src/routes/v3/collections.rs
+++ b/apps/labrinth/src/routes/v3/collections.rs
@@ -71,7 +71,7 @@ pub async fn collection_create(
         &**client,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_CREATE]),
+        Scopes::COLLECTION_CREATE,
     )
     .await?
     .1;
@@ -156,7 +156,7 @@ pub async fn collections_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_READ]),
+        Scopes::COLLECTION_READ,
     )
     .await
     .map(|x| x.1)
@@ -185,7 +185,7 @@ pub async fn collection_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_READ]),
+        Scopes::COLLECTION_READ,
     )
     .await
     .map(|x| x.1)
@@ -231,7 +231,7 @@ pub async fn collection_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_WRITE]),
+        Scopes::COLLECTION_WRITE,
     )
     .await?
     .1;
@@ -390,7 +390,7 @@ pub async fn collection_icon_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_WRITE]),
+        Scopes::COLLECTION_WRITE,
     )
     .await?
     .1;
@@ -471,7 +471,7 @@ pub async fn delete_collection_icon(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_WRITE]),
+        Scopes::COLLECTION_WRITE,
     )
     .await?
     .1;
@@ -528,7 +528,7 @@ pub async fn collection_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_DELETE]),
+        Scopes::COLLECTION_DELETE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/friends.rs b/apps/labrinth/src/routes/v3/friends.rs
index ee57a2b41..fb307fb03 100644
--- a/apps/labrinth/src/routes/v3/friends.rs
+++ b/apps/labrinth/src/routes/v3/friends.rs
@@ -36,7 +36,7 @@ pub async fn add_friend(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?
     .1;
@@ -154,7 +154,7 @@ pub async fn remove_friend(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?
     .1;
@@ -200,7 +200,7 @@ pub async fn friends(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_READ]),
+        Scopes::USER_READ,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/images.rs b/apps/labrinth/src/routes/v3/images.rs
index 2c8e2dae9..90e54cbb8 100644
--- a/apps/labrinth/src/routes/v3/images.rs
+++ b/apps/labrinth/src/routes/v3/images.rs
@@ -49,14 +49,12 @@ pub async fn images_add(
 ) -> Result<HttpResponse, ApiError> {
     let mut context = ImageContext::from_str(&data.context, None);
 
-    let scopes = vec![context.relevant_scope()];
-
     let user = get_user_from_headers(
         &req,
         &**pool,
         &redis,
         &session_queue,
-        Some(&scopes),
+        context.relevant_scope(),
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/notifications.rs b/apps/labrinth/src/routes/v3/notifications.rs
index daab75132..57898a567 100644
--- a/apps/labrinth/src/routes/v3/notifications.rs
+++ b/apps/labrinth/src/routes/v3/notifications.rs
@@ -40,7 +40,7 @@ pub async fn notifications_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_READ]),
+        Scopes::NOTIFICATION_READ,
     )
     .await?
     .1;
@@ -82,7 +82,7 @@ pub async fn notification_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_READ]),
+        Scopes::NOTIFICATION_READ,
     )
     .await?
     .1;
@@ -119,7 +119,7 @@ pub async fn notification_read(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_WRITE]),
+        Scopes::NOTIFICATION_WRITE,
     )
     .await?
     .1;
@@ -169,7 +169,7 @@ pub async fn notification_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_WRITE]),
+        Scopes::NOTIFICATION_WRITE,
     )
     .await?
     .1;
@@ -220,7 +220,7 @@ pub async fn notifications_read(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_WRITE]),
+        Scopes::NOTIFICATION_WRITE,
     )
     .await?
     .1;
@@ -273,7 +273,7 @@ pub async fn notifications_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_WRITE]),
+        Scopes::NOTIFICATION_WRITE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/oauth_clients.rs b/apps/labrinth/src/routes/v3/oauth_clients.rs
index d1750ae2e..b0fd6406f 100644
--- a/apps/labrinth/src/routes/v3/oauth_clients.rs
+++ b/apps/labrinth/src/routes/v3/oauth_clients.rs
@@ -69,7 +69,7 @@ pub async fn get_user_clients(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -167,7 +167,7 @@ pub async fn oauth_client_create(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -228,7 +228,7 @@ pub async fn oauth_client_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -285,7 +285,7 @@ pub async fn oauth_client_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -363,7 +363,7 @@ pub async fn oauth_client_icon_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -430,7 +430,7 @@ pub async fn oauth_client_icon_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -477,7 +477,7 @@ pub async fn get_user_oauth_authorizations(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
@@ -507,7 +507,7 @@ pub async fn revoke_oauth_authorization(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/organizations.rs b/apps/labrinth/src/routes/v3/organizations.rs
index 4fbc03e2a..77eb67004 100644
--- a/apps/labrinth/src/routes/v3/organizations.rs
+++ b/apps/labrinth/src/routes/v3/organizations.rs
@@ -63,7 +63,7 @@ pub async fn organization_projects_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_READ, Scopes::PROJECT_READ]),
+        Scopes::ORGANIZATION_READ | Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -127,7 +127,7 @@ pub async fn organization_create(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_CREATE]),
+        Scopes::ORGANIZATION_CREATE,
     )
     .await?
     .1;
@@ -224,7 +224,7 @@ pub async fn organization_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_READ]),
+        Scopes::ORGANIZATION_READ,
     )
     .await
     .map(|x| x.1)
@@ -256,13 +256,11 @@ pub async fn organization_get(
             .filter(|x| {
                 logged_in
                     || x.accepted
-                    || user_id
-                        .map(|y: crate::database::models::DBUserId| {
-                            y == x.user_id
-                        })
-                        .unwrap_or(false)
+                    || user_id.is_some_and(
+                        |y: crate::database::models::DBUserId| y == x.user_id,
+                    )
             })
-            .flat_map(|data| {
+            .filter_map(|data| {
                 users.iter().find(|x| x.id == data.user_id).map(|user| {
                     crate::models::teams::TeamMember::from(
                         data,
@@ -315,7 +313,7 @@ pub async fn organizations_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_READ]),
+        Scopes::ORGANIZATION_READ,
     )
     .await
     .map(|x| x.1)
@@ -345,13 +343,11 @@ pub async fn organizations_get(
             .filter(|x| {
                 logged_in
                     || x.accepted
-                    || user_id
-                        .map(|y: crate::database::models::DBUserId| {
-                            y == x.user_id
-                        })
-                        .unwrap_or(false)
+                    || user_id.is_some_and(
+                        |y: crate::database::models::DBUserId| y == x.user_id,
+                    )
             })
-            .flat_map(|data| {
+            .filter_map(|data| {
                 users.iter().find(|x| x.id == data.user_id).map(|user| {
                     crate::models::teams::TeamMember::from(
                         data,
@@ -396,7 +392,7 @@ pub async fn organizations_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_WRITE]),
+        Scopes::ORGANIZATION_WRITE,
     )
     .await?
     .1;
@@ -559,7 +555,7 @@ pub async fn organization_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_DELETE]),
+        Scopes::ORGANIZATION_DELETE,
     )
     .await?
     .1;
@@ -635,7 +631,7 @@ pub async fn organization_delete(
     .try_collect::<Vec<_>>()
     .await?;
 
-    for organization_project_team in organization_project_teams.iter() {
+    for organization_project_team in &organization_project_teams {
         let new_id = crate::database::models::ids::generate_team_member_id(
             &mut transaction,
         )
@@ -700,7 +696,7 @@ pub async fn organization_projects_add(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE, Scopes::ORGANIZATION_WRITE]),
+        Scopes::PROJECT_WRITE | Scopes::ORGANIZATION_WRITE,
     )
     .await?
     .1;
@@ -863,7 +859,7 @@ pub async fn organization_projects_remove(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE, Scopes::ORGANIZATION_WRITE]),
+        Scopes::PROJECT_WRITE | Scopes::ORGANIZATION_WRITE,
     )
     .await?
     .1;
@@ -1051,7 +1047,7 @@ pub async fn organization_icon_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_WRITE]),
+        Scopes::ORGANIZATION_WRITE,
     )
     .await?
     .1;
@@ -1154,7 +1150,7 @@ pub async fn delete_organization_icon(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::ORGANIZATION_WRITE]),
+        Scopes::ORGANIZATION_WRITE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 3e86cc9d9..2a3ab08b2 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -313,7 +313,7 @@ pub async fn user_payouts(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAYOUTS_READ]),
+        Scopes::PAYOUTS_READ,
     )
     .await?
     .1;
@@ -653,7 +653,7 @@ pub async fn cancel_payout(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAYOUTS_WRITE]),
+        Scopes::PAYOUTS_WRITE,
     )
     .await?
     .1;
@@ -783,7 +783,7 @@ pub async fn get_balance(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PAYOUTS_READ]),
+        Scopes::PAYOUTS_READ,
     )
     .await?
     .1;
@@ -830,14 +830,13 @@ async fn get_user_balance(
     .fetch_optional(pool)
     .await?;
 
-    let (withdrawn, fees) = withdrawn
-        .map(|x| {
+    let (withdrawn, fees) =
+        withdrawn.map_or((Decimal::ZERO, Decimal::ZERO), |x| {
             (
                 x.amount.unwrap_or(Decimal::ZERO),
                 x.fee.unwrap_or(Decimal::ZERO),
             )
-        })
-        .unwrap_or((Decimal::ZERO, Decimal::ZERO));
+        });
 
     Ok(UserBalance {
         available: available.round_dp(16)
diff --git a/apps/labrinth/src/routes/v3/project_creation.rs b/apps/labrinth/src/routes/v3/project_creation.rs
index d1fffe4a4..e7a9a33cf 100644
--- a/apps/labrinth/src/routes/v3/project_creation.rs
+++ b/apps/labrinth/src/routes/v3/project_creation.rs
@@ -12,7 +12,8 @@ use crate::models::ids::{ImageId, OrganizationId, ProjectId, VersionId};
 use crate::models::images::{Image, ImageContext};
 use crate::models::pats::Scopes;
 use crate::models::projects::{
-    License, Link, MonetizationStatus, ProjectStatus, VersionStatus,
+    License, Link, MonetizationStatus, ProjectStatus,
+    SideTypesMigrationReviewStatus, VersionStatus,
 };
 use crate::models::teams::{OrganizationPermissions, ProjectPermissions};
 use crate::models::threads::ThreadType;
@@ -342,7 +343,7 @@ async fn project_create_inner(
         pool,
         redis,
         session_queue,
-        Some(&[Scopes::PROJECT_CREATE]),
+        Scopes::PROJECT_CREATE,
     )
     .await?
     .1;
@@ -360,15 +361,14 @@ async fn project_create_inner(
         // The first multipart field must be named "data" and contain a
         // JSON `ProjectCreateData` object.
 
-        let mut field = payload
-            .next()
-            .await
-            .map(|m| m.map_err(CreateError::MultipartError))
-            .unwrap_or_else(|| {
+        let mut field = payload.next().await.map_or_else(
+            || {
                 Err(CreateError::MissingValueError(String::from(
                     "No `data` field in multipart upload",
                 )))
-            })?;
+            },
+            |m| m.map_err(CreateError::MultipartError),
+        )?;
 
         let name = field.name().ok_or_else(|| {
             CreateError::MissingValueError(String::from("Missing content name"))
@@ -550,8 +550,8 @@ async fn project_create_inner(
                 )));
             };
             // `index` is always valid for these lists
-            let created_version = versions.get_mut(index).unwrap();
-            let version_data = project_create_data.initial_versions.get(index).unwrap();
+            let created_version = &mut versions[index];
+            let version_data = &project_create_data.initial_versions[index];
             // TODO: maybe redundant is this calculation done elsewhere?
 
             let existing_file_names = created_version
@@ -670,10 +670,9 @@ async fn project_create_inner(
                 &team_member,
             );
 
-            if !perms
-                .map(|x| x.contains(OrganizationPermissions::ADD_PROJECT))
-                .unwrap_or(false)
-            {
+            if !perms.is_some_and(|x| {
+                x.contains(OrganizationPermissions::ADD_PROJECT)
+            }) {
                 return Err(CreateError::CustomAuthenticationError(
                     "You do not have the permissions to create projects in this organization!"
                         .to_string(),
@@ -903,6 +902,9 @@ async fn project_create_inner(
             color: project_builder.color,
             thread_id: thread_id.into(),
             monetization_status: MonetizationStatus::Monetized,
+            // New projects are considered reviewed with respect to side types migrations
+            side_types_migration_review_status:
+                SideTypesMigrationReviewStatus::Reviewed,
             fields: HashMap::new(), // Fields instantiate to empty
         };
 
diff --git a/apps/labrinth/src/routes/v3/projects.rs b/apps/labrinth/src/routes/v3/projects.rs
index b78885343..e7f829e57 100644
--- a/apps/labrinth/src/routes/v3/projects.rs
+++ b/apps/labrinth/src/routes/v3/projects.rs
@@ -17,6 +17,7 @@ use crate::models::notifications::NotificationBody;
 use crate::models::pats::Scopes;
 use crate::models::projects::{
     MonetizationStatus, Project, ProjectStatus, SearchRequest,
+    SideTypesMigrationReviewStatus,
 };
 use crate::models::teams::ProjectPermissions;
 use crate::models::threads::MessageBody;
@@ -94,14 +95,21 @@ pub async fn random_projects_get(
     })?;
 
     let project_ids = sqlx::query!(
-        "
-            SELECT id FROM mods TABLESAMPLE SYSTEM_ROWS($1) WHERE status = ANY($2)
-            ",
-        count.count as i32,
+        // IDs are randomly generated (see the `generate_ids` macro), so fetching a
+        // number of mods nearest to a random point in the ID space is equivalent to
+        // random sampling
+        "WITH random_id_point AS (
+            SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point
+        )
+        SELECT id FROM mods
+        WHERE status = ANY($1)
+        ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point)
+        LIMIT $2",
         &*crate::models::projects::ProjectStatus::iterator()
             .filter(|x| x.is_searchable())
             .map(|x| x.to_string())
             .collect::<Vec<String>>(),
+        count.count as i32,
     )
     .fetch(&**pool)
     .map_ok(|m| db_ids::DBProjectId(m.id))
@@ -139,7 +147,7 @@ pub async fn projects_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -168,7 +176,7 @@ pub async fn project_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -240,6 +248,8 @@ pub struct EditProject {
     #[validate(length(max = 65536))]
     pub moderation_message_body: Option<Option<String>>,
     pub monetization_status: Option<MonetizationStatus>,
+    pub side_types_migration_review_status:
+        Option<SideTypesMigrationReviewStatus>,
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -258,7 +268,7 @@ pub async fn project_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -267,640 +277,646 @@ pub async fn project_edit(
         ApiError::Validation(validation_errors_to_string(err, None))
     })?;
 
-    let string = info.into_inner().0;
-    let result = db_models::DBProject::get(&string, &**pool, &redis).await?;
-    if let Some(project_item) = result {
-        let id = project_item.inner.id;
+    let Some(project_item) =
+        db_models::DBProject::get(&info.into_inner().0, &**pool, &redis)
+            .await?
+    else {
+        return Err(ApiError::NotFound);
+    };
 
-        let (team_member, organization_team_member) =
-            db_models::DBTeamMember::get_for_project_permissions(
-                &project_item.inner,
-                user.id.into(),
-                &**pool,
-            )
-            .await?;
+    let id = project_item.inner.id;
 
-        let permissions = ProjectPermissions::get_permissions_by_role(
-            &user.role,
-            &team_member,
-            &organization_team_member,
-        );
+    let (team_member, organization_team_member) =
+        db_models::DBTeamMember::get_for_project_permissions(
+            &project_item.inner,
+            user.id.into(),
+            &**pool,
+        )
+        .await?;
 
-        if let Some(perms) = permissions {
-            let mut transaction = pool.begin().await?;
+    let Some(perms) = ProjectPermissions::get_permissions_by_role(
+        &user.role,
+        &team_member,
+        &organization_team_member,
+    ) else {
+        return Err(ApiError::CustomAuthentication(
+            "You do not have permission to edit this project!".to_string(),
+        ));
+    };
 
-            if let Some(name) = &new_project.name {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the name of this project!"
-                            .to_string(),
-                    ));
-                }
+    let mut transaction = pool.begin().await?;
 
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET name = $1
-                    WHERE (id = $2)
-                    ",
-                    name.trim(),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(summary) = &new_project.summary {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the summary of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET summary = $1
-                    WHERE (id = $2)
-                    ",
-                    summary,
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(status) = &new_project.status {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the status of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                if !(user.role.is_mod()
-                    || !project_item.inner.status.is_approved()
-                        && status == &ProjectStatus::Processing
-                    || project_item.inner.status.is_approved()
-                        && status.can_be_requested())
-                {
-                    return Err(ApiError::CustomAuthentication(
-                        "You don't have permission to set this status!"
-                            .to_string(),
-                    ));
-                }
-
-                if status == &ProjectStatus::Processing {
-                    if project_item.versions.is_empty() {
-                        return Err(ApiError::InvalidInput(String::from(
-                            "Project submitted for review with no initial versions",
-                        )));
-                    }
-
-                    sqlx::query!(
-                        "
-                        UPDATE mods
-                        SET moderation_message = NULL, moderation_message_body = NULL, queued = NOW()
-                        WHERE (id = $1)
-                        ",
-                        id as db_ids::DBProjectId,
-                    )
-                    .execute(&mut *transaction)
-                    .await?;
-
-                    moderation_queue
-                        .projects
-                        .insert(project_item.inner.id.into());
-                }
-
-                if status.is_approved()
-                    && !project_item.inner.status.is_approved()
-                {
-                    sqlx::query!(
-                        "
-                        UPDATE mods
-                        SET approved = NOW()
-                        WHERE id = $1 AND approved IS NULL
-                        ",
-                        id as db_ids::DBProjectId,
-                    )
-                    .execute(&mut *transaction)
-                    .await?;
-                }
-                if status.is_searchable() && !project_item.inner.webhook_sent {
-                    if let Ok(webhook_url) =
-                        dotenvy::var("PUBLIC_DISCORD_WEBHOOK")
-                    {
-                        crate::util::webhook::send_discord_webhook(
-                            project_item.inner.id.into(),
-                            &pool,
-                            &redis,
-                            webhook_url,
-                            None,
-                        )
-                        .await
-                        .ok();
-
-                        sqlx::query!(
-                            "
-                            UPDATE mods
-                            SET webhook_sent = TRUE
-                            WHERE id = $1
-                            ",
-                            id as db_ids::DBProjectId,
-                        )
-                        .execute(&mut *transaction)
-                        .await?;
-                    }
-                }
-
-                if user.role.is_mod() {
-                    if let Ok(webhook_url) =
-                        dotenvy::var("MODERATION_SLACK_WEBHOOK")
-                    {
-                        crate::util::webhook::send_slack_webhook(
-                            project_item.inner.id.into(),
-                            &pool,
-                            &redis,
-                            webhook_url,
-                            Some(
-                                format!(
-                                    "*<{}/user/{}|{}>* changed project status from *{}* to *{}*",
-                                    dotenvy::var("SITE_URL")?,
-                                    user.username,
-                                    user.username,
-                                    &project_item.inner.status.as_friendly_str(),
-                                    status.as_friendly_str(),
-                                )
-                                .to_string(),
-                            ),
-                        )
-                        .await
-                        .ok();
-                    }
-                }
-
-                if team_member.map(|x| !x.accepted).unwrap_or(true) {
-                    let notified_members = sqlx::query!(
-                        "
-                        SELECT tm.user_id id
-                        FROM team_members tm
-                        WHERE tm.team_id = $1 AND tm.accepted
-                        ",
-                        project_item.inner.team_id as db_ids::DBTeamId
-                    )
-                    .fetch(&mut *transaction)
-                    .map_ok(|c| db_models::DBUserId(c.id))
-                    .try_collect::<Vec<_>>()
-                    .await?;
-
-                    NotificationBuilder {
-                        body: NotificationBody::StatusChange {
-                            project_id: project_item.inner.id.into(),
-                            old_status: project_item.inner.status,
-                            new_status: *status,
-                        },
-                    }
-                    .insert_many(notified_members, &mut transaction, &redis)
-                    .await?;
-                }
-
-                ThreadMessageBuilder {
-                    author_id: Some(user.id.into()),
-                    body: MessageBody::StatusChange {
-                        new_status: *status,
-                        old_status: project_item.inner.status,
-                    },
-                    thread_id: project_item.thread_id,
-                    hide_identity: user.role.is_mod(),
-                }
-                .insert(&mut transaction)
-                .await?;
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET status = $1
-                    WHERE (id = $2)
-                    ",
-                    status.as_str(),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-
-                if project_item.inner.status.is_searchable()
-                    && !status.is_searchable()
-                {
-                    remove_documents(
-                        &project_item
-                            .versions
-                            .into_iter()
-                            .map(|x| x.into())
-                            .collect::<Vec<_>>(),
-                        &search_config,
-                    )
-                    .await?;
-                }
-            }
-
-            if let Some(requested_status) = &new_project.requested_status {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the requested status of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                if !requested_status
-                    .map(|x| x.can_be_requested())
-                    .unwrap_or(true)
-                {
-                    return Err(ApiError::InvalidInput(String::from(
-                        "Specified status cannot be requested!",
-                    )));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET requested_status = $1
-                    WHERE (id = $2)
-                    ",
-                    requested_status.map(|x| x.as_str()),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                if new_project.categories.is_some() {
-                    sqlx::query!(
-                        "
-                        DELETE FROM mods_categories
-                        WHERE joining_mod_id = $1 AND is_additional = FALSE
-                        ",
-                        id as db_ids::DBProjectId,
-                    )
-                    .execute(&mut *transaction)
-                    .await?;
-                }
-
-                if new_project.additional_categories.is_some() {
-                    sqlx::query!(
-                        "
-                        DELETE FROM mods_categories
-                        WHERE joining_mod_id = $1 AND is_additional = TRUE
-                        ",
-                        id as db_ids::DBProjectId,
-                    )
-                    .execute(&mut *transaction)
-                    .await?;
-                }
-            }
-
-            if let Some(categories) = &new_project.categories {
-                edit_project_categories(
-                    categories,
-                    &perms,
-                    id as db_ids::DBProjectId,
-                    false,
-                    &mut transaction,
-                )
-                .await?;
-            }
-
-            if let Some(categories) = &new_project.additional_categories {
-                edit_project_categories(
-                    categories,
-                    &perms,
-                    id as db_ids::DBProjectId,
-                    true,
-                    &mut transaction,
-                )
-                .await?;
-            }
-
-            if let Some(license_url) = &new_project.license_url {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the license URL of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET license_url = $1
-                    WHERE (id = $2)
-                    ",
-                    license_url.as_deref(),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(slug) = &new_project.slug {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the slug of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                let slug_project_id_option: Option<u64> =
-                    parse_base62(slug).ok();
-                if let Some(slug_project_id) = slug_project_id_option {
-                    let results = sqlx::query!(
-                        "
-                        SELECT EXISTS(SELECT 1 FROM mods WHERE id=$1)
-                        ",
-                        slug_project_id as i64
-                    )
-                    .fetch_one(&mut *transaction)
-                    .await?;
-
-                    if results.exists.unwrap_or(true) {
-                        return Err(ApiError::InvalidInput(
-                            "Slug collides with other project's id!"
-                                .to_string(),
-                        ));
-                    }
-                }
-
-                // Make sure the new slug is different from the old one
-                // We are able to unwrap here because the slug is always set
-                if !slug.eq(&project_item
-                    .inner
-                    .slug
-                    .clone()
-                    .unwrap_or_default())
-                {
-                    let results = sqlx::query!(
-                        "
-                      SELECT EXISTS(SELECT 1 FROM mods WHERE slug = LOWER($1))
-                      ",
-                        slug
-                    )
-                    .fetch_one(&mut *transaction)
-                    .await?;
-
-                    if results.exists.unwrap_or(true) {
-                        return Err(ApiError::InvalidInput(
-                            "Slug collides with other project's id!"
-                                .to_string(),
-                        ));
-                    }
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET slug = LOWER($1)
-                    WHERE (id = $2)
-                    ",
-                    Some(slug),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(license) = &new_project.license_id {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the license of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                let mut license = license.clone();
-
-                if license.to_lowercase() == "arr" {
-                    license = models::projects::DEFAULT_LICENSE_ID.to_string();
-                }
-
-                spdx::Expression::parse(&license).map_err(|err| {
-                    ApiError::InvalidInput(format!(
-                        "Invalid SPDX license identifier: {err}"
-                    ))
-                })?;
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET license = $1
-                    WHERE (id = $2)
-                    ",
-                    license,
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-            if let Some(links) = &new_project.link_urls {
-                if !links.is_empty() {
-                    if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                        return Err(ApiError::CustomAuthentication(
-                            "You do not have the permissions to edit the links of this project!"
-                                .to_string(),
-                        ));
-                    }
-
-                    let ids_to_delete =
-                        links.keys().cloned().collect::<Vec<String>>();
-                    // Deletes all links from hashmap- either will be deleted or be replaced
-                    sqlx::query!(
-                        "
-                        DELETE FROM mods_links
-                        WHERE joining_mod_id = $1 AND joining_platform_id IN (
-                            SELECT id FROM link_platforms WHERE name = ANY($2)
-                        )
-                        ",
-                        id as db_ids::DBProjectId,
-                        &ids_to_delete
-                    )
-                    .execute(&mut *transaction)
-                    .await?;
-
-                    for (platform, url) in links {
-                        if let Some(url) = url {
-                            let platform_id =
-                                db_models::categories::LinkPlatform::get_id(
-                                    platform,
-                                    &mut *transaction,
-                                )
-                                .await?
-                                .ok_or_else(
-                                    || {
-                                        ApiError::InvalidInput(format!(
-                                            "Platform {} does not exist.",
-                                            platform.clone()
-                                        ))
-                                    },
-                                )?;
-                            sqlx::query!(
-                                "
-                                INSERT INTO mods_links (joining_mod_id, joining_platform_id, url)
-                                VALUES ($1, $2, $3)
-                                ",
-                                id as db_ids::DBProjectId,
-                                platform_id as db_ids::LinkPlatformId,
-                                url
-                            )
-                            .execute(&mut *transaction)
-                            .await?;
-                        }
-                    }
-                }
-            }
-            if let Some(moderation_message) = &new_project.moderation_message {
-                if !user.role.is_mod()
-                    && (!project_item.inner.status.is_approved()
-                        || moderation_message.is_some())
-                {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the moderation message of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET moderation_message = $1
-                    WHERE (id = $2)
-                    ",
-                    moderation_message.as_deref(),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(moderation_message_body) =
-                &new_project.moderation_message_body
-            {
-                if !user.role.is_mod()
-                    && (!project_item.inner.status.is_approved()
-                        || moderation_message_body.is_some())
-                {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the moderation message body of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET moderation_message_body = $1
-                    WHERE (id = $2)
-                    ",
-                    moderation_message_body.as_deref(),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(description) = &new_project.description {
-                if !perms.contains(ProjectPermissions::EDIT_BODY) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the description (body) of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET description = $1
-                    WHERE (id = $2)
-                    ",
-                    description,
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            if let Some(monetization_status) = &new_project.monetization_status
-            {
-                if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the monetization status of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                if (*monetization_status
-                    == MonetizationStatus::ForceDemonetized
-                    || project_item.inner.monetization_status
-                        == MonetizationStatus::ForceDemonetized)
-                    && !user.role.is_mod()
-                {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the monetization status of this project!"
-                            .to_string(),
-                    ));
-                }
-
-                sqlx::query!(
-                    "
-                    UPDATE mods
-                    SET monetization_status = $1
-                    WHERE (id = $2)
-                    ",
-                    monetization_status.as_str(),
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            // check new description and body for links to associated images
-            // if they no longer exist in the description or body, delete them
-            let checkable_strings: Vec<&str> =
-                vec![&new_project.description, &new_project.summary]
-                    .into_iter()
-                    .filter_map(|x| x.as_ref().map(|y| y.as_str()))
-                    .collect();
-
-            let context = ImageContext::Project {
-                project_id: Some(id.into()),
-            };
-
-            img::delete_unused_images(
-                context,
-                checkable_strings,
-                &mut transaction,
-                &redis,
-            )
-            .await?;
-
-            transaction.commit().await?;
-            db_models::DBProject::clear_cache(
-                project_item.inner.id,
-                project_item.inner.slug,
-                None,
-                &redis,
-            )
-            .await?;
-
-            Ok(HttpResponse::NoContent().body(""))
-        } else {
-            Err(ApiError::CustomAuthentication(
-                "You do not have permission to edit this project!".to_string(),
-            ))
+    if let Some(name) = &new_project.name {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the name of this project!"
+                    .to_string(),
+            ));
         }
-    } else {
-        Err(ApiError::NotFound)
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET name = $1
+            WHERE (id = $2)
+            ",
+            name.trim(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
     }
+
+    if let Some(summary) = &new_project.summary {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the summary of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET summary = $1
+            WHERE (id = $2)
+            ",
+            summary,
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(status) = &new_project.status {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the status of this project!"
+                    .to_string(),
+            ));
+        }
+
+        if !(user.role.is_mod()
+            || !project_item.inner.status.is_approved()
+                && status == &ProjectStatus::Processing
+            || project_item.inner.status.is_approved()
+                && status.can_be_requested())
+        {
+            return Err(ApiError::CustomAuthentication(
+                "You don't have permission to set this status!".to_string(),
+            ));
+        }
+
+        if status == &ProjectStatus::Processing {
+            if project_item.versions.is_empty() {
+                return Err(ApiError::InvalidInput(String::from(
+                    "Project submitted for review with no initial versions",
+                )));
+            }
+
+            sqlx::query!(
+                "
+                UPDATE mods
+                SET moderation_message = NULL, moderation_message_body = NULL, queued = NOW()
+                WHERE (id = $1)
+                ",
+                id as db_ids::DBProjectId,
+            )
+            .execute(&mut *transaction)
+            .await?;
+
+            moderation_queue
+                .projects
+                .insert(project_item.inner.id.into());
+        }
+
+        if status.is_approved() && !project_item.inner.status.is_approved() {
+            sqlx::query!(
+                "
+                UPDATE mods
+                SET approved = NOW()
+                WHERE id = $1 AND approved IS NULL
+                ",
+                id as db_ids::DBProjectId,
+            )
+            .execute(&mut *transaction)
+            .await?;
+        }
+
+        if status.is_searchable() && !project_item.inner.webhook_sent {
+            if let Ok(webhook_url) = dotenvy::var("PUBLIC_DISCORD_WEBHOOK") {
+                crate::util::webhook::send_discord_webhook(
+                    project_item.inner.id.into(),
+                    &pool,
+                    &redis,
+                    webhook_url,
+                    None,
+                )
+                .await
+                .ok();
+
+                sqlx::query!(
+                    "
+                    UPDATE mods
+                    SET webhook_sent = TRUE
+                    WHERE id = $1
+                    ",
+                    id as db_ids::DBProjectId,
+                )
+                .execute(&mut *transaction)
+                .await?;
+            }
+        }
+
+        if user.role.is_mod() {
+            if let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK") {
+                crate::util::webhook::send_slack_webhook(
+                    project_item.inner.id.into(),
+                    &pool,
+                    &redis,
+                    webhook_url,
+                    Some(
+                        format!(
+                            "*<{}/user/{}|{}>* changed project status from *{}* to *{}*",
+                            dotenvy::var("SITE_URL")?,
+                            user.username,
+                            user.username,
+                            &project_item.inner.status.as_friendly_str(),
+                            status.as_friendly_str(),
+                        )
+                        .to_string(),
+                    ),
+                )
+                .await
+                .ok();
+            }
+        }
+
+        if team_member.is_none_or(|x| !x.accepted) {
+            let notified_members = sqlx::query!(
+                "
+                SELECT tm.user_id id
+                FROM team_members tm
+                WHERE tm.team_id = $1 AND tm.accepted
+                ",
+                project_item.inner.team_id as db_ids::DBTeamId
+            )
+            .fetch(&mut *transaction)
+            .map_ok(|c| db_models::DBUserId(c.id))
+            .try_collect::<Vec<_>>()
+            .await?;
+
+            NotificationBuilder {
+                body: NotificationBody::StatusChange {
+                    project_id: project_item.inner.id.into(),
+                    old_status: project_item.inner.status,
+                    new_status: *status,
+                },
+            }
+            .insert_many(notified_members, &mut transaction, &redis)
+            .await?;
+        }
+
+        ThreadMessageBuilder {
+            author_id: Some(user.id.into()),
+            body: MessageBody::StatusChange {
+                new_status: *status,
+                old_status: project_item.inner.status,
+            },
+            thread_id: project_item.thread_id,
+            hide_identity: user.role.is_mod(),
+        }
+        .insert(&mut transaction)
+        .await?;
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET status = $1
+            WHERE (id = $2)
+            ",
+            status.as_str(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(requested_status) = &new_project.requested_status {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the requested status of this project!"
+                    .to_string(),
+            ));
+        }
+
+        if !requested_status
+            .map(|x| x.can_be_requested())
+            .unwrap_or(true)
+        {
+            return Err(ApiError::InvalidInput(String::from(
+                "Specified status cannot be requested!",
+            )));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET requested_status = $1
+            WHERE (id = $2)
+            ",
+            requested_status.map(|x| x.as_str()),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if perms.contains(ProjectPermissions::EDIT_DETAILS) {
+        if new_project.categories.is_some() {
+            sqlx::query!(
+                "
+                DELETE FROM mods_categories
+                WHERE joining_mod_id = $1 AND is_additional = FALSE
+                ",
+                id as db_ids::DBProjectId,
+            )
+            .execute(&mut *transaction)
+            .await?;
+        }
+
+        if new_project.additional_categories.is_some() {
+            sqlx::query!(
+                "
+                DELETE FROM mods_categories
+                WHERE joining_mod_id = $1 AND is_additional = TRUE
+                ",
+                id as db_ids::DBProjectId,
+            )
+            .execute(&mut *transaction)
+            .await?;
+        }
+    }
+
+    if let Some(categories) = &new_project.categories {
+        edit_project_categories(
+            categories,
+            &perms,
+            id as db_ids::DBProjectId,
+            false,
+            &mut transaction,
+        )
+        .await?;
+    }
+
+    if let Some(categories) = &new_project.additional_categories {
+        edit_project_categories(
+            categories,
+            &perms,
+            id as db_ids::DBProjectId,
+            true,
+            &mut transaction,
+        )
+        .await?;
+    }
+
+    if let Some(license_url) = &new_project.license_url {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the license URL of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET license_url = $1
+            WHERE (id = $2)
+            ",
+            license_url.as_deref(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(slug) = &new_project.slug {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the slug of this project!"
+                    .to_string(),
+            ));
+        }
+
+        let slug_project_id_option: Option<u64> = parse_base62(slug).ok();
+        if let Some(slug_project_id) = slug_project_id_option {
+            let results = sqlx::query!(
+                "
+                SELECT EXISTS(SELECT 1 FROM mods WHERE id=$1)
+                ",
+                slug_project_id as i64
+            )
+            .fetch_one(&mut *transaction)
+            .await?;
+
+            if results.exists.unwrap_or(true) {
+                return Err(ApiError::InvalidInput(
+                    "Slug collides with other project's id!".to_string(),
+                ));
+            }
+        }
+
+        // Make sure the new slug is different from the old one
+        // We are able to unwrap here because the slug is always set
+        if !slug.eq(&project_item.inner.slug.clone().unwrap_or_default()) {
+            let results = sqlx::query!(
+                "
+                SELECT EXISTS(SELECT 1 FROM mods WHERE slug = LOWER($1))
+                ",
+                slug
+            )
+            .fetch_one(&mut *transaction)
+            .await?;
+
+            if results.exists.unwrap_or(true) {
+                return Err(ApiError::InvalidInput(
+                    "Slug collides with other project's id!".to_string(),
+                ));
+            }
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET slug = LOWER($1)
+            WHERE (id = $2)
+            ",
+            Some(slug),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(license) = &new_project.license_id {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the license of this project!"
+                    .to_string(),
+            ));
+        }
+
+        let mut license = license.clone();
+
+        if license.to_lowercase() == "arr" {
+            license = models::projects::DEFAULT_LICENSE_ID.to_string();
+        }
+
+        spdx::Expression::parse(&license).map_err(|err| {
+            ApiError::InvalidInput(format!(
+                "Invalid SPDX license identifier: {err}"
+            ))
+        })?;
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET license = $1
+            WHERE (id = $2)
+            ",
+            license,
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(links) = &new_project.link_urls {
+        if !links.is_empty() {
+            if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+                return Err(ApiError::CustomAuthentication(
+                    "You do not have the permissions to edit the links of this project!"
+                        .to_string(),
+                ));
+            }
+
+            let ids_to_delete = links.keys().cloned().collect::<Vec<String>>();
+            // Deletes all links from hashmap- either will be deleted or be replaced
+            sqlx::query!(
+                "
+                DELETE FROM mods_links
+                WHERE joining_mod_id = $1 AND joining_platform_id IN (
+                    SELECT id FROM link_platforms WHERE name = ANY($2)
+                )
+                ",
+                id as db_ids::DBProjectId,
+                &ids_to_delete
+            )
+            .execute(&mut *transaction)
+            .await?;
+
+            for (platform, url) in links {
+                if let Some(url) = url {
+                    let platform_id =
+                        db_models::categories::LinkPlatform::get_id(
+                            platform,
+                            &mut *transaction,
+                        )
+                        .await?
+                        .ok_or_else(|| {
+                            ApiError::InvalidInput(format!(
+                                "Platform {} does not exist.",
+                                platform.clone()
+                            ))
+                        })?;
+                    sqlx::query!(
+                        "
+                        INSERT INTO mods_links (joining_mod_id, joining_platform_id, url)
+                        VALUES ($1, $2, $3)
+                        ",
+                        id as db_ids::DBProjectId,
+                        platform_id as db_ids::LinkPlatformId,
+                        url
+                    )
+                    .execute(&mut *transaction)
+                    .await?;
+                }
+            }
+        }
+    }
+    if let Some(moderation_message) = &new_project.moderation_message {
+        if !user.role.is_mod()
+            && (!project_item.inner.status.is_approved()
+                || moderation_message.is_some())
+        {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the moderation message of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET moderation_message = $1
+            WHERE (id = $2)
+            ",
+            moderation_message.as_deref(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(moderation_message_body) = &new_project.moderation_message_body
+    {
+        if !user.role.is_mod()
+            && (!project_item.inner.status.is_approved()
+                || moderation_message_body.is_some())
+        {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the moderation message body of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET moderation_message_body = $1
+            WHERE (id = $2)
+            ",
+            moderation_message_body.as_deref(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(description) = &new_project.description {
+        if !perms.contains(ProjectPermissions::EDIT_BODY) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the description (body) of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET description = $1
+            WHERE (id = $2)
+            ",
+            description,
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(monetization_status) = &new_project.monetization_status {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the monetization status of this project!"
+                    .to_string(),
+            ));
+        }
+
+        if (*monetization_status == MonetizationStatus::ForceDemonetized
+            || project_item.inner.monetization_status
+                == MonetizationStatus::ForceDemonetized)
+            && !user.role.is_mod()
+        {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the monetization status of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET monetization_status = $1
+            WHERE (id = $2)
+            ",
+            monetization_status.as_str(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    if let Some(side_types_migration_review_status) =
+        &new_project.side_types_migration_review_status
+    {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
+                "You do not have the permissions to edit the side types migration review status of this project!"
+                    .to_string(),
+            ));
+        }
+
+        sqlx::query!(
+            "
+            UPDATE mods
+            SET side_types_migration_review_status = $1
+            WHERE id = $2
+            ",
+            side_types_migration_review_status.as_str(),
+            id as db_ids::DBProjectId,
+        )
+        .execute(&mut *transaction)
+        .await?;
+    }
+
+    // check new description and body for links to associated images
+    // if they no longer exist in the description or body, delete them
+    let checkable_strings: Vec<&str> =
+        vec![&new_project.description, &new_project.summary]
+            .into_iter()
+            .filter_map(|x| x.as_ref().map(|y| y.as_str()))
+            .collect();
+
+    let context = ImageContext::Project {
+        project_id: Some(id.into()),
+    };
+
+    img::delete_unused_images(
+        context,
+        checkable_strings,
+        &mut transaction,
+        &redis,
+    )
+    .await?;
+
+    transaction.commit().await?;
+
+    db_models::DBProject::clear_cache(
+        project_item.inner.id,
+        project_item.inner.slug,
+        None,
+        &redis,
+    )
+    .await?;
+
+    // Remove no longer searchable projects from search index
+    if let (true, Some(false)) = (
+        project_item.inner.status.is_searchable(),
+        new_project.status.map(|status| status.is_searchable()),
+    ) {
+        remove_documents(
+            &project_item
+                .versions
+                .into_iter()
+                .map(|x| x.into())
+                .collect::<Vec<_>>(),
+            &search_config,
+        )
+        .await?;
+    }
+
+    Ok(HttpResponse::NoContent().body(""))
 }
 
 pub async fn edit_project_categories(
@@ -1014,7 +1030,7 @@ pub async fn dependency_list(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -1126,7 +1142,7 @@ pub async fn projects_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -1423,7 +1439,7 @@ pub async fn project_icon_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -1534,7 +1550,7 @@ pub async fn delete_project_icon(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -1641,7 +1657,7 @@ pub async fn add_gallery_item(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -1799,7 +1815,7 @@ pub async fn edit_gallery_item(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -1966,7 +1982,7 @@ pub async fn delete_gallery_item(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -2075,7 +2091,7 @@ pub async fn project_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_DELETE]),
+        Scopes::PROJECT_DELETE,
     )
     .await?
     .1;
@@ -2178,7 +2194,7 @@ pub async fn project_follow(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?
     .1;
@@ -2258,7 +2274,7 @@ pub async fn project_unfollow(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?
     .1;
@@ -2334,7 +2350,7 @@ pub async fn project_get_organization(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ, Scopes::ORGANIZATION_READ]),
+        Scopes::PROJECT_READ | Scopes::ORGANIZATION_READ,
     )
     .await
     .map(|x| x.1)
@@ -2390,13 +2406,11 @@ pub async fn project_get_organization(
             .filter(|x| {
                 logged_in
                     || x.accepted
-                    || user_id
-                        .map(|y: crate::database::models::DBUserId| {
-                            y == x.user_id
-                        })
-                        .unwrap_or(false)
+                    || user_id.is_some_and(
+                        |y: crate::database::models::DBUserId| y == x.user_id,
+                    )
             })
-            .flat_map(|data| {
+            .filter_map(|data| {
                 users.iter().find(|x| x.id == data.user_id).map(|user| {
                     crate::models::teams::TeamMember::from(
                         data,
diff --git a/apps/labrinth/src/routes/v3/reports.rs b/apps/labrinth/src/routes/v3/reports.rs
index 377d79060..61a3cc223 100644
--- a/apps/labrinth/src/routes/v3/reports.rs
+++ b/apps/labrinth/src/routes/v3/reports.rs
@@ -58,7 +58,7 @@ pub async fn report_create(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::REPORT_CREATE]),
+        Scopes::REPORT_CREATE,
     )
     .await?
     .1;
@@ -254,7 +254,7 @@ pub async fn reports(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::REPORT_READ]),
+        Scopes::REPORT_READ,
     )
     .await?
     .1;
@@ -338,7 +338,7 @@ pub async fn reports_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::REPORT_READ]),
+        Scopes::REPORT_READ,
     )
     .await?
     .1;
@@ -364,7 +364,7 @@ pub async fn report_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::REPORT_READ]),
+        Scopes::REPORT_READ,
     )
     .await?
     .1;
@@ -406,7 +406,7 @@ pub async fn report_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::REPORT_WRITE]),
+        Scopes::REPORT_WRITE,
     )
     .await?
     .1;
@@ -506,7 +506,7 @@ pub async fn report_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::REPORT_DELETE]),
+        Scopes::REPORT_DELETE,
     )
     .await?;
 
diff --git a/apps/labrinth/src/routes/v3/tags.rs b/apps/labrinth/src/routes/v3/tags.rs
index 20b46b833..fff789891 100644
--- a/apps/labrinth/src/routes/v3/tags.rs
+++ b/apps/labrinth/src/routes/v3/tags.rs
@@ -148,16 +148,15 @@ pub async fn loader_fields_list(
             ))
         })?;
 
-    let loader_field_enum_id = match loader_field.field_type {
-        LoaderFieldType::Enum(enum_id)
-        | LoaderFieldType::ArrayEnum(enum_id) => enum_id,
-        _ => {
-            return Err(ApiError::InvalidInput(format!(
-                "'{}' is not an enumerable field, but an '{}' field.",
-                query.loader_field,
-                loader_field.field_type.to_str()
-            )));
-        }
+    let (LoaderFieldType::Enum(loader_field_enum_id)
+    | LoaderFieldType::ArrayEnum(loader_field_enum_id)) =
+        loader_field.field_type
+    else {
+        return Err(ApiError::InvalidInput(format!(
+            "'{}' is not an enumerable field, but an '{}' field.",
+            query.loader_field,
+            loader_field.field_type.to_str()
+        )));
     };
 
     let results: Vec<_> = if let Some(filters) = query.filters {
diff --git a/apps/labrinth/src/routes/v3/teams.rs b/apps/labrinth/src/routes/v3/teams.rs
index aab221c2f..29cd57a09 100644
--- a/apps/labrinth/src/routes/v3/teams.rs
+++ b/apps/labrinth/src/routes/v3/teams.rs
@@ -57,7 +57,7 @@ pub async fn team_members_get_project(
             &**pool,
             &redis,
             &session_queue,
-            Some(&[Scopes::PROJECT_READ]),
+            Scopes::PROJECT_READ,
         )
         .await
         .map(|x| x.1)
@@ -101,13 +101,11 @@ pub async fn team_members_get_project(
             .filter(|x| {
                 logged_in
                     || x.accepted
-                    || user_id
-                        .map(|y: crate::database::models::DBUserId| {
-                            y == x.user_id
-                        })
-                        .unwrap_or(false)
+                    || user_id.is_some_and(
+                        |y: crate::database::models::DBUserId| y == x.user_id,
+                    )
             })
-            .flat_map(|data| {
+            .filter_map(|data| {
                 users.iter().find(|x| x.id == data.user_id).map(|user| {
                     crate::models::teams::TeamMember::from(
                         data,
@@ -142,7 +140,7 @@ pub async fn team_members_get_organization(
             &**pool,
             &redis,
             &session_queue,
-            Some(&[Scopes::ORGANIZATION_READ]),
+            Scopes::ORGANIZATION_READ,
         )
         .await
         .map(|x| x.1)
@@ -176,13 +174,11 @@ pub async fn team_members_get_organization(
             .filter(|x| {
                 logged_in
                     || x.accepted
-                    || user_id
-                        .map(|y: crate::database::models::DBUserId| {
-                            y == x.user_id
-                        })
-                        .unwrap_or(false)
+                    || user_id.is_some_and(
+                        |y: crate::database::models::DBUserId| y == x.user_id,
+                    )
             })
-            .flat_map(|data| {
+            .filter_map(|data| {
                 users.iter().find(|x| x.id == data.user_id).map(|user| {
                     crate::models::teams::TeamMember::from(
                         data,
@@ -222,7 +218,7 @@ pub async fn team_members_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -242,11 +238,11 @@ pub async fn team_members_get(
         .filter(|x| {
             logged_in
                 || x.accepted
-                || user_id
-                    .map(|y: crate::database::models::DBUserId| y == x.user_id)
-                    .unwrap_or(false)
+                || user_id.is_some_and(
+                    |y: crate::database::models::DBUserId| y == x.user_id,
+                )
         })
-        .flat_map(|data| {
+        .filter_map(|data| {
             users.iter().find(|x| x.id == data.user_id).map(|user| {
                 crate::models::teams::TeamMember::from(
                     data,
@@ -294,7 +290,7 @@ pub async fn teams_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -319,7 +315,7 @@ pub async fn teams_get(
         let team_members = members
             .into_iter()
             .filter(|x| logged_in || x.accepted)
-            .flat_map(|data| {
+            .filter_map(|data| {
                 users.iter().find(|x| x.id == data.user_id).map(|user| {
                     crate::models::teams::TeamMember::from(
                         data,
@@ -348,7 +344,7 @@ pub async fn join_team(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -437,7 +433,7 @@ pub async fn add_team_member(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -592,8 +588,7 @@ pub async fn add_team_member(
             };
         if new_user_organization_team_member
             .as_ref()
-            .map(|tm| tm.is_owner)
-            .unwrap_or(false)
+            .is_some_and(|tm| tm.is_owner)
             && new_member.permissions != ProjectPermissions::all()
         {
             return Err(ApiError::InvalidInput(
@@ -692,7 +687,7 @@ pub async fn edit_team_member(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -748,12 +743,10 @@ pub async fn edit_team_member(
 
             if organization_team_member
                 .as_ref()
-                .map(|x| x.is_owner)
-                .unwrap_or(false)
+                .is_some_and(|x| x.is_owner)
                 && edit_member
                     .permissions
-                    .map(|x| x != ProjectPermissions::all())
-                    .unwrap_or(false)
+                    .is_some_and(|x| x != ProjectPermissions::all())
             {
                 return Err(ApiError::CustomAuthentication(
                     "You cannot override the project permissions of the organization owner!"
@@ -878,7 +871,7 @@ pub async fn transfer_ownership(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
@@ -1011,7 +1004,7 @@ pub async fn transfer_ownership(
                     .collect();
 
             // If the owner of the organization is a member of the project, remove them
-            for team_id in team_ids.iter() {
+            for team_id in &team_ids {
                 DBTeamMember::delete(
                     *team_id,
                     new_owner.user_id.into(),
@@ -1050,7 +1043,7 @@ pub async fn remove_team_member(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_WRITE]),
+        Scopes::PROJECT_WRITE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/threads.rs b/apps/labrinth/src/routes/v3/threads.rs
index 7dcca96a0..0939ae720 100644
--- a/apps/labrinth/src/routes/v3/threads.rs
+++ b/apps/labrinth/src/routes/v3/threads.rs
@@ -119,7 +119,7 @@ pub async fn filter_authorized_threads(
         let project_thread_ids = check_threads
             .iter()
             .filter(|x| x.type_ == ThreadType::Project)
-            .flat_map(|x| x.project_id.map(|x| x.0))
+            .filter_map(|x| x.project_id.map(|x| x.0))
             .collect::<Vec<_>>();
 
         if !project_thread_ids.is_empty() {
@@ -148,13 +148,12 @@ pub async fn filter_authorized_threads(
             .await?;
         }
 
-        let org_project_thread_ids = check_threads
+        let mut org_project_thread_ids = check_threads
             .iter()
             .filter(|x| x.type_ == ThreadType::Project)
-            .flat_map(|x| x.project_id.map(|x| x.0))
-            .collect::<Vec<_>>();
+            .filter_map(|x| x.project_id.map(|x| x.0));
 
-        if !org_project_thread_ids.is_empty() {
+        if org_project_thread_ids.next().is_some() {
             sqlx::query!(
                 "
                 SELECT m.id FROM mods m
@@ -184,7 +183,7 @@ pub async fn filter_authorized_threads(
         let report_thread_ids = check_threads
             .iter()
             .filter(|x| x.type_ == ThreadType::Report)
-            .flat_map(|x| x.report_id.map(|x| x.0))
+            .filter_map(|x| x.report_id.map(|x| x.0))
             .collect::<Vec<_>>();
 
         if !report_thread_ids.is_empty() {
@@ -285,7 +284,7 @@ pub async fn thread_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::THREAD_READ]),
+        Scopes::THREAD_READ,
     )
     .await?
     .1;
@@ -341,7 +340,7 @@ pub async fn threads_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::THREAD_READ]),
+        Scopes::THREAD_READ,
     )
     .await?
     .1;
@@ -379,7 +378,7 @@ pub async fn thread_send_message(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::THREAD_WRITE]),
+        Scopes::THREAD_WRITE,
     )
     .await?
     .1;
@@ -577,7 +576,7 @@ pub async fn message_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::THREAD_WRITE]),
+        Scopes::THREAD_WRITE,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/users.rs b/apps/labrinth/src/routes/v3/users.rs
index 625a1e0a2..4ce13a411 100644
--- a/apps/labrinth/src/routes/v3/users.rs
+++ b/apps/labrinth/src/routes/v3/users.rs
@@ -60,7 +60,7 @@ pub async fn admin_user_email(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::SESSION_ACCESS]),
+        Scopes::SESSION_ACCESS,
     )
     .await
     .map(|x| x.1)?;
@@ -114,7 +114,7 @@ pub async fn projects_list(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -150,7 +150,7 @@ pub async fn user_auth_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_READ]),
+        Scopes::USER_READ,
     )
     .await?;
 
@@ -200,14 +200,14 @@ pub async fn user_get(
             &**pool,
             &redis,
             &session_queue,
-            Some(&[Scopes::SESSION_ACCESS]),
+            Scopes::SESSION_ACCESS,
         )
         .await
         .map(|x| x.1)
         .ok();
 
         let response: crate::models::users::User =
-            if auth_user.map(|x| x.role.is_admin()).unwrap_or(false) {
+            if auth_user.is_some_and(|x| x.role.is_admin()) {
                 crate::models::users::User::from_full(data)
             } else {
                 data.into()
@@ -231,7 +231,7 @@ pub async fn collections_list(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::COLLECTION_READ]),
+        Scopes::COLLECTION_READ,
     )
     .await
     .map(|x| x.1)
@@ -242,9 +242,8 @@ pub async fn collections_list(
     if let Some(id) = id_option.map(|x| x.id) {
         let user_id: UserId = id.into();
 
-        let can_view_private = user
-            .map(|y| y.role.is_mod() || y.id == user_id)
-            .unwrap_or(false);
+        let can_view_private =
+            user.is_some_and(|y| y.role.is_mod() || y.id == user_id);
 
         let project_data = DBUser::get_collections(id, &**pool).await?;
 
@@ -279,7 +278,7 @@ pub async fn orgs_list(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ]),
+        Scopes::PROJECT_READ,
     )
     .await
     .map(|x| x.1)
@@ -334,7 +333,7 @@ pub async fn orgs_list(
             let team_members: Vec<_> = members_data
                 .into_iter()
                 .filter(|x| logged_in || x.accepted || id == x.user_id)
-                .flat_map(|data| {
+                .filter_map(|data| {
                     users.iter().find(|x| x.id == data.user_id).map(|user| {
                         crate::models::teams::TeamMember::from(
                             data,
@@ -389,7 +388,7 @@ pub async fn user_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?;
 
@@ -412,8 +411,7 @@ pub async fn user_edit(
 
                 if existing_user_id_option
                     .map(|x| UserId::from(x.id))
-                    .map(|id| id == user.id)
-                    .unwrap_or(true)
+                    .is_none_or(|id| id == user.id)
                 {
                     sqlx::query!(
                         "
@@ -561,7 +559,7 @@ pub async fn user_icon_edit(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?
     .1;
@@ -633,7 +631,7 @@ pub async fn user_icon_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_WRITE]),
+        Scopes::USER_WRITE,
     )
     .await?
     .1;
@@ -685,7 +683,7 @@ pub async fn user_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_DELETE]),
+        Scopes::USER_DELETE,
     )
     .await?
     .1;
@@ -726,7 +724,7 @@ pub async fn user_follows(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::USER_READ]),
+        Scopes::USER_READ,
     )
     .await?
     .1;
@@ -768,7 +766,7 @@ pub async fn user_notifications(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::NOTIFICATION_READ]),
+        Scopes::NOTIFICATION_READ,
     )
     .await?
     .1;
diff --git a/apps/labrinth/src/routes/v3/version_creation.rs b/apps/labrinth/src/routes/v3/version_creation.rs
index fcb0a91e0..65a299d51 100644
--- a/apps/labrinth/src/routes/v3/version_creation.rs
+++ b/apps/labrinth/src/routes/v3/version_creation.rs
@@ -169,7 +169,7 @@ async fn version_create_inner(
         pool,
         redis,
         session_queue,
-        Some(&[Scopes::VERSION_CREATE]),
+        Scopes::VERSION_CREATE,
     )
     .await?
     .1;
@@ -599,20 +599,17 @@ async fn upload_file_to_version_inner(
         &**client,
         &redis,
         session_queue,
-        Some(&[Scopes::VERSION_WRITE]),
+        Scopes::VERSION_WRITE,
     )
     .await?
     .1;
 
     let result = models::DBVersion::get(version_id, &**client, &redis).await?;
 
-    let version = match result {
-        Some(v) => v,
-        None => {
-            return Err(CreateError::InvalidInput(
-                "An invalid version id was supplied".to_string(),
-            ));
-        }
+    let Some(version) = result else {
+        return Err(CreateError::InvalidInput(
+            "An invalid version id was supplied".to_string(),
+        ));
     };
 
     let all_loaders =
@@ -1065,7 +1062,7 @@ pub fn try_create_version_fields(
         .filter(|lf| !lf.optional)
         .map(|lf| lf.field.clone())
         .collect::<HashSet<_>>();
-    for (key, value) in submitted_fields.iter() {
+    for (key, value) in submitted_fields {
         let loader_field = loader_fields
             .iter()
             .find(|lf| &lf.field == key)
diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs
index 744aa8d9b..f7d2defa0 100644
--- a/apps/labrinth/src/routes/v3/version_file.rs
+++ b/apps/labrinth/src/routes/v3/version_file.rs
@@ -46,16 +46,15 @@ pub async fn get_version_from_hash(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
     .ok();
     let hash = info.into_inner().0.to_lowercase();
-    let algorithm = hash_query
-        .algorithm
-        .clone()
-        .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
+    let algorithm = hash_query.algorithm.clone().unwrap_or_else(|| {
+        default_algorithm_from_hashes(std::slice::from_ref(&hash))
+    });
     let file = database::models::DBVersion::get_file_from_hash(
         algorithm,
         hash,
@@ -133,17 +132,16 @@ pub async fn get_update_from_hash(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
     .ok();
     let hash = info.into_inner().0.to_lowercase();
     if let Some(file) = database::models::DBVersion::get_file_from_hash(
-        hash_query
-            .algorithm
-            .clone()
-            .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()])),
+        hash_query.algorithm.clone().unwrap_or_else(|| {
+            default_algorithm_from_hashes(std::slice::from_ref(&hash))
+        }),
         hash,
         hash_query.version_id.map(|x| x.into()),
         &**pool,
@@ -233,7 +231,7 @@ pub async fn get_versions_from_hashes(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -287,7 +285,7 @@ pub async fn get_projects_from_hashes(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ, Scopes::VERSION_READ]),
+        Scopes::PROJECT_READ | Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -439,7 +437,7 @@ pub async fn update_individual_files(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -571,16 +569,15 @@ pub async fn delete_file(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_WRITE]),
+        Scopes::VERSION_WRITE,
     )
     .await?
     .1;
 
     let hash = info.into_inner().0.to_lowercase();
-    let algorithm = hash_query
-        .algorithm
-        .clone()
-        .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
+    let algorithm = hash_query.algorithm.clone().unwrap_or_else(|| {
+        default_algorithm_from_hashes(std::slice::from_ref(&hash))
+    });
     let file = database::models::DBVersion::get_file_from_hash(
         algorithm.clone(),
         hash,
@@ -702,17 +699,16 @@ pub async fn download_version(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
     .ok();
 
     let hash = info.into_inner().0.to_lowercase();
-    let algorithm = hash_query
-        .algorithm
-        .clone()
-        .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
+    let algorithm = hash_query.algorithm.clone().unwrap_or_else(|| {
+        default_algorithm_from_hashes(std::slice::from_ref(&hash))
+    });
     let file = database::models::DBVersion::get_file_from_hash(
         algorithm.clone(),
         hash,
diff --git a/apps/labrinth/src/routes/v3/versions.rs b/apps/labrinth/src/routes/v3/versions.rs
index 3fd159c37..5a921a52f 100644
--- a/apps/labrinth/src/routes/v3/versions.rs
+++ b/apps/labrinth/src/routes/v3/versions.rs
@@ -80,7 +80,7 @@ pub async fn version_project_get_helper(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ, Scopes::VERSION_READ]),
+        Scopes::PROJECT_READ | Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -145,7 +145,7 @@ pub async fn versions_get(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -184,7 +184,7 @@ pub async fn version_get_helper(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_READ]),
+        Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -281,7 +281,7 @@ pub async fn version_edit_helper(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_WRITE]),
+        Scopes::VERSION_WRITE,
     )
     .await?
     .1;
@@ -736,7 +736,7 @@ pub async fn version_list(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::PROJECT_READ, Scopes::VERSION_READ]),
+        Scopes::PROJECT_READ | Scopes::VERSION_READ,
     )
     .await
     .map(|x| x.1)
@@ -794,8 +794,7 @@ pub async fn version_list(
             .filter(|version| {
                 filters
                     .featured
-                    .map(|featured| featured == version.inner.featured)
-                    .unwrap_or(true)
+                    .is_none_or(|featured| featured == version.inner.featured)
             })
             .cloned()
             .collect::<Vec<_>>();
@@ -830,22 +829,20 @@ pub async fn version_list(
             }
 
             joined_filters.into_iter().for_each(|filter| {
-                versions
-                    .iter()
-                    .find(|version| {
-                        // TODO: This is the bandaid fix for detecting auto-featured versions.
-                        let game_versions = version
-                            .version_fields
-                            .iter()
-                            .find(|vf| vf.field_name == "game_versions")
-                            .map(|vf| vf.value.clone())
-                            .map(|v| v.as_strings())
-                            .unwrap_or_default();
-                        game_versions.contains(&filter.0.version)
-                            && version.loaders.contains(&filter.1.loader)
-                    })
-                    .map(|version| response.push(version.clone()))
-                    .unwrap_or(());
+                if let Some(version) = versions.iter().find(|version| {
+                    // TODO: This is the bandaid fix for detecting auto-featured versions.
+                    let game_versions = version
+                        .version_fields
+                        .iter()
+                        .find(|vf| vf.field_name == "game_versions")
+                        .map(|vf| vf.value.clone())
+                        .map(|v| v.as_strings())
+                        .unwrap_or_default();
+                    game_versions.contains(&filter.0.version)
+                        && version.loaders.contains(&filter.1.loader)
+                }) {
+                    response.push(version.clone());
+                }
             });
 
             if response.is_empty() {
@@ -883,7 +880,7 @@ pub async fn version_delete(
         &**pool,
         &redis,
         &session_queue,
-        Some(&[Scopes::VERSION_DELETE]),
+        Scopes::VERSION_DELETE,
     )
     .await?
     .1;
@@ -961,7 +958,7 @@ pub async fn version_delete(
     )
     .await?;
     transaction.commit().await?;
-    remove_documents(&[version.inner.id.into()], &search_config).await?;
+
     database::models::DBProject::clear_cache(
         version.inner.project_id,
         None,
@@ -969,6 +966,7 @@ pub async fn version_delete(
         &redis,
     )
     .await?;
+    remove_documents(&[version.inner.id.into()], &search_config).await?;
 
     if result.is_some() {
         Ok(HttpResponse::NoContent().body(""))
diff --git a/apps/labrinth/src/search/indexing/local_import.rs b/apps/labrinth/src/search/indexing/local_import.rs
index c6d2e408c..4fca8ea33 100644
--- a/apps/labrinth/src/search/indexing/local_import.rs
+++ b/apps/labrinth/src/search/indexing/local_import.rs
@@ -362,7 +362,7 @@ pub async fn index_local(
                 let (_, v2_og_project_type) =
                     LegacyProject::get_project_type(&project_types);
                 let (client_side, server_side) =
-                    v2_reroute::convert_side_types_v2(
+                    v2_reroute::convert_v3_side_types_to_v2_side_types(
                         &unvectorized_loader_fields,
                         Some(&v2_og_project_type),
                     );
@@ -522,7 +522,7 @@ async fn index_versions(
     // Convert to partial versions
     let mut res_versions: HashMap<DBProjectId, Vec<PartialVersion>> =
         HashMap::new();
-    for (project_id, version_ids) in versions.iter() {
+    for (project_id, version_ids) in &versions {
         for version_id in version_ids {
             // Extract version-specific data fetched
             // We use 'remove' as every version is only in the map once
diff --git a/apps/labrinth/src/search/indexing/mod.rs b/apps/labrinth/src/search/indexing/mod.rs
index 3f4dcdee9..1ecb70ad7 100644
--- a/apps/labrinth/src/search/indexing/mod.rs
+++ b/apps/labrinth/src/search/indexing/mod.rs
@@ -1,9 +1,13 @@
 /// This module is used for the indexing from any source.
 pub mod local_import;
 
+use std::time::Duration;
+
 use crate::database::redis::RedisPool;
 use crate::search::{SearchConfig, UploadSearchProject};
 use ariadne::ids::base62_impl::to_base62;
+use futures::StreamExt;
+use futures::stream::FuturesUnordered;
 use local_import::index_local;
 use meilisearch_sdk::client::{Client, SwapIndexes};
 use meilisearch_sdk::indexes::Index;
@@ -11,6 +15,7 @@ use meilisearch_sdk::settings::{PaginationSetting, Settings};
 use sqlx::postgres::PgPool;
 use thiserror::Error;
 use tracing::info;
+
 #[derive(Error, Debug)]
 pub enum IndexingError {
     #[error("Error while connecting to the MeiliSearch database")]
@@ -41,12 +46,30 @@ pub async fn remove_documents(
     let mut indexes_next = get_indexes_for_indexing(config, true).await?;
     indexes.append(&mut indexes_next);
 
-    for index in indexes {
-        index
-            .delete_documents(
-                &ids.iter().map(|x| to_base62(x.0)).collect::<Vec<_>>(),
-            )
-            .await?;
+    let client = config.make_client()?;
+    let client = &client;
+    let mut deletion_tasks = FuturesUnordered::new();
+
+    for index in &indexes {
+        deletion_tasks.push(async move {
+            // After being successfully submitted, Meilisearch tasks are executed
+            // asynchronously, so wait some time for them to complete
+            index
+                .delete_documents(
+                    &ids.iter().map(|x| to_base62(x.0)).collect::<Vec<_>>(),
+                )
+                .await?
+                .wait_for_completion(
+                    client,
+                    None,
+                    Some(Duration::from_secs(15)),
+                )
+                .await
+        });
+    }
+
+    while let Some(result) = deletion_tasks.next().await {
+        result?;
     }
 
     Ok(())
@@ -327,11 +350,8 @@ const DEFAULT_DISPLAYED_ATTRIBUTES: &[&str] = &[
     "color",
     // Note: loader fields are not here, but are added on as they are needed (so they can be dynamically added depending on which exist).
     // TODO: remove these- as they should be automatically populated. This is a band-aid fix.
-    "server_only",
-    "client_only",
+    "environment",
     "game_versions",
-    "singleplayer",
-    "client_and_server",
     "mrpack_loaders",
     // V2 legacy fields for logical consistency
     "client_side",
@@ -374,11 +394,8 @@ const DEFAULT_ATTRIBUTES_FOR_FACETING: &[&str] = &[
     "color",
     // Note: loader fields are not here, but are added on as they are needed (so they can be dynamically added depending on which exist).
     // TODO: remove these- as they should be automatically populated. This is a band-aid fix.
-    "server_only",
-    "client_only",
+    "environment",
     "game_versions",
-    "singleplayer",
-    "client_and_server",
     "mrpack_loaders",
     // V2 legacy fields for logical consistency
     "client_side",
diff --git a/apps/labrinth/src/util/actix.rs b/apps/labrinth/src/util/actix.rs
index f0c626b70..b016ec82c 100644
--- a/apps/labrinth/src/util/actix.rs
+++ b/apps/labrinth/src/util/actix.rs
@@ -13,7 +13,6 @@ pub struct MultipartSegment {
 }
 
 #[derive(Debug, Clone)]
-#[allow(dead_code)]
 pub enum MultipartSegmentData {
     Text(String),
     Binary(Vec<u8>),
diff --git a/apps/labrinth/src/util/img.rs b/apps/labrinth/src/util/img.rs
index 079da9106..41bb108ed 100644
--- a/apps/labrinth/src/util/img.rs
+++ b/apps/labrinth/src/util/img.rs
@@ -98,13 +98,12 @@ pub async fn upload_image_optimized(
 
     let url = format!("{}/{}", cdn_url, upload_data.file_name);
     Ok(UploadImageResult {
-        url: processed_upload_data
-            .clone()
-            .map(|x| format!("{}/{}", cdn_url, x.file_name))
-            .unwrap_or_else(|| url.clone()),
+        url: processed_upload_data.clone().map_or_else(
+            || url.clone(),
+            |x| format!("{}/{}", cdn_url, x.file_name),
+        ),
         url_path: processed_upload_data
-            .map(|x| x.file_name)
-            .unwrap_or_else(|| upload_data.file_name.clone()),
+            .map_or_else(|| upload_data.file_name.clone(), |x| x.file_name),
 
         raw_url: url,
         raw_url_path: upload_data.file_name,
@@ -119,7 +118,7 @@ fn process_image(
     min_aspect_ratio: Option<f32>,
 ) -> Result<(bytes::Bytes, String), ImageError> {
     if content_type.to_lowercase() == "image/gif" {
-        return Ok((image_bytes.clone(), "gif".to_string()));
+        return Ok((image_bytes, "gif".to_string()));
     }
 
     let mut img = image::load_from_memory(&image_bytes)?;
diff --git a/apps/labrinth/src/util/ratelimit.rs b/apps/labrinth/src/util/ratelimit.rs
index 62941f97f..4f7b10342 100644
--- a/apps/labrinth/src/util/ratelimit.rs
+++ b/apps/labrinth/src/util/ratelimit.rs
@@ -56,18 +56,15 @@ impl AsyncRateLimiter {
     }
 
     pub async fn check_rate_limit(&self, key: &str) -> RateLimitDecision {
-        let mut conn = match self.redis_pool.connect().await {
-            Ok(conn) => conn,
-            Err(_) => {
-                // If Redis is unavailable, allow the request but with reduced limit
-                return RateLimitDecision {
-                    allowed: true,
-                    limit: self.params.burst_size,
-                    remaining: 1,
-                    reset_after_ms: 60_000, // 1 minute
-                    retry_after_ms: None,
-                };
-            }
+        let Ok(mut conn) = self.redis_pool.connect().await else {
+            // If Redis is unavailable, allow the request but with reduced limit
+            return RateLimitDecision {
+                allowed: true,
+                limit: self.params.burst_size,
+                remaining: 1,
+                reset_after_ms: 60_000, // 1 minute
+                retry_after_ms: None,
+            };
         };
 
         // Get current time in nanoseconds since UNIX epoch
diff --git a/apps/labrinth/src/util/routes.rs b/apps/labrinth/src/util/routes.rs
index cad439c62..4766ef81f 100644
--- a/apps/labrinth/src/util/routes.rs
+++ b/apps/labrinth/src/util/routes.rs
@@ -32,11 +32,13 @@ pub async fn read_from_field(
 ) -> Result<BytesMut, CreateError> {
     let mut bytes = BytesMut::new();
     while let Some(chunk) = field.next().await {
-        if bytes.len() >= cap {
+        let chunk = chunk?;
+
+        if bytes.len().saturating_add(chunk.len()) > cap {
             return Err(CreateError::InvalidInput(String::from(err_msg)));
-        } else {
-            bytes.extend_from_slice(&chunk?);
         }
+
+        bytes.extend_from_slice(&chunk);
     }
     Ok(bytes)
 }
diff --git a/apps/labrinth/src/util/validate.rs b/apps/labrinth/src/util/validate.rs
index ebb95accc..dfa4b7a71 100644
--- a/apps/labrinth/src/util/validate.rs
+++ b/apps/labrinth/src/util/validate.rs
@@ -1,4 +1,4 @@
-use std::sync::LazyLock;
+use std::{fmt::Write, sync::LazyLock};
 
 use itertools::Itertools;
 use regex::Regex;
@@ -44,15 +44,17 @@ pub fn validation_errors_to_string(
                 ValidationErrorsKind::Field(errors) => {
                     if let Some(error) = errors.first() {
                         if let Some(adder) = adder {
-                            output.push_str(&format!(
-                                "Field {} {} failed validation with error: {}",
-                                field, adder, error.code
-                            ));
+                            write!(
+                                &mut output,
+                                "Field {field} {adder} failed validation with error: {}",
+                                error.code
+                            ).unwrap();
                         } else {
-                            output.push_str(&format!(
-                                "Field {} failed validation with error: {}",
-                                field, error.code
-                            ));
+                            write!(
+                                &mut output,
+                                "Field {field} failed validation with error: {}",
+                                error.code
+                            ).unwrap();
                         }
                     }
 
diff --git a/apps/labrinth/src/validate/datapack.rs b/apps/labrinth/src/validate/datapack.rs
index 18cdd7e76..f152486d4 100644
--- a/apps/labrinth/src/validate/datapack.rs
+++ b/apps/labrinth/src/validate/datapack.rs
@@ -1,8 +1,8 @@
 use crate::validate::{
-    SupportedGameVersions, ValidationError, ValidationResult,
+    MaybeProtectedZipFile, PLAUSIBLE_PACK_REGEX, SupportedGameVersions,
+    ValidationError, ValidationResult,
 };
-use std::io::Cursor;
-use zip::ZipArchive;
+use chrono::DateTime;
 
 pub struct DataPackValidator;
 
@@ -16,19 +16,29 @@ impl super::Validator for DataPackValidator {
     }
 
     fn get_supported_game_versions(&self) -> SupportedGameVersions {
-        SupportedGameVersions::All
+        // Time since release of 17w43a, 2017-10-25, which introduced datapacks
+        SupportedGameVersions::PastDate(
+            DateTime::from_timestamp(1508889600, 0).unwrap(),
+        )
     }
 
-    fn validate(
+    fn validate_maybe_protected_zip(
         &self,
-        archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
+        file: &mut MaybeProtectedZipFile,
     ) -> Result<ValidationResult, ValidationError> {
-        if archive.by_name("pack.mcmeta").is_err() {
-            return Ok(ValidationResult::Warning(
+        if match file {
+            MaybeProtectedZipFile::Unprotected(archive) => {
+                archive.by_name("pack.mcmeta").is_ok()
+            }
+            MaybeProtectedZipFile::MaybeProtected { data, .. } => {
+                PLAUSIBLE_PACK_REGEX.is_match(data)
+            }
+        } {
+            Ok(ValidationResult::Pass)
+        } else {
+            Ok(ValidationResult::Warning(
                 "No pack.mcmeta present for datapack file. Tip: Make sure pack.mcmeta is in the root directory of your datapack!",
-            ));
+            ))
         }
-
-        Ok(ValidationResult::Pass)
     }
 }
diff --git a/apps/labrinth/src/validate/mod.rs b/apps/labrinth/src/validate/mod.rs
index ec2db81c8..6304b61dd 100644
--- a/apps/labrinth/src/validate/mod.rs
+++ b/apps/labrinth/src/validate/mod.rs
@@ -17,10 +17,14 @@ use crate::validate::rift::RiftValidator;
 use crate::validate::shader::{
     CanvasShaderValidator, CoreShaderValidator, ShaderValidator,
 };
+use bytes::Bytes;
 use chrono::{DateTime, Utc};
-use std::io::Cursor;
+use std::io::{self, Cursor};
+use std::mem;
+use std::sync::LazyLock;
 use thiserror::Error;
 use zip::ZipArchive;
+use zip::result::ZipError;
 
 mod datapack;
 mod fabric;
@@ -77,18 +81,46 @@ pub enum SupportedGameVersions {
     All,
     PastDate(DateTime<Utc>),
     Range(DateTime<Utc>, DateTime<Utc>),
-    #[allow(dead_code)]
     Custom(Vec<MinecraftGameVersion>),
 }
 
+pub enum MaybeProtectedZipFile {
+    Unprotected(ZipArchive<Cursor<Bytes>>),
+    MaybeProtected { read_error: ZipError, data: Bytes },
+}
+
 pub trait Validator: Sync {
     fn get_file_extensions(&self) -> &[&str];
     fn get_supported_loaders(&self) -> &[&str];
     fn get_supported_game_versions(&self) -> SupportedGameVersions;
+
     fn validate(
         &self,
         archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
-    ) -> Result<ValidationResult, ValidationError>;
+    ) -> Result<ValidationResult, ValidationError> {
+        // By default, any non-protected ZIP archive is valid
+        let _ = archive;
+        Ok(ValidationResult::Pass)
+    }
+
+    fn validate_maybe_protected_zip(
+        &self,
+        file: &mut MaybeProtectedZipFile,
+    ) -> Result<ValidationResult, ValidationError> {
+        // By default, validate that the ZIP file is not protected, and if so,
+        // delegate to the inner validate method with a known good archive
+        match file {
+            MaybeProtectedZipFile::Unprotected(archive) => {
+                self.validate(archive)
+            }
+            MaybeProtectedZipFile::MaybeProtected { read_error, .. } => {
+                Err(ValidationError::Zip(mem::replace(
+                    read_error,
+                    ZipError::Io(io::Error::other("ZIP archive reading error")),
+                )))
+            }
+        }
+    }
 }
 
 static ALWAYS_ALLOWED_EXT: &[&str] = &["zip", "txt"];
@@ -114,6 +146,29 @@ static VALIDATORS: &[&dyn Validator] = &[
     &NeoForgeValidator,
 ];
 
+/// A regex that matches a potentially protected ZIP archive containing
+/// a vanilla Minecraft pack, with a requisite `pack.mcmeta` file.
+///
+/// Please note that this regex avoids false negatives at the cost of false
+/// positives being possible, i.e. it may match files that are not actually
+/// Minecraft packs, but it will not miss packs that the game can load.
+static PLAUSIBLE_PACK_REGEX: LazyLock<regex::bytes::Regex> =
+    LazyLock::new(|| {
+        regex::bytes::RegexBuilder::new(concat!(
+            r"\x50\x4b\x01\x02", // CEN signature
+            r".{24}",            // CEN fields
+            r"[\x0B\x0C]\x00",   // CEN file name length
+            r".{16}",            // More CEN fields
+            r"pack\.mcmeta/?",   // CEN file name
+            r".*",               // Rest of CEN entries and records
+            r"\x50\x4b\x05\x06", // EOCD signature
+        ))
+        .unicode(false)
+        .dot_matches_new_line(true)
+        .build()
+        .unwrap()
+    });
+
 /// The return value is whether this file should be marked as primary or not, based on the analysis of the file
 #[allow(clippy::too_many_arguments)]
 pub async fn validate_file(
@@ -145,7 +200,7 @@ pub async fn validate_file(
 }
 
 async fn validate_minecraft_file(
-    data: bytes::Bytes,
+    data: Bytes,
     file_extension: String,
     loaders: Vec<Loader>,
     game_versions: Vec<MinecraftGameVersion>,
@@ -153,13 +208,18 @@ async fn validate_minecraft_file(
     file_type: Option<FileType>,
 ) -> Result<ValidationResult, ValidationError> {
     actix_web::web::block(move || {
-        let reader = Cursor::new(data);
-        let mut zip = ZipArchive::new(reader)?;
+        let mut zip = match ZipArchive::new(Cursor::new(Bytes::clone(&data))) {
+            Ok(zip) => MaybeProtectedZipFile::Unprotected(zip),
+            Err(read_error) => MaybeProtectedZipFile::MaybeProtected {
+                read_error,
+                data,
+            },
+        };
 
         if let Some(file_type) = file_type {
             match file_type {
                 FileType::RequiredResourcePack | FileType::OptionalResourcePack => {
-                    return PackValidator.validate(&mut zip);
+                    return PackValidator.validate_maybe_protected_zip(&mut zip);
                 }
                 FileType::Unknown => {}
             }
@@ -178,7 +238,7 @@ async fn validate_minecraft_file(
                 )
             {
                 if validator.get_file_extensions().contains(&&*file_extension) {
-                    let result = validator.validate(&mut zip)?;
+                    let result = validator.validate_maybe_protected_zip(&mut zip)?;
                     match result {
                         ValidationResult::PassWithPackDataAndFiles { .. } => {
                             saved_result = Some(result);
@@ -232,8 +292,7 @@ fn game_version_supported(
                 all_game_versions
                     .iter()
                     .find(|y| y.version == x.version)
-                    .map(|x| x.created > date)
-                    .unwrap_or(false)
+                    .is_some_and(|x| x.created > date)
             })
         }
         SupportedGameVersions::Range(before, after) => {
@@ -241,8 +300,7 @@ fn game_version_supported(
                 all_game_versions
                     .iter()
                     .find(|y| y.version == x.version)
-                    .map(|x| x.created > before && x.created < after)
-                    .unwrap_or(false)
+                    .is_some_and(|x| x.created > before && x.created < after)
             })
         }
         SupportedGameVersions::Custom(versions) => {
diff --git a/apps/labrinth/src/validate/modpack.rs b/apps/labrinth/src/validate/modpack.rs
index e05e159ef..8e66005c3 100644
--- a/apps/labrinth/src/validate/modpack.rs
+++ b/apps/labrinth/src/validate/modpack.rs
@@ -28,14 +28,11 @@ impl super::Validator for ModpackValidator {
         archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
     ) -> Result<ValidationResult, ValidationError> {
         let pack: PackFormat = {
-            let mut file =
-                if let Ok(file) = archive.by_name("modrinth.index.json") {
-                    file
-                } else {
-                    return Ok(ValidationResult::Warning(
-                        "Pack manifest is missing.",
-                    ));
-                };
+            let Ok(mut file) = archive.by_name("modrinth.index.json") else {
+                return Ok(ValidationResult::Warning(
+                    "Pack manifest is missing.",
+                ));
+            };
 
             let mut contents = String::new();
             file.read_to_string(&mut contents)?;
@@ -109,7 +106,7 @@ impl super::Validator for ModpackValidator {
                             || x.starts_with("overrides/shaderpacks")
                             || x.starts_with("client-overrides/shaderpacks"))
                 })
-                .flat_map(|x| x.rsplit('/').next().map(|x| x.to_string()))
+                .filter_map(|x| x.rsplit('/').next().map(|x| x.to_string()))
                 .collect::<Vec<String>>(),
         })
     }
diff --git a/apps/labrinth/src/validate/resourcepack.rs b/apps/labrinth/src/validate/resourcepack.rs
index 687c5b4e8..1d9d52c35 100644
--- a/apps/labrinth/src/validate/resourcepack.rs
+++ b/apps/labrinth/src/validate/resourcepack.rs
@@ -1,5 +1,6 @@
 use crate::validate::{
-    SupportedGameVersions, ValidationError, ValidationResult,
+    MaybeProtectedZipFile, PLAUSIBLE_PACK_REGEX, SupportedGameVersions,
+    ValidationError, ValidationResult,
 };
 use chrono::DateTime;
 use std::io::Cursor;
@@ -23,17 +24,24 @@ impl super::Validator for PackValidator {
         )
     }
 
-    fn validate(
+    fn validate_maybe_protected_zip(
         &self,
-        archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
+        file: &mut MaybeProtectedZipFile,
     ) -> Result<ValidationResult, ValidationError> {
-        if archive.by_name("pack.mcmeta").is_err() {
-            return Ok(ValidationResult::Warning(
-                "No pack.mcmeta present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!",
-            ));
+        if match file {
+            MaybeProtectedZipFile::Unprotected(archive) => {
+                archive.by_name("pack.mcmeta").is_ok()
+            }
+            MaybeProtectedZipFile::MaybeProtected { data, .. } => {
+                PLAUSIBLE_PACK_REGEX.is_match(data)
+            }
+        } {
+            Ok(ValidationResult::Pass)
+        } else {
+            Ok(ValidationResult::Warning(
+                "No pack.mcmeta present for resourcepack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!",
+            ))
         }
-
-        Ok(ValidationResult::Pass)
     }
 }
 
diff --git a/apps/labrinth/src/validate/shader.rs b/apps/labrinth/src/validate/shader.rs
index 6a83a8195..2ba7d7222 100644
--- a/apps/labrinth/src/validate/shader.rs
+++ b/apps/labrinth/src/validate/shader.rs
@@ -1,7 +1,8 @@
 use crate::validate::{
-    SupportedGameVersions, ValidationError, ValidationResult,
+    MaybeProtectedZipFile, PLAUSIBLE_PACK_REGEX, SupportedGameVersions,
+    ValidationError, ValidationResult,
 };
-use std::io::Cursor;
+use std::{io::Cursor, sync::LazyLock};
 use zip::ZipArchive;
 
 pub struct ShaderValidator;
@@ -83,25 +84,42 @@ impl super::Validator for CoreShaderValidator {
         SupportedGameVersions::All
     }
 
-    fn validate(
+    fn validate_maybe_protected_zip(
         &self,
-        archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
+        file: &mut MaybeProtectedZipFile,
     ) -> Result<ValidationResult, ValidationError> {
-        if archive.by_name("pack.mcmeta").is_err() {
-            return Ok(ValidationResult::Warning(
-                "No pack.mcmeta present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!",
-            ));
-        };
+        static VANILLA_SHADER_CEN_ENTRY_REGEX: LazyLock<regex::bytes::Regex> =
+            LazyLock::new(|| {
+                regex::bytes::RegexBuilder::new(concat!(
+                    r"\x50\x4b\x01\x02",          // CEN signature
+                    r".{24}",                     // CEN fields
+                    r".{2}",                      // CEN file name length
+                    r".{16}",                     // More CEN fields
+                    r"assets/minecraft/shaders/", // CEN file name
+                ))
+                .unicode(false)
+                .dot_matches_new_line(true)
+                .build()
+                .unwrap()
+            });
 
-        if !archive
-            .file_names()
-            .any(|x| x.starts_with("assets/minecraft/shaders/"))
-        {
-            return Ok(ValidationResult::Warning(
-                "No shaders folder present for vanilla shaders.",
-            ));
+        if match file {
+            MaybeProtectedZipFile::Unprotected(archive) => {
+                archive.by_name("pack.mcmeta").is_ok()
+                    && archive
+                        .file_names()
+                        .any(|x| x.starts_with("assets/minecraft/shaders/"))
+            }
+            MaybeProtectedZipFile::MaybeProtected { data, .. } => {
+                PLAUSIBLE_PACK_REGEX.is_match(data)
+                    && VANILLA_SHADER_CEN_ENTRY_REGEX.is_match(data)
+            }
+        } {
+            Ok(ValidationResult::Pass)
+        } else {
+            Ok(ValidationResult::Warning(
+                "No pack.mcmeta or vanilla shaders folder present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!",
+            ))
         }
-
-        Ok(ValidationResult::Pass)
     }
 }
diff --git a/apps/labrinth/tests/analytics.rs b/apps/labrinth/tests/analytics.rs
index b15dd4d73..217f0e7b1 100644
--- a/apps/labrinth/tests/analytics.rs
+++ b/apps/labrinth/tests/analytics.rs
@@ -12,7 +12,7 @@ use labrinth::models::teams::ProjectPermissions;
 use labrinth::queue::payouts;
 use rust_decimal::{Decimal, prelude::ToPrimitive};
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 pub async fn analytics_revenue() {
@@ -50,7 +50,7 @@ pub async fn analytics_revenue() {
             ];
 
             let project_id = parse_base62(&alpha_project_id).unwrap() as i64;
-            for (money, time) in money_time_pairs.iter() {
+            for (money, time) in &money_time_pairs {
                 insert_user_ids.push(USER_USER_ID_PARSED);
                 insert_project_ids.push(project_id);
                 insert_payouts.push(Decimal::from_f64_retain(*money).unwrap());
@@ -87,7 +87,7 @@ pub async fn analytics_revenue() {
                 )
                 .await;
             assert_eq!(analytics.len(), 1); // 1 project
-            let project_analytics = analytics.get(&alpha_project_id).unwrap();
+            let project_analytics = &analytics[&alpha_project_id];
             assert_eq!(project_analytics.len(), 8); // 1 days cut off, and 2 points take place on the same day. note that the day exactly 14 days ago is included
             // sorted_by_key, values in the order of smallest to largest key
             let (sorted_keys, sorted_by_key): (Vec<i64>, Vec<Decimal>) =
@@ -117,7 +117,7 @@ pub async fn analytics_revenue() {
                     USER_USER_PAT,
                 )
                 .await;
-            let project_analytics = analytics.get(&alpha_project_id).unwrap();
+            let project_analytics = &analytics[&alpha_project_id];
             assert_eq!(project_analytics.len(), 9); // and 2 points take place on the same day
             let (sorted_keys, sorted_by_key): (Vec<i64>, Vec<Decimal>) =
                 project_analytics
diff --git a/apps/labrinth/tests/common/api_common/models.rs b/apps/labrinth/tests/common/api_common/models.rs
index b33324104..454983c2b 100644
--- a/apps/labrinth/tests/common/api_common/models.rs
+++ b/apps/labrinth/tests/common/api_common/models.rs
@@ -31,13 +31,12 @@ use serde::Deserialize;
 // as the environment generator for both uses common fields.
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonProject {
     // For example, for CommonProject, we do not include:
     // - game_versions (v2 only)
     // - loader_fields (v3 only)
     // - etc.
-    // For any tests that require those fields, we make a separate test with separate API functions tht do not use Common models.
+    // For any tests that require those fields, we make a separate test with separate API functions that do not use Common models.
     pub id: ProjectId,
     pub slug: Option<String>,
     pub organization: Option<OrganizationId>,
@@ -62,7 +61,6 @@ pub struct CommonProject {
     pub monetization_status: MonetizationStatus,
 }
 #[derive(Deserialize, Clone)]
-#[allow(dead_code)]
 pub struct CommonVersion {
     pub id: VersionId,
     pub loaders: Vec<String>,
@@ -82,7 +80,6 @@ pub struct CommonVersion {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonLoaderData {
     pub icon: String,
     pub name: String,
@@ -90,7 +87,6 @@ pub struct CommonLoaderData {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonCategoryData {
     pub icon: String,
     pub name: String,
@@ -100,7 +96,6 @@ pub struct CommonCategoryData {
 
 /// A member of a team
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonTeamMember {
     pub team_id: TeamId,
     pub user: User,
@@ -114,7 +109,6 @@ pub struct CommonTeamMember {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonNotification {
     pub id: NotificationId,
     pub user_id: UserId,
@@ -127,7 +121,6 @@ pub struct CommonNotification {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonNotificationAction {
     pub action_route: (String, String),
 }
@@ -153,7 +146,6 @@ impl CommonItemType {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonReport {
     pub id: ReportId,
     pub report_type: String,
@@ -175,7 +167,6 @@ pub enum LegacyItemType {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonThread {
     pub id: ThreadId,
     #[serde(rename = "type")]
@@ -187,7 +178,6 @@ pub struct CommonThread {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonThreadMessage {
     pub id: ThreadMessageId,
     pub author_id: Option<UserId>,
@@ -196,7 +186,6 @@ pub struct CommonThreadMessage {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub enum CommonMessageBody {
     Text {
         body: String,
@@ -216,7 +205,6 @@ pub enum CommonMessageBody {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub enum CommonThreadType {
     Report,
     Project,
@@ -224,7 +212,6 @@ pub enum CommonThreadType {
 }
 
 #[derive(Deserialize)]
-#[allow(dead_code)]
 pub struct CommonUser {
     pub id: UserId,
     pub username: String,
diff --git a/apps/labrinth/tests/common/api_common/request_data.rs b/apps/labrinth/tests/common/api_common/request_data.rs
index eb3a78136..3bfc886aa 100644
--- a/apps/labrinth/tests/common/api_common/request_data.rs
+++ b/apps/labrinth/tests/common/api_common/request_data.rs
@@ -5,21 +5,18 @@ use labrinth::util::actix::MultipartSegment;
 
 use crate::common::dummy_data::TestFile;
 
-#[allow(dead_code)]
 pub struct ProjectCreationRequestData {
     pub slug: String,
     pub jar: Option<TestFile>,
     pub segment_data: Vec<MultipartSegment>,
 }
 
-#[allow(dead_code)]
 pub struct VersionCreationRequestData {
     pub version: String,
     pub jar: Option<TestFile>,
     pub segment_data: Vec<MultipartSegment>,
 }
 
-#[allow(dead_code)]
 pub struct ImageData {
     pub filename: String,
     pub extension: String,
diff --git a/apps/labrinth/tests/common/api_v2/mod.rs b/apps/labrinth/tests/common/api_v2/mod.rs
index c1fbb2cb3..20d0e6e3a 100644
--- a/apps/labrinth/tests/common/api_v2/mod.rs
+++ b/apps/labrinth/tests/common/api_v2/mod.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use super::{
     api_common::{Api, ApiBuildable},
     environment::LocalService,
diff --git a/apps/labrinth/tests/common/api_v2/project.rs b/apps/labrinth/tests/common/api_v2/project.rs
index 90f917bd3..d27eb9adc 100644
--- a/apps/labrinth/tests/common/api_v2/project.rs
+++ b/apps/labrinth/tests/common/api_v2/project.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Write};
 
 use crate::{
     assert_status,
@@ -490,13 +490,13 @@ impl ApiProject for ApiV2 {
             featured = featured
         );
         if let Some(title) = title {
-            url.push_str(&format!("&title={title}"));
+            write!(&mut url, "&title={title}").unwrap();
         }
         if let Some(description) = description {
-            url.push_str(&format!("&description={description}"));
+            write!(&mut url, "&description={description}").unwrap();
         }
         if let Some(ordering) = ordering {
-            url.push_str(&format!("&ordering={ordering}"));
+            write!(&mut url, "&ordering={ordering}").unwrap();
         }
 
         let req = test::TestRequest::post()
@@ -521,11 +521,12 @@ impl ApiProject for ApiV2 {
         );
 
         for (key, value) in patch {
-            url.push_str(&format!(
+            write!(
+                &mut url,
                 "&{key}={value}",
-                key = key,
                 value = urlencoding::encode(&value)
-            ));
+            )
+            .unwrap();
         }
 
         let req = test::TestRequest::patch()
diff --git a/apps/labrinth/tests/common/api_v2/request_data.rs b/apps/labrinth/tests/common/api_v2/request_data.rs
index 0862aaf84..11841ead9 100644
--- a/apps/labrinth/tests/common/api_v2/request_data.rs
+++ b/apps/labrinth/tests/common/api_v2/request_data.rs
@@ -1,4 +1,3 @@
-#![allow(dead_code)]
 use serde_json::json;
 
 use crate::common::{
@@ -90,7 +89,7 @@ pub fn get_public_project_creation_data_json(
         {
             "title": format!("Test Project {slug}"),
             "slug": slug,
-            "project_type": version_jar.as_ref().map(|f| f.project_type()).unwrap_or("mod".to_string()),
+            "project_type": version_jar.as_ref().map_or("mod".to_string(), |f| f.project_type()),
             "description": "A dummy project for testing with.",
             "body": "This project is approved, and versions are listed.",
             "client_side": "required",
diff --git a/apps/labrinth/tests/common/api_v2/version.rs b/apps/labrinth/tests/common/api_v2/version.rs
index eeb8337cd..92b73d44e 100644
--- a/apps/labrinth/tests/common/api_v2/version.rs
+++ b/apps/labrinth/tests/common/api_v2/version.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::fmt::Write;
 
 use super::{
     ApiV2,
@@ -383,32 +384,36 @@ impl ApiVersion for ApiV2 {
     ) -> ServiceResponse {
         let mut query_string = String::new();
         if let Some(game_versions) = game_versions {
-            query_string.push_str(&format!(
+            write!(
+                &mut query_string,
                 "&game_versions={}",
                 urlencoding::encode(
                     &serde_json::to_string(&game_versions).unwrap()
                 )
-            ));
+            )
+            .unwrap();
         }
         if let Some(loaders) = loaders {
-            query_string.push_str(&format!(
+            write!(
+                &mut query_string,
                 "&loaders={}",
                 urlencoding::encode(&serde_json::to_string(&loaders).unwrap())
-            ));
+            )
+            .unwrap();
         }
         if let Some(featured) = featured {
-            query_string.push_str(&format!("&featured={featured}"));
+            write!(&mut query_string, "&featured={featured}").unwrap();
         }
         if let Some(version_type) = version_type {
-            query_string.push_str(&format!("&version_type={version_type}"));
+            write!(&mut query_string, "&version_type={version_type}").unwrap();
         }
         if let Some(limit) = limit {
             let limit = limit.to_string();
-            query_string.push_str(&format!("&limit={limit}"));
+            write!(&mut query_string, "&limit={limit}").unwrap();
         }
         if let Some(offset) = offset {
             let offset = offset.to_string();
-            query_string.push_str(&format!("&offset={offset}"));
+            write!(&mut query_string, "&offset={offset}").unwrap();
         }
 
         let req = test::TestRequest::get()
diff --git a/apps/labrinth/tests/common/api_v3/mod.rs b/apps/labrinth/tests/common/api_v3/mod.rs
index 2b2ceb5d9..d44d4c19b 100644
--- a/apps/labrinth/tests/common/api_v3/mod.rs
+++ b/apps/labrinth/tests/common/api_v3/mod.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use super::{
     api_common::{Api, ApiBuildable},
     environment::LocalService,
diff --git a/apps/labrinth/tests/common/api_v3/project.rs b/apps/labrinth/tests/common/api_v3/project.rs
index 59ad6f8a9..0513206f8 100644
--- a/apps/labrinth/tests/common/api_v3/project.rs
+++ b/apps/labrinth/tests/common/api_v3/project.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Write};
 
 use actix_http::StatusCode;
 use actix_web::{
@@ -363,13 +363,13 @@ impl ApiProject for ApiV3 {
             featured = featured
         );
         if let Some(title) = title {
-            url.push_str(&format!("&title={title}"));
+            write!(&mut url, "&title={title}").unwrap();
         }
         if let Some(description) = description {
-            url.push_str(&format!("&description={description}"));
+            write!(&mut url, "&description={description}").unwrap();
         }
         if let Some(ordering) = ordering {
-            url.push_str(&format!("&ordering={ordering}"));
+            write!(&mut url, "&ordering={ordering}").unwrap();
         }
 
         let req = test::TestRequest::post()
@@ -394,11 +394,12 @@ impl ApiProject for ApiV3 {
         );
 
         for (key, value) in patch {
-            url.push_str(&format!(
+            write!(
+                &mut url,
                 "&{key}={value}",
-                key = key,
                 value = urlencoding::encode(&value)
-            ));
+            )
+            .unwrap();
         }
 
         let req = test::TestRequest::patch()
@@ -593,17 +594,17 @@ impl ApiV3 {
             let start_date = start_date.to_rfc3339();
             // let start_date = serde_json::to_string(&start_date).unwrap();
             let start_date = urlencoding::encode(&start_date);
-            extra_args.push_str(&format!("&start_date={start_date}"));
+            write!(&mut extra_args, "&start_date={start_date}").unwrap();
         }
         if let Some(end_date) = end_date {
             let end_date = end_date.to_rfc3339();
             // let end_date = serde_json::to_string(&end_date).unwrap();
             let end_date = urlencoding::encode(&end_date);
-            extra_args.push_str(&format!("&end_date={end_date}"));
+            write!(&mut extra_args, "&end_date={end_date}").unwrap();
         }
         if let Some(resolution_minutes) = resolution_minutes {
-            extra_args
-                .push_str(&format!("&resolution_minutes={resolution_minutes}"));
+            write!(&mut extra_args, "&resolution_minutes={resolution_minutes}")
+                .unwrap();
         }
 
         let req = test::TestRequest::get()
diff --git a/apps/labrinth/tests/common/api_v3/request_data.rs b/apps/labrinth/tests/common/api_v3/request_data.rs
index 3e2586f45..c9774dd0f 100644
--- a/apps/labrinth/tests/common/api_v3/request_data.rs
+++ b/apps/labrinth/tests/common/api_v3/request_data.rs
@@ -1,4 +1,3 @@
-#![allow(dead_code)]
 use serde_json::json;
 
 use crate::common::{
@@ -74,10 +73,7 @@ pub fn get_public_version_creation_data_json(
 
         // Loader fields
         "game_versions": ["1.20.1"],
-        "singleplayer": true,
-        "client_and_server": true,
-        "client_only": true,
-        "server_only": false,
+        "environment": "client_only_server_optional",
     });
     if is_modpack {
         j["mrpack_loaders"] = json!(["fabric"]);
diff --git a/apps/labrinth/tests/common/api_v3/version.rs b/apps/labrinth/tests/common/api_v3/version.rs
index 7a6f83231..54739cc50 100644
--- a/apps/labrinth/tests/common/api_v3/version.rs
+++ b/apps/labrinth/tests/common/api_v3/version.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::fmt::Write;
 
 use super::{
     ApiV3,
@@ -416,32 +417,36 @@ impl ApiVersion for ApiV3 {
     ) -> ServiceResponse {
         let mut query_string = String::new();
         if let Some(game_versions) = game_versions {
-            query_string.push_str(&format!(
+            write!(
+                &mut query_string,
                 "&game_versions={}",
                 urlencoding::encode(
                     &serde_json::to_string(&game_versions).unwrap()
                 )
-            ));
+            )
+            .unwrap();
         }
         if let Some(loaders) = loaders {
-            query_string.push_str(&format!(
+            write!(
+                &mut query_string,
                 "&loaders={}",
                 urlencoding::encode(&serde_json::to_string(&loaders).unwrap())
-            ));
+            )
+            .unwrap();
         }
         if let Some(featured) = featured {
-            query_string.push_str(&format!("&featured={featured}"));
+            write!(&mut query_string, "&featured={featured}").unwrap();
         }
         if let Some(version_type) = version_type {
-            query_string.push_str(&format!("&version_type={version_type}"));
+            write!(&mut query_string, "&version_type={version_type}").unwrap();
         }
         if let Some(limit) = limit {
             let limit = limit.to_string();
-            query_string.push_str(&format!("&limit={limit}"));
+            write!(&mut query_string, "&limit={limit}").unwrap();
         }
         if let Some(offset) = offset {
             let offset = offset.to_string();
-            query_string.push_str(&format!("&offset={offset}"));
+            write!(&mut query_string, "&offset={offset}").unwrap();
         }
 
         let req = test::TestRequest::get()
diff --git a/apps/labrinth/tests/common/asserts.rs b/apps/labrinth/tests/common/asserts.rs
index f4b7330e7..b28490551 100644
--- a/apps/labrinth/tests/common/asserts.rs
+++ b/apps/labrinth/tests/common/asserts.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use crate::common::get_json_val_str;
 use itertools::Itertools;
 use labrinth::models::v3::projects::Version;
diff --git a/apps/labrinth/tests/common/database.rs b/apps/labrinth/tests/common/database.rs
index 33ed2fc28..6297838f2 100644
--- a/apps/labrinth/tests/common/database.rs
+++ b/apps/labrinth/tests/common/database.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use labrinth::{database::redis::RedisPool, search};
 use sqlx::{PgPool, postgres::PgPoolOptions};
 use std::time::Duration;
diff --git a/apps/labrinth/tests/common/dummy_data.rs b/apps/labrinth/tests/common/dummy_data.rs
index c18f2402c..639a86e83 100644
--- a/apps/labrinth/tests/common/dummy_data.rs
+++ b/apps/labrinth/tests/common/dummy_data.rs
@@ -1,4 +1,3 @@
-#![allow(dead_code)]
 use std::io::{Cursor, Write};
 
 use crate::{
@@ -28,7 +27,6 @@ use super::{database::USER_USER_ID, get_json_val_str};
 
 pub const DUMMY_DATA_UPDATE: i64 = 7;
 
-#[allow(dead_code)]
 pub const DUMMY_CATEGORIES: &[&str] = &[
     "combat",
     "decoration",
@@ -41,7 +39,6 @@ pub const DUMMY_CATEGORIES: &[&str] = &[
 
 pub const DUMMY_OAUTH_CLIENT_ALPHA_SECRET: &str = "abcdefghijklmnopqrstuvwxyz";
 
-#[allow(dead_code)]
 #[derive(Clone)]
 pub enum TestFile {
     DummyProjectAlpha,
@@ -173,7 +170,6 @@ impl TestFile {
 }
 
 #[derive(Clone)]
-#[allow(dead_code)]
 pub enum DummyImage {
     SmallIcon, // 200x200
 }
diff --git a/apps/labrinth/tests/common/environment.rs b/apps/labrinth/tests/common/environment.rs
index 8031e816a..ec4079919 100644
--- a/apps/labrinth/tests/common/environment.rs
+++ b/apps/labrinth/tests/common/environment.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use super::{
     api_common::{Api, ApiBuildable, generic::GenericApi},
     api_v2::ApiV2,
diff --git a/apps/labrinth/tests/common/pats.rs b/apps/labrinth/tests/common/pats.rs
index 1e304fb66..75691817a 100644
--- a/apps/labrinth/tests/common/pats.rs
+++ b/apps/labrinth/tests/common/pats.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use chrono::Utc;
 use labrinth::{
     database::{self, models::generate_pat_id},
diff --git a/apps/labrinth/tests/common/permissions.rs b/apps/labrinth/tests/common/permissions.rs
index fedaa72ce..e4ce62e1e 100644
--- a/apps/labrinth/tests/common/permissions.rs
+++ b/apps/labrinth/tests/common/permissions.rs
@@ -1,4 +1,3 @@
-#![allow(dead_code)]
 use actix_http::StatusCode;
 use actix_web::{dev::ServiceResponse, test};
 use futures::Future;
diff --git a/apps/labrinth/tests/common/scopes.rs b/apps/labrinth/tests/common/scopes.rs
index 637914b81..5d74db600 100644
--- a/apps/labrinth/tests/common/scopes.rs
+++ b/apps/labrinth/tests/common/scopes.rs
@@ -1,4 +1,3 @@
-#![allow(dead_code)]
 use actix_web::{dev::ServiceResponse, test};
 use futures::Future;
 use labrinth::models::pats::Scopes;
diff --git a/apps/labrinth/tests/common/search.rs b/apps/labrinth/tests/common/search.rs
index daf7a9eb5..c6c0035ed 100644
--- a/apps/labrinth/tests/common/search.rs
+++ b/apps/labrinth/tests/common/search.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use std::{collections::HashMap, sync::Arc};
 
 use actix_http::StatusCode;
@@ -65,7 +63,7 @@ pub async fn setup_search_projects(
     let id = 0;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[4..6] },
-        { "op": "add", "path": "/initial_versions/0/server_only", "value": true },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "server_only" },
         { "op": "add", "path": "/license_id", "value": "LGPL-3.0-or-later" },
     ]))
     .unwrap();
@@ -80,7 +78,7 @@ pub async fn setup_search_projects(
     let id = 1;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[0..2] },
-        { "op": "add", "path": "/initial_versions/0/client_only", "value": false },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "client_or_server" },
     ]))
     .unwrap();
     project_creation_futures.push(create_async_future(
@@ -94,7 +92,7 @@ pub async fn setup_search_projects(
     let id = 2;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[0..2] },
-        { "op": "add", "path": "/initial_versions/0/server_only", "value": true },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "server_only" },
         { "op": "add", "path": "/name", "value": "Mysterious Project" },
     ]))
     .unwrap();
@@ -109,7 +107,7 @@ pub async fn setup_search_projects(
     let id = 3;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[0..3] },
-        { "op": "add", "path": "/initial_versions/0/server_only", "value": true },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "server_only" },
         { "op": "add", "path": "/initial_versions/0/game_versions", "value": ["1.20.4"] },
         { "op": "add", "path": "/name", "value": "Mysterious Project" },
         { "op": "add", "path": "/license_id", "value": "LicenseRef-All-Rights-Reserved" },
@@ -126,7 +124,7 @@ pub async fn setup_search_projects(
     let id = 4;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[0..3] },
-        { "op": "add", "path": "/initial_versions/0/client_only", "value": false },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "client_or_server" },
         { "op": "add", "path": "/initial_versions/0/game_versions", "value": ["1.20.5"] },
     ]))
     .unwrap();
@@ -141,7 +139,7 @@ pub async fn setup_search_projects(
     let id = 5;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[5..6] },
-        { "op": "add", "path": "/initial_versions/0/client_only", "value": false },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "client_or_server" },
         { "op": "add", "path": "/initial_versions/0/game_versions", "value": ["1.20.5"] },
         { "op": "add", "path": "/license_id", "value": "LGPL-3.0-or-later" },
     ]))
@@ -157,8 +155,7 @@ pub async fn setup_search_projects(
     let id = 6;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[5..6] },
-        { "op": "add", "path": "/initial_versions/0/client_only", "value": false },
-        { "op": "add", "path": "/initial_versions/0/server_only", "value": true },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "client_or_server_prefers_both" },
         { "op": "add", "path": "/license_id", "value": "LGPL-3.0-or-later" },
     ]))
     .unwrap();
@@ -175,8 +172,7 @@ pub async fn setup_search_projects(
     let id = 7;
     let modify_json = serde_json::from_value(json!([
         { "op": "add", "path": "/categories", "value": DUMMY_CATEGORIES[5..6] },
-        { "op": "add", "path": "/initial_versions/0/client_only", "value": false },
-        { "op": "add", "path": "/initial_versions/0/server_only", "value": true },
+        { "op": "add", "path": "/initial_versions/0/environment", "value": "client_or_server_prefers_both" },
         { "op": "add", "path": "/license_id", "value": "LGPL-3.0-or-later" },
         { "op": "add", "path": "/initial_versions/0/loaders", "value": ["forge"] },
         { "op": "add", "path": "/initial_versions/0/game_versions", "value": ["1.20.2"] },
diff --git a/apps/labrinth/tests/error.rs b/apps/labrinth/tests/error.rs
index 585f37bac..5f53a78df 100644
--- a/apps/labrinth/tests/error.rs
+++ b/apps/labrinth/tests/error.rs
@@ -7,7 +7,7 @@ use common::api_v3::ApiV3;
 use common::database::USER_USER_PAT;
 use common::environment::{TestEnvironment, with_test_environment};
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 pub async fn error_404_body() {
diff --git a/apps/labrinth/tests/files/dummy_data.sql b/apps/labrinth/tests/files/dummy_data.sql
index f3fb1e47d..9866a9d45 100644
--- a/apps/labrinth/tests/files/dummy_data.sql
+++ b/apps/labrinth/tests/files/dummy_data.sql
@@ -67,8 +67,8 @@ VALUES (2, 'Ordering_Negative1', '{"type":"release","major":false}', -1);
 INSERT INTO loader_field_enum_values(enum_id, value, metadata, ordering)
 VALUES (2, 'Ordering_Positive100', '{"type":"release","major":false}', 100);
 
-INSERT INTO loader_fields_loaders(loader_id, loader_field_id) 
-SELECT l.id, lf.id FROM loaders l CROSS JOIN loader_fields lf WHERE lf.field IN ('game_versions','singleplayer', 'client_and_server', 'client_only', 'server_only')  ON CONFLICT DO NOTHING;
+INSERT INTO loader_fields_loaders(loader_id, loader_field_id)
+SELECT l.id, lf.id FROM loaders l CROSS JOIN loader_fields lf WHERE lf.field IN ('game_versions','environment') ON CONFLICT DO NOTHING;
 
 INSERT INTO categories (id, category, project_type) VALUES
     (51, 'combat', 1),
@@ -108,6 +108,6 @@ VALUES (
 INSERT INTO oauth_client_redirect_uris (id, client_id, uri) VALUES (1, 1, 'https://modrinth.com/oauth_callback');
 
 -- Create dummy data table to mark that this file has been run
-CREATE TABLE dummy_data ( 
+CREATE TABLE dummy_data (
     update_id bigint PRIMARY KEY
  );
diff --git a/apps/labrinth/tests/games.rs b/apps/labrinth/tests/games.rs
index 5b423ef46..449f0035d 100644
--- a/apps/labrinth/tests/games.rs
+++ b/apps/labrinth/tests/games.rs
@@ -5,7 +5,7 @@ use common::{
     environment::{TestEnvironment, with_test_environment},
 };
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn get_games() {
diff --git a/apps/labrinth/tests/loader_fields.rs b/apps/labrinth/tests/loader_fields.rs
index 7caf8beb4..53a86bfac 100644
--- a/apps/labrinth/tests/loader_fields.rs
+++ b/apps/labrinth/tests/loader_fields.rs
@@ -17,8 +17,7 @@ use crate::common::dummy_data::{
     DummyProjectAlpha, DummyProjectBeta, TestFile,
 };
 
-// importing common module.
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 
@@ -115,7 +114,7 @@ async fn creating_loader_fields() {
                 Some(
                     serde_json::from_value(json!([{
                         "op": "remove",
-                        "path": "/singleplayer"
+                        "path": "/environment"
                     }]))
                     .unwrap(),
                 ),
@@ -242,7 +241,7 @@ async fn creating_loader_fields() {
                 USER_USER_PAT,
             )
             .await;
-        assert_eq!(v.fields.get("test_fabric_optional").unwrap(), &json!(555));
+        assert_eq!(&v.fields["test_fabric_optional"], &json!(555));
         // - Patch
         let resp = api
             .edit_version(
@@ -257,7 +256,7 @@ async fn creating_loader_fields() {
         let v = api
             .get_version_deserialized(alpha_version_id, USER_USER_PAT)
             .await;
-        assert_eq!(v.fields.get("test_fabric_optional").unwrap(), &json!(555));
+        assert_eq!(&v.fields["test_fabric_optional"], &json!(555));
 
         // Simply setting them as expected works
         // - Create
@@ -274,32 +273,26 @@ async fn creating_loader_fields() {
                         "value": ["1.20.1", "1.20.2"]
                     }, {
                         "op": "add",
-                        "path": "/singleplayer",
-                        "value": false
-                    }, {
-                        "op": "add",
-                        "path": "/server_only",
-                        "value": true
+                        "path": "/environment",
+                        "value": "client_or_server_prefers_both"
                     }]))
                     .unwrap(),
                 ),
                 USER_USER_PAT,
             )
             .await;
+        assert_eq!(&v.fields["game_versions"], &json!(["1.20.1", "1.20.2"]));
         assert_eq!(
-            v.fields.get("game_versions").unwrap(),
-            &json!(["1.20.1", "1.20.2"])
+            &v.fields["environment"],
+            &json!("client_or_server_prefers_both")
         );
-        assert_eq!(v.fields.get("singleplayer").unwrap(), &json!(false));
-        assert_eq!(v.fields.get("server_only").unwrap(), &json!(true));
         // - Patch
         let resp = api
             .edit_version(
                 alpha_version_id,
                 json!({
                     "game_versions": ["1.20.1", "1.20.2"],
-                    "singleplayer": false,
-                    "server_only": true
+                    "environment": "client_or_server_prefers_both"
                 }),
                 USER_USER_PAT,
             )
@@ -308,10 +301,7 @@ async fn creating_loader_fields() {
         let v = api
             .get_version_deserialized(alpha_version_id, USER_USER_PAT)
             .await;
-        assert_eq!(
-            v.fields.get("game_versions").unwrap(),
-            &json!(["1.20.1", "1.20.2"])
-        );
+        assert_eq!(&v.fields["game_versions"], &json!(["1.20.1", "1.20.2"]));
 
         // Now that we've created a version, we need to make sure that the Project's loader fields are updated (aggregate)
         // First, add a new version
@@ -327,8 +317,8 @@ async fn creating_loader_fields() {
                     "value": ["1.20.5"]
                 }, {
                     "op": "add",
-                    "path": "/singleplayer",
-                    "value": false
+                    "path": "/environment",
+                    "value": "client_or_server"
                 }]))
                 .unwrap(),
             ),
@@ -361,22 +351,15 @@ async fn creating_loader_fields() {
             )
             .await;
         assert_eq!(
-            project.fields.get("game_versions").unwrap(),
+            &project.fields["game_versions"],
             &[json!("1.20.1"), json!("1.20.2"), json!("1.20.5")]
         );
         assert!(
-            project
-                .fields
-                .get("singleplayer")
-                .unwrap()
-                .contains(&json!(false))
+            project.fields["environment"].contains(&json!("client_or_server"))
         );
         assert!(
-            project
-                .fields
-                .get("singleplayer")
-                .unwrap()
-                .contains(&json!(true))
+            project.fields["environment"]
+                .contains(&json!("client_or_server_prefers_both"))
         );
     })
     .await
@@ -440,10 +423,7 @@ async fn get_available_loader_fields() {
                 fabric_loader_fields,
                 [
                     "game_versions",
-                    "singleplayer",
-                    "client_and_server",
-                    "client_only",
-                    "server_only",
+                    "environment",
                     "test_fabric_optional" // exists for testing
                 ]
                 .iter()
@@ -463,10 +443,7 @@ async fn get_available_loader_fields() {
                 mrpack_loader_fields,
                 [
                     "game_versions",
-                    "singleplayer",
-                    "client_and_server",
-                    "client_only",
-                    "server_only",
+                    "environment",
                     // mrpack has all the general fields as well as this
                     "mrpack_loaders"
                 ]
@@ -533,7 +510,7 @@ async fn test_multi_get_redis_cache() {
             assert_eq!(projects.len(), 10);
 
             // Ensure all 5 modpacks have 'mrpack_loaders', and all 5 mods do not
-            for project in projects.iter() {
+            for project in &projects {
                 if modpacks.contains(project.slug.as_ref().unwrap()) {
                     assert!(project.fields.contains_key("mrpack_loaders"));
                 } else if mods.contains(project.slug.as_ref().unwrap()) {
@@ -566,7 +543,7 @@ async fn test_multi_get_redis_cache() {
             assert_eq!(versions.len(), 10);
 
             // Ensure all 5 versions from modpacks have 'mrpack_loaders', and all 5 versions from mods do not
-            for version in versions.iter() {
+            for version in &versions {
                 if version_ids_modpacks.contains(&version.id) {
                     assert!(version.fields.contains_key("mrpack_loaders"));
                 } else if version_ids_mods.contains(&version.id) {
diff --git a/apps/labrinth/tests/notifications.rs b/apps/labrinth/tests/notifications.rs
index d63fc819a..d4d6ce659 100644
--- a/apps/labrinth/tests/notifications.rs
+++ b/apps/labrinth/tests/notifications.rs
@@ -5,7 +5,7 @@ use common::{
 
 use crate::common::api_common::ApiTeams;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 pub async fn get_user_notifications_after_team_invitation_returns_notification()
diff --git a/apps/labrinth/tests/oauth.rs b/apps/labrinth/tests/oauth.rs
index d10bfe353..ee4d53745 100644
--- a/apps/labrinth/tests/oauth.rs
+++ b/apps/labrinth/tests/oauth.rs
@@ -16,7 +16,7 @@ use common::{
 };
 use labrinth::auth::oauth::TokenResponse;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn oauth_flow_happy_path() {
diff --git a/apps/labrinth/tests/oauth_clients.rs b/apps/labrinth/tests/oauth_clients.rs
index 3ababa4ad..8dd8604c5 100644
--- a/apps/labrinth/tests/oauth_clients.rs
+++ b/apps/labrinth/tests/oauth_clients.rs
@@ -17,7 +17,7 @@ use labrinth::{
 
 use common::database::USER_USER_ID_PARSED;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn can_create_edit_get_oauth_client() {
diff --git a/apps/labrinth/tests/organizations.rs b/apps/labrinth/tests/organizations.rs
index 2e5f259fe..193305eb7 100644
--- a/apps/labrinth/tests/organizations.rs
+++ b/apps/labrinth/tests/organizations.rs
@@ -22,7 +22,7 @@ use common::{
 use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use serde_json::json;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn create_organization() {
@@ -583,9 +583,7 @@ async fn add_remove_organization_project_ownership_to_user() {
                 .await;
             assert_eq!(members.len(), 1);
             assert_eq!(members[0].user.id.to_string(), FRIEND_USER_ID);
-            let user_member =
-                members.iter().filter(|m| m.is_owner).collect::<Vec<_>>();
-            assert_eq!(user_member.len(), 0);
+            assert_eq!(members.iter().filter(|m| m.is_owner).count(), 0);
 
             // Beta project should have:
             // - No members
@@ -836,9 +834,7 @@ async fn delete_organization_means_all_projects_to_org_owner() {
                 .api
                 .get_team_members_deserialized(alpha_team_id, USER_USER_PAT)
                 .await;
-            let user_member =
-                members.iter().filter(|m| m.is_owner).collect::<Vec<_>>();
-            assert_eq!(user_member.len(), 0);
+            assert_eq!(members.iter().filter(|m| m.is_owner).count(), 0);
 
             // Transfer ownership of zeta organization to FRIEND
             let resp = test_env
@@ -856,9 +852,7 @@ async fn delete_organization_means_all_projects_to_org_owner() {
                 .api
                 .get_team_members_deserialized(alpha_team_id, USER_USER_PAT)
                 .await;
-            let user_member =
-                members.iter().filter(|m| m.is_owner).collect::<Vec<_>>();
-            assert_eq!(user_member.len(), 0);
+            assert_eq!(members.iter().filter(|m| m.is_owner).count(), 0);
 
             // Delete organization
             let resp = test_env
diff --git a/apps/labrinth/tests/pats.rs b/apps/labrinth/tests/pats.rs
index 70afaf26b..1da071282 100644
--- a/apps/labrinth/tests/pats.rs
+++ b/apps/labrinth/tests/pats.rs
@@ -8,7 +8,7 @@ use serde_json::json;
 
 use crate::common::api_common::AppendsOptionalPat;
 
-mod common;
+pub mod common;
 
 // Full pat test:
 // - create a PAT and ensure it can be used for the scope
diff --git a/apps/labrinth/tests/project.rs b/apps/labrinth/tests/project.rs
index 1c202935b..977e1b09c 100644
--- a/apps/labrinth/tests/project.rs
+++ b/apps/labrinth/tests/project.rs
@@ -27,7 +27,7 @@ use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
 use serde_json::json;
 use sha1::Digest;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn test_get_project() {
diff --git a/apps/labrinth/tests/scopes.rs b/apps/labrinth/tests/scopes.rs
index c71a74e37..3e253116c 100644
--- a/apps/labrinth/tests/scopes.rs
+++ b/apps/labrinth/tests/scopes.rs
@@ -29,7 +29,7 @@ use serde_json::json;
 // - test the function with the PAT with the given scopes
 // - test the function with the PAT with all other scopes
 
-mod common;
+pub mod common;
 
 // Test for users, emails, and payout scopes (not user auth scope or notifs)
 #[actix_rt::test]
diff --git a/apps/labrinth/tests/search.rs b/apps/labrinth/tests/search.rs
index e05b13def..f45c4baf4 100644
--- a/apps/labrinth/tests/search.rs
+++ b/apps/labrinth/tests/search.rs
@@ -14,7 +14,7 @@ use serde_json::json;
 use crate::common::api_common::Api;
 use crate::common::api_common::ApiProject;
 
-mod common;
+pub mod common;
 
 // TODO: Revisit this wit   h the new modify_json in the version maker
 // That change here should be able to simplify it vastly
@@ -52,8 +52,11 @@ async fn search_projects() {
                     vec![1, 2, 3, 4],
                 ),
                 (json!([["project_types:modpack"]]), vec![4]),
-                (json!([["client_only:true"]]), vec![0, 2, 3, 7, 9]),
-                (json!([["server_only:true"]]), vec![0, 2, 3, 6, 7]),
+                (json!([["environment:server_only"]]), vec![0, 2, 3]),
+                (
+                    json!([["environment:client_or_server_prefers_both"]]),
+                    vec![6, 7],
+                ),
                 (json!([["open_source:true"]]), vec![0, 1, 2, 4, 5, 6, 7, 9]),
                 (json!([["license:MIT"]]), vec![1, 2, 4, 9]),
                 (json!([[r#"name:'Mysterious Project'"#]]), vec![2, 3]),
@@ -151,7 +154,7 @@ async fn index_swaps() {
                 test_env.api.remove_project("alpha", USER_USER_PAT).await;
             assert_status!(&resp, StatusCode::NO_CONTENT);
 
-            // We should not get any results, because the project has been deleted
+            // We should wait for deletions to be indexed
             let projects = test_env
                 .api
                 .search_deserialized(
@@ -162,21 +165,7 @@ async fn index_swaps() {
                 .await;
             assert_eq!(projects.total_hits, 0);
 
-            // But when we reindex, it should be gone
-            let resp = test_env.api.reset_search_index().await;
-            assert_status!(&resp, StatusCode::NO_CONTENT);
-
-            let projects = test_env
-                .api
-                .search_deserialized(
-                    None,
-                    Some(json!([["categories:fabric"]])),
-                    USER_USER_PAT,
-                )
-                .await;
-            assert_eq!(projects.total_hits, 0);
-
-            // Reindex again, should still be gone
+            // When we reindex, it should be still gone
             let resp = test_env.api.reset_search_index().await;
             assert_status!(&resp, StatusCode::NO_CONTENT);
 
diff --git a/apps/labrinth/tests/tags.rs b/apps/labrinth/tests/tags.rs
index 8f4295dda..4cd93d60a 100644
--- a/apps/labrinth/tests/tags.rs
+++ b/apps/labrinth/tests/tags.rs
@@ -9,7 +9,7 @@ use common::{
 
 use crate::common::api_common::ApiTags;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn get_tags() {
diff --git a/apps/labrinth/tests/teams.rs b/apps/labrinth/tests/teams.rs
index 4645eec92..13c41f563 100644
--- a/apps/labrinth/tests/teams.rs
+++ b/apps/labrinth/tests/teams.rs
@@ -10,7 +10,7 @@ use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use rust_decimal::Decimal;
 use serde_json::json;
 
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn test_get_team() {
diff --git a/apps/labrinth/tests/user.rs b/apps/labrinth/tests/user.rs
index d01ffb821..340b50031 100644
--- a/apps/labrinth/tests/user.rs
+++ b/apps/labrinth/tests/user.rs
@@ -5,7 +5,7 @@ use common::{
     environment::with_test_environment_all,
 };
 
-mod common;
+pub mod common;
 
 // user GET (permissions, different users)
 // users GET
diff --git a/apps/labrinth/tests/v2/version.rs b/apps/labrinth/tests/v2/version.rs
index dd9757ff6..f0d993e45 100644
--- a/apps/labrinth/tests/v2/version.rs
+++ b/apps/labrinth/tests/v2/version.rs
@@ -219,7 +219,7 @@ async fn version_updates() {
 
             // Add 3 new versions, 1 before, and 2 after, with differing game_version/version_types/loaders
             let mut update_ids = vec![];
-            for (version_number, patch_value) in [
+            for (version_number, patch_value) in &[
                 (
                     "0.9.9",
                     json!({
@@ -241,9 +241,7 @@ async fn version_updates() {
                         "version_type": "beta"
                     }),
                 ),
-            ]
-            .iter()
-            {
+            ] {
                 let version = api
                     .add_public_version_deserialized_common(
                         *alpha_project_id_parsed,
diff --git a/apps/labrinth/tests/v2_tests.rs b/apps/labrinth/tests/v2_tests.rs
index 808bcb1bd..69ea83705 100644
--- a/apps/labrinth/tests/v2_tests.rs
+++ b/apps/labrinth/tests/v2_tests.rs
@@ -1,5 +1,4 @@
-// importing common module.
-mod common;
+pub mod common;
 
 // Not all tests expect exactly the same functionality in v2 and v3.
 // For example, though we expect the /GET version to return the corresponding project,
diff --git a/apps/labrinth/tests/version.rs b/apps/labrinth/tests/version.rs
index bd86f8984..d6239bb14 100644
--- a/apps/labrinth/tests/version.rs
+++ b/apps/labrinth/tests/version.rs
@@ -22,8 +22,7 @@ use labrinth::models::projects::{
 use labrinth::routes::v3::version_file::FileUpdateData;
 use serde_json::json;
 
-// importing common module.
-mod common;
+pub mod common;
 
 #[actix_rt::test]
 async fn test_get_version() {
@@ -164,7 +163,7 @@ async fn version_updates() {
 
             // Add 3 new versions, 1 before, and 2 after, with differing game_version/version_types/loaders
             let mut update_ids = vec![];
-            for (version_number, patch_value) in [
+            for (version_number, patch_value) in &[
                 (
                     "0.9.9",
                     json!({
@@ -186,9 +185,7 @@ async fn version_updates() {
                         "version_type": "beta"
                     }),
                 ),
-            ]
-            .iter()
-            {
+            ] {
                 let version = api
                     .add_public_version_deserialized(
                         *alpha_project_id_parsed,
diff --git a/clippy.toml b/clippy.toml
new file mode 100644
index 000000000..95fa18fa6
--- /dev/null
+++ b/clippy.toml
@@ -0,0 +1,2 @@
+allow-dbg-in-tests = true
+msrv = "1.87.0"
diff --git a/docker-compose.yml b/docker-compose.yml
index 4b4d073cd..21e8c266c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,14 @@ services:
     ports:
       - '5432:5432'
     environment:
-      POSTGRES_DB: postgres
       POSTGRES_USER: labrinth
       POSTGRES_PASSWORD: labrinth
       POSTGRES_HOST_AUTH_METHOD: trust
+    healthcheck:
+      test: ['CMD', 'pg_isready']
+      interval: 3s
+      timeout: 5s
+      retries: 3
   meilisearch:
     image: getmeili/meilisearch:v1.12.0
     restart: on-failure
@@ -20,6 +24,11 @@ services:
     environment:
       MEILI_MASTER_KEY: modrinth
       MEILI_HTTP_PAYLOAD_SIZE_LIMIT: 107374182400
+    healthcheck:
+      test: ['CMD', 'curl', '--fail', 'http://localhost:7700/health']
+      interval: 3s
+      timeout: 5s
+      retries: 3
   redis:
     image: redis:alpine
     restart: on-failure
@@ -27,6 +36,11 @@ services:
       - '6379:6379'
     volumes:
       - redis-data:/data
+    healthcheck:
+      test: ['CMD', 'redis-cli', 'PING']
+      interval: 3s
+      timeout: 5s
+      retries: 3
   clickhouse:
     image: clickhouse/clickhouse-server
     ports:
@@ -34,6 +48,11 @@ services:
     environment:
       CLICKHOUSE_USER: default
       CLICKHOUSE_PASSWORD: default
+    healthcheck:
+      test: ['CMD', 'clickhouse-client', '--query', 'SELECT 1']
+      interval: 3s
+      timeout: 5s
+      retries: 3
 volumes:
   meilisearch-data:
   db-data:
diff --git a/package.json b/package.json
index aedaaa7a7..f5ac243e3 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,13 @@
     "lint": "turbo run lint --continue",
     "test": "turbo run test --continue",
     "fix": "turbo run fix --continue",
+    "ci": "turbo run lint test --continue",
     "intl:extract": "pnpm ui:intl:extract && pnpm web:intl:extract && pnpm app:intl:extract"
   },
   "devDependencies": {
-    "prettier": "^3.4.2",
-    "turbo": "^2.3.3",
+    "if-ci": "^3.0.0",
+    "prettier": "^3.3.2",
+    "turbo": "^2.5.4",
     "vue": "^3.5.13"
   },
   "packageManager": "pnpm@9.15.0",
diff --git a/packages/app-lib/.env.example b/packages/app-lib/.env.local
similarity index 100%
rename from packages/app-lib/.env.example
rename to packages/app-lib/.env.local
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 275a31c06..e9ee7f6bf 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -2,13 +2,14 @@
 name = "theseus"
 version = "0.9.5"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
-edition = "2024"
+edition.workspace = true
 
 [dependencies]
 bytes.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 serde_ini.workspace = true
+serde_with.workspace = true
 sha1_smol.workspace = true
 sha2.workspace = true
 url = { workspace = true, features = ["serde"] }
@@ -20,6 +21,8 @@ tempfile.workspace = true
 dashmap = { workspace = true, features = ["serde"] }
 quick-xml = { workspace = true, features = ["async-tokio"] }
 enumset.workspace = true
+chardetng.workspace = true
+encoding_rs.workspace = true
 
 chrono = { workspace = true, features = ["serde"] }
 daedalus.workspace = true
@@ -36,7 +39,7 @@ tracing-error.workspace = true
 
 paste.workspace = true
 
-tauri = { workspace = true, optional = true }
+tauri = { workspace = true, optional = true, features = ["unstable"] }
 indicatif = { workspace = true, optional = true }
 
 async-tungstenite = { workspace = true, features = ["tokio-runtime", "tokio-rustls-webpki-roots"] }
@@ -75,3 +78,6 @@ winreg.workspace = true
 [features]
 tauri = ["dep:tauri"]
 cli = ["dep:indicatif"]
+
+[lints]
+workspace = true
diff --git a/packages/app-lib/package.json b/packages/app-lib/package.json
index 9c1f1e77c..d1213bbaa 100644
--- a/packages/app-lib/package.json
+++ b/packages/app-lib/package.json
@@ -2,8 +2,8 @@
   "name": "@modrinth/app-lib",
   "scripts": {
     "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix",
-    "test": "cargo test"
+    "lint": "cargo fmt --check && cargo clippy --all-targets",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
+    "test": "cargo nextest run --all-targets --no-fail-fast"
   }
 }
diff --git a/packages/app-lib/src/api/jre.rs b/packages/app-lib/src/api/jre.rs
index ef193aac3..1f6d8baa7 100644
--- a/packages/app-lib/src/api/jre.rs
+++ b/packages/app-lib/src/api/jre.rs
@@ -166,9 +166,8 @@ pub async fn test_jre(
     path: PathBuf,
     major_version: u32,
 ) -> crate::Result<bool> {
-    let jre = match jre::check_java_at_filepath(&path).await {
-        Some(jre) => jre,
-        None => return Ok(false),
+    let Some(jre) = jre::check_java_at_filepath(&path).await else {
+        return Ok(false);
     };
     let (major, _) = extract_java_majorminor_version(&jre.version)?;
     Ok(major == major_version)
diff --git a/packages/app-lib/src/api/pack/import/atlauncher.rs b/packages/app-lib/src/api/pack/import/atlauncher.rs
index f6dabca4c..1c8ba084d 100644
--- a/packages/app-lib/src/api/pack/import/atlauncher.rs
+++ b/packages/app-lib/src/api/pack/import/atlauncher.rs
@@ -97,12 +97,15 @@ pub struct ATLauncherMod {
 
 // Check if folder has a instance.json that parses
 pub async fn is_valid_atlauncher(instance_folder: PathBuf) -> bool {
-    let instance: String =
-        io::read_to_string(&instance_folder.join("instance.json"))
-            .await
-            .unwrap_or("".to_string());
-    let instance: Result<ATInstance, serde_json::Error> =
-        serde_json::from_str::<ATInstance>(&instance);
+    let instance = serde_json::from_str::<ATInstance>(
+        &io::read_any_encoding_to_string(
+            &instance_folder.join("instance.json"),
+        )
+        .await
+        .unwrap_or(("".into(), encoding_rs::UTF_8))
+        .0,
+    );
+
     if let Err(e) = instance {
         tracing::warn!(
             "Could not parse instance.json at {}: {}",
@@ -124,14 +127,17 @@ pub async fn import_atlauncher(
 ) -> crate::Result<()> {
     let atlauncher_instance_path = atlauncher_base_path
         .join("instances")
-        .join(instance_folder.clone());
+        .join(&instance_folder);
 
     // Load instance.json
-    let atinstance: String =
-        io::read_to_string(&atlauncher_instance_path.join("instance.json"))
-            .await?;
-    let atinstance: ATInstance =
-        serde_json::from_str::<ATInstance>(&atinstance)?;
+    let atinstance = serde_json::from_str::<ATInstance>(
+        &io::read_any_encoding_to_string(
+            &atlauncher_instance_path.join("instance.json"),
+        )
+        .await
+        .unwrap_or(("".into(), encoding_rs::UTF_8))
+        .0,
+    )?;
 
     // Icon path should be {instance_folder}/instance.png if it exists,
     // Second possibility is ATLauncher/configs/images/{safe_pack_name}.png (safe pack name is alphanumeric lowercase)
diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs
index 1c0819e4b..656595fec 100644
--- a/packages/app-lib/src/api/pack/import/curseforge.rs
+++ b/packages/app-lib/src/api/pack/import/curseforge.rs
@@ -36,13 +36,15 @@ pub struct InstalledModpack {
 
 // Check if folder has a minecraftinstance.json that parses
 pub async fn is_valid_curseforge(instance_folder: PathBuf) -> bool {
-    let minecraftinstance: String =
-        io::read_to_string(&instance_folder.join("minecraftinstance.json"))
-            .await
-            .unwrap_or("".to_string());
-    let minecraftinstance: Result<MinecraftInstance, serde_json::Error> =
-        serde_json::from_str::<MinecraftInstance>(&minecraftinstance);
-    minecraftinstance.is_ok()
+    let minecraft_instance = serde_json::from_str::<MinecraftInstance>(
+        &io::read_any_encoding_to_string(
+            &instance_folder.join("minecraftinstance.json"),
+        )
+        .await
+        .unwrap_or(("".into(), encoding_rs::UTF_8))
+        .0,
+    );
+    minecraft_instance.is_ok()
 }
 
 pub async fn import_curseforge(
@@ -50,19 +52,20 @@ pub async fn import_curseforge(
     profile_path: &str,                  // path to profile
 ) -> crate::Result<()> {
     // Load minecraftinstance.json
-    let minecraft_instance: String = io::read_to_string(
-        &curseforge_instance_folder.join("minecraftinstance.json"),
-    )
-    .await?;
-    let minecraft_instance: MinecraftInstance =
-        serde_json::from_str::<MinecraftInstance>(&minecraft_instance)?;
-    let override_title: Option<String> = minecraft_instance.name.clone();
+    let minecraft_instance = serde_json::from_str::<MinecraftInstance>(
+        &io::read_any_encoding_to_string(
+            &curseforge_instance_folder.join("minecraftinstance.json"),
+        )
+        .await
+        .unwrap_or(("".into(), encoding_rs::UTF_8))
+        .0,
+    )?;
+    let override_title = minecraft_instance.name;
     let backup_name = format!(
         "Curseforge-{}",
         curseforge_instance_folder
             .file_name()
-            .map(|a| a.to_string_lossy().to_string())
-            .unwrap_or("Unknown".to_string())
+            .map_or("Unknown".to_string(), |a| a.to_string_lossy().to_string())
     );
 
     let state = State::get().await?;
diff --git a/packages/app-lib/src/api/pack/import/gdlauncher.rs b/packages/app-lib/src/api/pack/import/gdlauncher.rs
index 307301014..bb84f574c 100644
--- a/packages/app-lib/src/api/pack/import/gdlauncher.rs
+++ b/packages/app-lib/src/api/pack/import/gdlauncher.rs
@@ -25,12 +25,12 @@ pub struct GDLauncherLoader {
 
 // Check if folder has a config.json that parses
 pub async fn is_valid_gdlauncher(instance_folder: PathBuf) -> bool {
-    let config: String =
-        io::read_to_string(&instance_folder.join("config.json"))
+    let config = serde_json::from_str::<GDLauncherConfig>(
+        &io::read_any_encoding_to_string(&instance_folder.join("config.json"))
             .await
-            .unwrap_or("".to_string());
-    let config: Result<GDLauncherConfig, serde_json::Error> =
-        serde_json::from_str::<GDLauncherConfig>(&config);
+            .unwrap_or(("".into(), encoding_rs::UTF_8))
+            .0,
+    );
     config.is_ok()
 }
 
@@ -39,18 +39,20 @@ pub async fn import_gdlauncher(
     profile_path: &str,                  // path to profile
 ) -> crate::Result<()> {
     // Load config.json
-    let config: String =
-        io::read_to_string(&gdlauncher_instance_folder.join("config.json"))
-            .await?;
-    let config: GDLauncherConfig =
-        serde_json::from_str::<GDLauncherConfig>(&config)?;
-    let override_title: Option<String> = config.loader.source_name.clone();
+    let config = serde_json::from_str::<GDLauncherConfig>(
+        &io::read_any_encoding_to_string(
+            &gdlauncher_instance_folder.join("config.json"),
+        )
+        .await
+        .unwrap_or(("".into(), encoding_rs::UTF_8))
+        .0,
+    )?;
+    let override_title = config.loader.source_name;
     let backup_name = format!(
         "GDLauncher-{}",
         gdlauncher_instance_folder
             .file_name()
-            .map(|a| a.to_string_lossy().to_string())
-            .unwrap_or("Unknown".to_string())
+            .map_or("Unknown".to_string(), |a| a.to_string_lossy().to_string())
     );
 
     // Re-cache icon
diff --git a/packages/app-lib/src/api/pack/import/mmc.rs b/packages/app-lib/src/api/pack/import/mmc.rs
index 94083be88..030ad003d 100644
--- a/packages/app-lib/src/api/pack/import/mmc.rs
+++ b/packages/app-lib/src/api/pack/import/mmc.rs
@@ -26,6 +26,7 @@ enum MMCInstanceEnum {
 struct MMCInstanceGeneral {
     pub general: MMCInstance,
 }
+
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct MMCInstance {
@@ -144,9 +145,9 @@ pub async fn is_valid_mmc(instance_folder: PathBuf) -> bool {
     let instance_cfg = instance_folder.join("instance.cfg");
     let mmc_pack = instance_folder.join("mmc-pack.json");
 
-    let mmc_pack = match io::read_to_string(&mmc_pack).await {
-        Ok(mmc_pack) => mmc_pack,
-        Err(_) => return false,
+    let Ok((mmc_pack, _)) = io::read_any_encoding_to_string(&mmc_pack).await
+    else {
+        return false;
     };
 
     load_instance_cfg(&instance_cfg).await.is_ok()
@@ -155,7 +156,7 @@ pub async fn is_valid_mmc(instance_folder: PathBuf) -> bool {
 
 #[tracing::instrument]
 pub async fn get_instances_subpath(config: PathBuf) -> Option<String> {
-    let launcher = io::read_to_string(&config).await.ok()?;
+    let launcher = io::read_any_encoding_to_string(&config).await.ok()?.0;
     let launcher: MMCLauncherEnum = serde_ini::from_str(&launcher).ok()?;
     match launcher {
         MMCLauncherEnum::General(p) => Some(p.general.instance_dir),
@@ -165,10 +166,9 @@ pub async fn get_instances_subpath(config: PathBuf) -> Option<String> {
 
 // Loading the INI (instance.cfg) file
 async fn load_instance_cfg(file_path: &Path) -> crate::Result<MMCInstance> {
-    let instance_cfg: String = io::read_to_string(file_path).await?;
-    let instance_cfg_enum: MMCInstanceEnum =
-        serde_ini::from_str::<MMCInstanceEnum>(&instance_cfg)?;
-    match instance_cfg_enum {
+    match serde_ini::from_str::<MMCInstanceEnum>(
+        &io::read_any_encoding_to_string(file_path).await?.0,
+    )? {
         MMCInstanceEnum::General(instance_cfg) => Ok(instance_cfg.general),
         MMCInstanceEnum::Instance(instance_cfg) => Ok(instance_cfg),
     }
@@ -183,9 +183,13 @@ pub async fn import_mmc(
     let mmc_instance_path =
         mmc_base_path.join("instances").join(instance_folder);
 
-    let mmc_pack =
-        io::read_to_string(&mmc_instance_path.join("mmc-pack.json")).await?;
-    let mmc_pack: MMCPack = serde_json::from_str::<MMCPack>(&mmc_pack)?;
+    let mmc_pack = serde_json::from_str::<MMCPack>(
+        &io::read_any_encoding_to_string(
+            &mmc_instance_path.join("mmc-pack.json"),
+        )
+        .await?
+        .0,
+    )?;
 
     let instance_cfg =
         load_instance_cfg(&mmc_instance_path.join("instance.cfg")).await?;
@@ -230,7 +234,7 @@ pub async fn import_mmc(
                 // Kept separate as we may in the future want to add special handling for modrinth managed packs
                 import_mmc_unmanaged(profile_path, minecraft_folder, "Imported Modrinth Modpack".to_string(), description, mmc_pack).await?;
             }
-            Some(MMCManagedPackType::Flame) | Some(MMCManagedPackType::ATLauncher) => {
+            Some(MMCManagedPackType::Flame | MMCManagedPackType::ATLauncher) => {
                 // For flame/atlauncher managed packs
                 // Treat as unmanaged, but with 'minecraft' folder instead of '.minecraft'
                 import_mmc_unmanaged(profile_path, minecraft_folder, "Imported Modpack".to_string(), description, mmc_pack).await?;
@@ -243,7 +247,7 @@ pub async fn import_mmc(
             _ => return Err(crate::ErrorKind::InputError("Instance is managed, but managed pack type not specified in instance.cfg".to_string()).into())
         }
     } else {
-        // Direclty import unmanaged pack
+        // Directly import unmanaged pack
         import_mmc_unmanaged(
             profile_path,
             minecraft_folder,
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index b1f35e013..d3ec041cf 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -357,9 +357,7 @@ pub async fn set_profile_information(
         }
     }
 
-    let game_version = if let Some(game_version) = game_version {
-        game_version
-    } else {
+    let Some(game_version) = game_version else {
         return Err(crate::ErrorKind::InputError(
             "Pack did not specify Minecraft version".to_string(),
         )
@@ -393,10 +391,7 @@ pub async fn set_profile_information(
                     locked: if !ignore_lock {
                         true
                     } else {
-                        prof.linked_data
-                            .as_ref()
-                            .map(|x| x.locked)
-                            .unwrap_or(true)
+                        prof.linked_data.as_ref().is_none_or(|x| x.locked)
                     },
                 })
             }
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index fd2b6bc5a..d65991a65 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -152,8 +152,7 @@ pub async fn install_zipped_mrpack_files(
                     if let Some(env) = project.env {
                         if env
                             .get(&EnvType::Client)
-                            .map(|x| x == &SideType::Unsupported)
-                            .unwrap_or(false)
+                            .is_some_and(|x| x == &SideType::Unsupported)
                         {
                             return Ok(());
                         }
diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs
index 3bc4b8d2d..979dbac0b 100644
--- a/packages/app-lib/src/api/profile/mod.rs
+++ b/packages/app-lib/src/api/profile/mod.rs
@@ -586,7 +586,7 @@ pub async fn get_pack_export_candidates(
         .await
         .map_err(|e| IOError::with_path(e, &profile_base_dir))?
     {
-        let path: PathBuf = entry.path();
+        let path = entry.path();
         if path.is_dir() {
             // Two layers of files/folders if its a folder
             let mut read_dir = io::read_dir(&path).await?;
@@ -595,10 +595,10 @@ pub async fn get_pack_export_candidates(
                 .await
                 .map_err(|e| IOError::with_path(e, &profile_base_dir))?
             {
-                let path: PathBuf = entry.path();
-
-                path_list
-                    .push(pack_get_relative_path(&profile_base_dir, &path)?);
+                path_list.push(pack_get_relative_path(
+                    &profile_base_dir,
+                    &entry.path(),
+                )?);
             }
         } else {
             // One layer of files/folders if its a file
@@ -644,7 +644,6 @@ pub async fn run(
 /// Run Minecraft using a profile, and credentials for authentication
 /// Returns Arc pointer to RwLock to Child
 #[tracing::instrument(skip(credentials))]
-
 pub async fn run_credentials(
     path: &str,
     credentials: &Credentials,
@@ -662,14 +661,15 @@ pub async fn run_credentials(
         .hooks
         .pre_launch
         .as_ref()
-        .or(settings.hooks.pre_launch.as_ref());
+        .or(settings.hooks.pre_launch.as_ref())
+        .filter(|hook_command| !hook_command.is_empty());
     if let Some(hook) = pre_launch_hooks {
         // TODO: hook parameters
         let mut cmd = hook.split(' ');
         if let Some(command) = cmd.next() {
             let full_path = get_full_path(&profile.path).await?;
             let result = Command::new(command)
-                .args(cmd.collect::<Vec<&str>>())
+                .args(cmd)
                 .current_dir(&full_path)
                 .spawn()
                 .map_err(|e| IOError::with_path(e, &full_path))?
@@ -692,7 +692,12 @@ pub async fn run_credentials(
         .clone()
         .unwrap_or(settings.extra_launch_args);
 
-    let wrapper = profile.hooks.wrapper.clone().or(settings.hooks.wrapper);
+    let wrapper = profile
+        .hooks
+        .wrapper
+        .clone()
+        .or(settings.hooks.wrapper)
+        .filter(|hook_command| !hook_command.is_empty());
 
     let memory = profile.memory.unwrap_or(settings.memory);
     let resolution =
@@ -704,8 +709,12 @@ pub async fn run_credentials(
         .unwrap_or(settings.custom_env_vars);
 
     // Post post exit hooks
-    let post_exit_hook =
-        profile.hooks.post_exit.clone().or(settings.hooks.post_exit);
+    let post_exit_hook = profile
+        .hooks
+        .post_exit
+        .clone()
+        .or(settings.hooks.post_exit)
+        .filter(|hook_command| !hook_command.is_empty());
 
     // Any options.txt settings that we want set, add here
     let mut mc_set_options: Vec<(String, String)> = vec![];
@@ -872,15 +881,12 @@ pub async fn create_mrpack_json(
                 env.insert(EnvType::Client, SideType::Required);
                 env.insert(EnvType::Server, SideType::Required);
 
-                let primary_file =
-                    if let Some(primary_file) = version.files.first() {
-                        primary_file
-                    } else {
-                        return Some(Err(crate::ErrorKind::OtherError(
-                            format!("No primary file found for mod at: {path}"),
-                        )
-                        .as_error()));
-                    };
+                let Some(primary_file) = version.files.first() else {
+                    return Some(Err(crate::ErrorKind::OtherError(format!(
+                        "No primary file found for mod at: {path}"
+                    ))
+                    .as_error()));
+                };
 
                 let file_size = primary_file.size;
                 let downloads = vec![primary_file.url.clone()];
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
index 44704dfa9..e731a221f 100644
--- a/packages/app-lib/src/api/worlds.rs
+++ b/packages/app-lib/src/api/worlds.rs
@@ -255,7 +255,7 @@ async fn get_all_worlds_in_profile(
         AttachedWorldData::get_all_for_instance(profile_path, &state.pool)
             .await?;
     if !attached_data.is_empty() {
-        for world in worlds.iter_mut() {
+        for world in &mut worlds {
             if let Some(data) = attached_data
                 .get(&(world.world_type(), world.world_id().to_owned()))
             {
diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs
index e2e438618..b8d485a69 100644
--- a/packages/app-lib/src/event/emit.rs
+++ b/packages/app-lib/src/event/emit.rs
@@ -139,9 +139,7 @@ pub async fn edit_loading(
 // increment refers to by what relative increment to the loading struct's total to update
 // message is the message to display on the loading bar- if None, use the loading bar's default one
 // By convention, fraction is the fraction of the progress bar that is filled
-#[allow(unused_variables)]
 #[tracing::instrument(level = "debug")]
-
 pub fn emit_loading(
     key: &LoadingBarId,
     increment_frac: f64,
@@ -149,22 +147,13 @@ pub fn emit_loading(
 ) -> crate::Result<()> {
     let event_state = crate::EventState::get()?;
 
-    let mut loading_bar = match event_state.loading_bars.get_mut(&key.0) {
-        Some(f) => f,
-        None => {
-            return Err(EventError::NoLoadingBar(key.0).into());
-        }
+    let Some(mut loading_bar) = event_state.loading_bars.get_mut(&key.0) else {
+        return Err(EventError::NoLoadingBar(key.0).into());
     };
 
     // Tick up loading bar
     loading_bar.current += increment_frac;
     let display_frac = loading_bar.current / loading_bar.total;
-    let opt_display_frac = if display_frac >= 1.0 {
-        None // by convention, when its done, we submit None
-    // any further updates will be ignored (also sending None)
-    } else {
-        Some(display_frac)
-    };
 
     if f64::abs(display_frac - loading_bar.last_sent) > 0.005 {
         // Emit event to indicatif progress bar
@@ -187,7 +176,12 @@ pub fn emit_loading(
             .emit(
                 "loading",
                 LoadingPayload {
-                    fraction: opt_display_frac,
+                    fraction: if display_frac >= 1.0 {
+                        None // by convention, when its done, we submit None
+                    // any further updates will be ignored (also sending None)
+                    } else {
+                        Some(display_frac)
+                    },
                     message: message
                         .unwrap_or(&loading_bar.message)
                         .to_string(),
@@ -197,6 +191,9 @@ pub fn emit_loading(
             )
             .map_err(EventError::from)?;
 
+        #[cfg(not(any(feature = "cli", feature = "tauri")))]
+        let _ = message;
+
         loading_bar.last_sent = display_frac;
     }
 
@@ -204,8 +201,6 @@ pub fn emit_loading(
 }
 
 // emit_warning(message)
-#[allow(dead_code)]
-#[allow(unused_variables)]
 pub async fn emit_warning(message: &str) -> crate::Result<()> {
     #[cfg(feature = "tauri")]
     {
@@ -227,8 +222,6 @@ pub async fn emit_warning(message: &str) -> crate::Result<()> {
 // emit_command(CommandPayload::Something { something })
 // ie: installing a pack, opening an .mrpack, etc
 // Generally used for url deep links and file opens that we want to handle in the frontend
-#[allow(dead_code)]
-#[allow(unused_variables)]
 pub async fn emit_command(command: CommandPayload) -> crate::Result<()> {
     tracing::debug!("Command: {}", serde_json::to_string(&command)?);
     #[cfg(feature = "tauri")]
diff --git a/packages/app-lib/src/launcher/args.rs b/packages/app-lib/src/launcher/args.rs
index 4617320d8..4ab310072 100644
--- a/packages/app-lib/src/launcher/args.rs
+++ b/packages/app-lib/src/launcher/args.rs
@@ -87,9 +87,9 @@ pub fn get_lib_path(
     lib: &str,
     allow_not_exist: bool,
 ) -> crate::Result<String> {
-    let mut path = libraries_path.to_path_buf();
-
-    path.push(get_path_from_artifact(lib)?);
+    let path = libraries_path
+        .to_path_buf()
+        .join(get_path_from_artifact(lib)?);
 
     if !path.exists() && allow_not_exist {
         return Ok(path.to_string_lossy().to_string());
diff --git a/packages/app-lib/src/launcher/download.rs b/packages/app-lib/src/launcher/download.rs
index c7c73887a..4a0a5879f 100644
--- a/packages/app-lib/src/launcher/download.rs
+++ b/packages/app-lib/src/launcher/download.rs
@@ -37,12 +37,7 @@ pub async fn download_minecraft(
     let assets_index =
         download_assets_index(st, version, Some(loading_bar), force).await?;
 
-    let amount = if version
-        .processors
-        .as_ref()
-        .map(|x| !x.is_empty())
-        .unwrap_or(false)
-    {
+    let amount = if version.processors.as_ref().is_some_and(|x| !x.is_empty()) {
         25.0
     } else {
         40.0
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 9f26b7259..b34da77d3 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -15,9 +15,10 @@ use daedalus as d;
 use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo};
 use daedalus::modded::LoaderVersion;
 use rand::seq::SliceRandom; // AstralRinth
+use regex::Regex;
 use serde::Deserialize;
 use st::Profile;
-use std::collections::HashMap;
+use std::fmt::Write;
 use std::path::PathBuf;
 use tokio::process::Command;
 
@@ -139,8 +140,7 @@ pub async fn get_java_version_from_profile(
     let key = version_info
         .java_version
         .as_ref()
-        .map(|it| it.major_version)
-        .unwrap_or(8);
+        .map_or(8, |it| it.major_version);
 
     let state = State::get().await?;
 
@@ -255,8 +255,7 @@ pub async fn install_minecraft(
 
         let loader_version_id = loader_version.clone();
         crate::api::profile::edit(&profile.path, |prof| {
-            prof.loader_version =
-                loader_version_id.clone().map(|x| x.id.clone());
+            prof.loader_version = loader_version_id.clone().map(|x| x.id);
 
             async { Ok(()) }
         })
@@ -281,8 +280,7 @@ pub async fn install_minecraft(
     let key = version_info
         .java_version
         .as_ref()
-        .map(|it| it.major_version)
-        .unwrap_or(8);
+        .map_or(8, |it| it.major_version);
     let (java_version, set_java) = if let Some(java_version) =
         get_java_version_from_profile(profile, &version_info).await?
     {
@@ -355,9 +353,11 @@ pub async fn install_minecraft(
                     }
                 }
 
-                let cp = wrap_ref_builder!(cp = processor.classpath.clone() => {
-                    cp.push(processor.jar.clone())
-                });
+                let cp = {
+                    let mut cp = processor.classpath.clone();
+                    cp.push(processor.jar.clone());
+                    cp
+                };
 
                 let child = Command::new(&java_version.path)
                     .arg("-cp")
@@ -580,7 +580,9 @@ pub async fn launch_minecraft(
     let args = version_info.arguments.clone().unwrap_or_default();
     let mut command = match wrapper {
         Some(hook) => {
-            wrap_ref_builder!(it = Command::new(hook) => {it.arg(&java_version.path)})
+            let mut command = Command::new(hook);
+            command.arg(&java_version.path);
+            command
         }
         None => Command::new(&java_version.path),
     };
@@ -629,8 +631,7 @@ pub async fn launch_minecraft(
                     .as_ref()
                     .and_then(|x| x.get(&LoggingSide::Client)),
             )?
-            .into_iter()
-            .collect::<Vec<_>>(),
+            .into_iter(),
         )
         .arg(version_info.main_class.clone())
         .args(
@@ -648,8 +649,7 @@ pub async fn launch_minecraft(
                 &java_version.architecture,
                 quick_play_type,
             )?
-            .into_iter()
-            .collect::<Vec<_>>(),
+            .into_iter(),
         )
         .current_dir(instance_path.clone());
 
@@ -665,20 +665,35 @@ pub async fn launch_minecraft(
 
     // Overwrites the minecraft options.txt file with the settings from the profile
     // Uses 'a:b' syntax which is not quite yaml
-    use regex::Regex;
-
     if !mc_set_options.is_empty() {
         let options_path = instance_path.join("options.txt");
-        let mut options_string = String::new();
-        if options_path.exists() {
-            options_string = io::read_to_string(&options_path).await?;
+
+        let (mut options_string, input_encoding) = if options_path.exists() {
+            io::read_any_encoding_to_string(&options_path).await?
+        } else {
+            (String::new(), encoding_rs::UTF_8)
+        };
+
+        // UTF-16 encodings may be successfully detected and read, but we cannot encode
+        // them back, and it's technically possible that the game client strongly expects
+        // such encoding
+        if input_encoding != input_encoding.output_encoding() {
+            return Err(crate::ErrorKind::LauncherError(format!(
+                "The instance options.txt file uses an unsupported encoding: {}. \
+                Please either turn off instance options that need to modify this file, \
+                or convert the file to an encoding that both the game and this app support, \
+                such as UTF-8.",
+                input_encoding.name()
+            ))
+            .into());
         }
+
         for (key, value) in mc_set_options {
             let re = Regex::new(&format!(r"(?m)^{}:.*$", regex::escape(key)))?;
             // check if the regex exists in the file
             if !re.is_match(&options_string) {
                 // The key was not found in the file, so append it
-                options_string.push_str(&format!("\n{key}:{value}"));
+                write!(&mut options_string, "\n{key}:{value}").unwrap();
             } else {
                 let replaced_string = re
                     .replace_all(&options_string, &format!("{key}:{value}"))
@@ -687,7 +702,8 @@ pub async fn launch_minecraft(
             }
         }
 
-        io::write(&options_path, options_string).await?;
+        io::write(&options_path, input_encoding.encode(&options_string).0)
+            .await?;
     }
 
     crate::api::profile::edit(&profile.path, |prof| {
@@ -697,31 +713,6 @@ pub async fn launch_minecraft(
     })
     .await?;
 
-    let mut censor_strings = HashMap::new();
-    let username = whoami::username();
-    censor_strings
-        .insert(format!("/{username}/"), "/{COMPUTER_USERNAME}/".to_string());
-    censor_strings.insert(
-        format!("\\{username}\\"),
-        "\\{COMPUTER_USERNAME}\\".to_string(),
-    );
-    censor_strings.insert(
-        credentials.access_token.clone(),
-        "{MINECRAFT_ACCESS_TOKEN}".to_string(),
-    );
-    censor_strings.insert(
-        credentials.username.clone(),
-        "{MINECRAFT_USERNAME}".to_string(),
-    );
-    censor_strings.insert(
-        credentials.id.as_simple().to_string(),
-        "{MINECRAFT_UUID}".to_string(),
-    );
-    censor_strings.insert(
-        credentials.id.as_hyphenated().to_string(),
-        "{MINECRAFT_UUID}".to_string(),
-    );
-
     // If in tauri, and the 'minimize on launch' setting is enabled, minimize the window
     #[cfg(feature = "tauri")]
     {
diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index de42549c3..cd6ee1df2 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -461,8 +461,7 @@ impl CacheValue {
             CacheValue::Team(members) => members
                 .iter()
                 .next()
-                .map(|x| x.team_id.as_str())
-                .unwrap_or(DEFAULT_ID)
+                .map_or(DEFAULT_ID, |x| x.team_id.as_str())
                 .to_string(),
             CacheValue::Organization(org) => org.id.clone(),
             CacheValue::File(file) => file.hash.clone(),
@@ -556,7 +555,6 @@ macro_rules! impl_cache_methods {
             $(
                 paste::paste! {
                     #[tracing::instrument(skip(pool, fetch_semaphore))]
-                    #[allow(dead_code)]
                     pub async fn [<get_ $variant:snake>](
                         id: &str,
                         cache_behaviour: Option<CacheBehaviour>,
@@ -568,7 +566,6 @@ macro_rules! impl_cache_methods {
                     }
 
                     #[tracing::instrument(skip(pool, fetch_semaphore))]
-                    #[allow(dead_code)]
                     pub async fn [<get_ $variant:snake _many>](
                         ids: &[&str],
                         cache_behaviour: Option<CacheBehaviour>,
@@ -597,7 +594,6 @@ macro_rules! impl_cache_method_singular {
             $(
                 paste::paste! {
                     #[tracing::instrument(skip(pool, fetch_semaphore))]
-                    #[allow(dead_code)]
                     pub async fn [<get_ $variant:snake>] (
                         cache_behaviour: Option<CacheBehaviour>,
                         pool: &SqlitePool,
@@ -735,18 +731,13 @@ impl CachedEntry {
 
                 remaining_keys.retain(|x| {
                     x != &&*row.id
-                        && !row
-                            .alias
-                            .as_ref()
-                            .map(|y| {
-                                if type_.case_sensitive_alias().unwrap_or(true)
-                                {
-                                    x == y
-                                } else {
-                                    y.to_lowercase() == x.to_lowercase()
-                                }
-                            })
-                            .unwrap_or(false)
+                        && !row.alias.as_ref().is_some_and(|y| {
+                            if type_.case_sensitive_alias().unwrap_or(true) {
+                                x == y
+                            } else {
+                                y.to_lowercase() == x.to_lowercase()
+                            }
+                        })
                 });
 
                 if let Some(data) = parsed_data {
@@ -991,7 +982,7 @@ impl CachedEntry {
                     let key = key.to_string();
 
                     if let Some(position) = teams.iter().position(|x| {
-                        x.first().map(|x| x.team_id == key).unwrap_or(false)
+                        x.first().is_some_and(|x| x.team_id == key)
                     }) {
                         let team = teams.remove(position);
 
diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs
index 0d2293e62..4dce96816 100644
--- a/packages/app-lib/src/state/dirs.rs
+++ b/packages/app-lib/src/state/dirs.rs
@@ -47,9 +47,8 @@ impl DirectoryInfo {
             ))
         })?;
 
-        let config_dir = config_dir
-            .map(PathBuf::from)
-            .unwrap_or_else(|| settings_dir.clone());
+        let config_dir =
+            config_dir.map_or_else(|| settings_dir.clone(), PathBuf::from);
 
         Ok(Self {
             settings_dir,
@@ -198,8 +197,7 @@ impl DirectoryInfo {
             let move_dir = settings
                 .custom_dir
                 .as_ref()
-                .map(PathBuf::from)
-                .unwrap_or_else(|| app_dir.clone());
+                .map_or_else(|| app_dir.clone(), PathBuf::from);
 
             async fn is_dir_writeable(
                 new_config_dir: &Path,
@@ -225,7 +223,7 @@ impl DirectoryInfo {
 
                 let disks = sysinfo::Disks::new_with_refreshed_list();
 
-                for disk in disks.iter() {
+                for disk in &disks {
                     if path.starts_with(disk.mount_point()) {
                         return Ok(Some(disk.available_space()));
                     }
diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs
index 831b31551..008660d9f 100644
--- a/packages/app-lib/src/state/friends.rs
+++ b/packages/app-lib/src/state/friends.rs
@@ -174,7 +174,7 @@ impl FriendsSocket {
                                             ServerToClientMessage::FriendRequest { from } => {
                                                 let _ = emit_friend(FriendPayload::FriendRequest { from }).await;
                                             }
-                                            ServerToClientMessage::FriendRequestRejected { .. } => todo!(),
+                                            ServerToClientMessage::FriendRequestRejected { .. } => {}, // TODO
 
                                             ServerToClientMessage::FriendSocketListening { .. } => {}, // TODO
                                             ServerToClientMessage::FriendSocketStoppedListening { .. } => {}, // TODO
diff --git a/packages/app-lib/src/state/legacy_converter.rs b/packages/app-lib/src/state/legacy_converter.rs
index 0fcc01ddc..0d4a68046 100644
--- a/packages/app-lib/src/state/legacy_converter.rs
+++ b/packages/app-lib/src/state/legacy_converter.rs
@@ -29,9 +29,7 @@ where
         return Ok(());
     };
 
-    let old_launcher_root = if let Some(dir) = default_settings_dir() {
-        dir
-    } else {
+    let Some(old_launcher_root) = default_settings_dir() else {
         return Ok(());
     };
     let old_launcher_root_str = old_launcher_root.to_string_lossy().to_string();
@@ -177,12 +175,10 @@ where
 
                 let profile_path = entry.path().join("profile.json");
 
-                let profile = if let Ok(profile) =
+                let Ok(profile) =
                     read_json::<LegacyProfile>(&profile_path, &io_semaphore)
                         .await
-                {
-                    profile
-                } else {
+                else {
                     continue;
                 };
 
@@ -285,7 +281,7 @@ where
 
                                         TeamMember {
                                             team_id: x.team_id,
-                                            user: user.clone(),
+                                            user,
                                             is_owner: x.role == "Owner",
                                             role: x.role,
                                             ordering: x.ordering,
diff --git a/packages/app-lib/src/state/minecraft_auth.rs b/packages/app-lib/src/state/minecraft_auth.rs
index 4cc045b86..164c4a3f3 100644
--- a/packages/app-lib/src/state/minecraft_auth.rs
+++ b/packages/app-lib/src/state/minecraft_auth.rs
@@ -1177,12 +1177,10 @@ fn get_date_header(headers: &HeaderMap) -> DateTime<Utc> {
         .get(reqwest::header::DATE)
         .and_then(|x| x.to_str().ok())
         .and_then(|x| DateTime::parse_from_rfc2822(x).ok())
-        .map(|x| x.with_timezone(&Utc))
-        .unwrap_or(Utc::now())
+        .map_or(Utc::now(), |x| x.with_timezone(&Utc))
 }
 
 #[tracing::instrument]
-#[allow(clippy::format_collect)]
 fn generate_oauth_challenge() -> String {
     let mut rng = rand::thread_rng();
 
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index 324fcda4d..852de5991 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -692,7 +692,7 @@ impl Process {
                 let mut cmd = hook.split(' ');
                 if let Some(command) = cmd.next() {
                     let mut command = Command::new(command);
-                    command.args(cmd.collect::<Vec<&str>>()).current_dir(
+                    command.args(cmd).current_dir(
                         profile::get_full_path(&profile_path).await?,
                     );
                     command.spawn().map_err(IOError::from)?;
diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs
index 2aa09ece1..7cf70a285 100644
--- a/packages/app-lib/src/state/profiles.rs
+++ b/packages/app-lib/src/state/profiles.rs
@@ -1022,8 +1022,10 @@ impl Profile {
             file.hash,
             file.project_type
                 .filter(|x| *x != ProjectType::Mod)
-                .map(|x| x.get_loaders().join("+"))
-                .unwrap_or_else(|| profile.loader.as_str().to_string()),
+                .map_or_else(
+                    || profile.loader.as_str().to_string(),
+                    |x| x.get_loaders().join("+")
+                ),
             profile.game_version
         )
     }
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 89d7bc044..90d48028e 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -247,9 +247,13 @@ pub struct WindowSize(pub u16, pub u16);
 
 /// Game initialization hooks
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde_with::serde_as]
 pub struct Hooks {
+    #[serde_as(as = "serde_with::NoneAsEmptyString")]
     pub pre_launch: Option<String>,
+    #[serde_as(as = "serde_with::NoneAsEmptyString")]
     pub wrapper: Option<String>,
+    #[serde_as(as = "serde_with::NoneAsEmptyString")]
     pub post_exit: Option<String>,
 }
 
diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs
index 2323ec7d9..fb62386aa 100644
--- a/packages/app-lib/src/util/fetch.rs
+++ b/packages/app-lib/src/util/fetch.rs
@@ -80,10 +80,9 @@ pub async fn fetch_advanced(
 ) -> crate::Result<Bytes> {
     let _permit = semaphore.0.acquire().await?;
 
-    let creds = if !header
+    let creds = if header
         .as_ref()
-        .map(|x| &*x.0.to_lowercase() == "authorization")
-        .unwrap_or(false)
+        .is_none_or(|x| &*x.0.to_lowercase() != "authorization")
         && (url.starts_with("https://cdn.modrinth.com")
             || url.starts_with(MODRINTH_API_URL)
             || url.starts_with(MODRINTH_API_URL_V3))
diff --git a/packages/app-lib/src/util/io.rs b/packages/app-lib/src/util/io.rs
index 9d82c24d3..0079f4809 100644
--- a/packages/app-lib/src/util/io.rs
+++ b/packages/app-lib/src/util/io.rs
@@ -35,7 +35,6 @@ impl IOError {
     }
 }
 
-// dunce canonicalize
 pub fn canonicalize(
     path: impl AsRef<std::path::Path>,
 ) -> Result<std::path::PathBuf, IOError> {
@@ -46,7 +45,6 @@ pub fn canonicalize(
     })
 }
 
-// read_dir
 pub async fn read_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<tokio::fs::ReadDir, IOError> {
@@ -59,7 +57,6 @@ pub async fn read_dir(
         })
 }
 
-// create_dir
 pub async fn create_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -72,7 +69,6 @@ pub async fn create_dir(
         })
 }
 
-// create_dir_all
 pub async fn create_dir_all(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -85,7 +81,6 @@ pub async fn create_dir_all(
         })
 }
 
-// remove_dir_all
 pub async fn remove_dir_all(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -98,20 +93,37 @@ pub async fn remove_dir_all(
         })
 }
 
-// read_to_string
-pub async fn read_to_string(
+/// Reads a text file to a string, automatically detecting its encoding and
+/// substituting any invalid characters with the Unicode replacement character.
+///
+/// This function is best suited for reading Minecraft instance files, whose
+/// encoding may vary depending on the platform, launchers, client versions
+/// (older Minecraft versions tended to rely on the system's default codepage
+/// more on Windows platforms), and mods used, while not being highly sensitive
+/// to occasional occurrences of mojibake or character replacements.
+pub async fn read_any_encoding_to_string(
     path: impl AsRef<std::path::Path>,
-) -> Result<String, IOError> {
+) -> Result<(String, &'static encoding_rs::Encoding), IOError> {
     let path = path.as_ref();
-    tokio::fs::read_to_string(path)
-        .await
-        .map_err(|e| IOError::IOPathError {
-            source: e,
-            path: path.to_string_lossy().to_string(),
-        })
+    let file_bytes =
+        tokio::fs::read(path)
+            .await
+            .map_err(|e| IOError::IOPathError {
+                source: e,
+                path: path.to_string_lossy().to_string(),
+            })?;
+
+    let file_encoding = {
+        let mut encoding_detector = chardetng::EncodingDetector::new();
+        encoding_detector.feed(&file_bytes, true);
+        encoding_detector.guess(None, true)
+    };
+
+    let (file_string, actual_file_encoding, _) =
+        file_encoding.decode(&file_bytes);
+    Ok((file_string.to_string(), actual_file_encoding))
 }
 
-// read
 pub async fn read(
     path: impl AsRef<std::path::Path>,
 ) -> Result<Vec<u8>, IOError> {
@@ -124,7 +136,6 @@ pub async fn read(
         })
 }
 
-// write
 pub async fn write(
     path: impl AsRef<std::path::Path>,
     data: impl AsRef<[u8]>,
@@ -186,7 +197,6 @@ pub fn is_same_disk(old_dir: &Path, new_dir: &Path) -> Result<bool, IOError> {
     }
 }
 
-// rename
 pub async fn rename_or_move(
     from: impl AsRef<std::path::Path>,
     to: impl AsRef<std::path::Path>,
@@ -228,7 +238,6 @@ async fn move_recursive(from: &Path, to: &Path) -> Result<(), IOError> {
     Ok(())
 }
 
-// copy
 pub async fn copy(
     from: impl AsRef<std::path::Path>,
     to: impl AsRef<std::path::Path>,
@@ -243,7 +252,6 @@ pub async fn copy(
         })
 }
 
-// remove file
 pub async fn remove_file(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -256,7 +264,6 @@ pub async fn remove_file(
         })
 }
 
-// open file
 pub async fn open_file(
     path: impl AsRef<std::path::Path>,
 ) -> Result<tokio::fs::File, IOError> {
@@ -269,7 +276,6 @@ pub async fn open_file(
         })
 }
 
-// remove dir
 pub async fn remove_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -282,7 +288,6 @@ pub async fn remove_dir(
         })
 }
 
-// metadata
 pub async fn metadata(
     path: impl AsRef<std::path::Path>,
 ) -> Result<std::fs::Metadata, IOError> {
diff --git a/packages/app-lib/src/util/jre.rs b/packages/app-lib/src/util/jre.rs
index e32c93649..781b54a37 100644
--- a/packages/app-lib/src/util/jre.rs
+++ b/packages/app-lib/src/util/jre.rs
@@ -227,13 +227,11 @@ async fn get_all_jre_path() -> HashSet<PathBuf> {
     paths.unwrap_or_else(|_| HashSet::new())
 }
 
-#[cfg(target_os = "windows")]
-#[allow(dead_code)]
-pub const JAVA_BIN: &str = "javaw.exe";
-
-#[cfg(not(target_os = "windows"))]
-#[allow(dead_code)]
-pub const JAVA_BIN: &str = "java";
+pub const JAVA_BIN: &str = if cfg!(target_os = "windows") {
+    "javaw.exe"
+} else {
+    "java"
+};
 
 // For each example filepath in 'paths', perform check_java_at_filepath, checking each one concurrently
 // and returning a JavaVersion for every valid path that points to a java bin
@@ -249,7 +247,7 @@ pub async fn check_java_at_filepaths(
         .collect::<Vec<_>>()
         .await;
 
-    jres.into_iter().flat_map(|x| x.ok()).flatten().collect()
+    jres.into_iter().filter_map(|x| x.ok()).flatten().collect()
 }
 
 // For example filepath 'path', attempt to resolve it and get a Java version at this path
diff --git a/packages/app-lib/src/util/mod.rs b/packages/app-lib/src/util/mod.rs
index 086e7b67e..1296e43a9 100644
--- a/packages/app-lib/src/util/mod.rs
+++ b/packages/app-lib/src/util/mod.rs
@@ -5,15 +5,3 @@ pub mod jre;
 pub mod platform;
 pub mod utils; // AstralRinth
 pub mod server_ping;
-
-/// Wrap a builder which uses a mut reference into one which outputs an owned value
-macro_rules! wrap_ref_builder {
-    ($id:ident = $init:expr => $transform:block) => {{
-        let mut it = $init;
-        {
-            let $id = &mut it;
-            $transform;
-        }
-        it
-    }};
-}
diff --git a/packages/ariadne/Cargo.toml b/packages/ariadne/Cargo.toml
index ed5947d1f..66c7e120c 100644
--- a/packages/ariadne/Cargo.toml
+++ b/packages/ariadne/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ariadne"
 version = "0.1.0"
-edition = "2024"
+edition.workspace = true
 
 [dependencies]
 serde = { workspace = true, features = ["derive"] }
@@ -13,3 +13,6 @@ rand.workspace = true
 either.workspace = true
 chrono = { workspace = true, features = ["serde"] }
 serde_cbor.workspace = true
+
+[lints]
+workspace = true
diff --git a/packages/assets/icons/cpu.svg b/packages/assets/icons/cpu.svg
index f95f519b3..0b3bb3e35 100644
--- a/packages/assets/icons/cpu.svg
+++ b/packages/assets/icons/cpu.svg
@@ -1,14 +1,18 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    fill="none"
-    viewBox="0 0 24 24"
-    stroke-width="1.5"
-    stroke="currentColor"
-    class="absolute right-8 top-8 size-8"
->
-<path
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    d="M8.25 3v1.5M4.5 8.25H3m18 0h-1.5M4.5 12H3m18 0h-1.5m-15 3.75H3m18 0h-1.5M8.25 19.5V21M12 3v1.5m0 15V21m3.75-18v1.5m0 15V21m-9-1.5h10.5a2.25 2.25 0 0 0 2.25-2.25V6.75a2.25 2.25 0 0 0-2.25-2.25H6.75A2.25 2.25 0 0 0 4.5 6.75v10.5a2.25 2.25 0 0 0 2.25 2.25Zm.75-12h9v9h-9v-9Z"
-/>
+<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-cpu-icon lucide-cpu">
+    <path d="M12 20v2" />
+    <path d="M12 2v2" />
+    <path d="M17 20v2" />
+    <path d="M17 2v2" />
+    <path d="M2 12h2" />
+    <path d="M2 17h2" />
+    <path d="M2 7h2" />
+    <path d="M20 12h2" />
+    <path d="M20 17h2" />
+    <path d="M20 7h2" />
+    <path d="M7 20v2" />
+    <path d="M7 2v2" />
+    <rect x="4" y="4" width="16" height="16" rx="2" />
+    <rect x="8" y="8" width="8" height="8" rx="1" />
 </svg>
\ No newline at end of file
diff --git a/packages/assets/icons/database.svg b/packages/assets/icons/database.svg
new file mode 100644
index 000000000..c86d4a04a
--- /dev/null
+++ b/packages/assets/icons/database.svg
@@ -0,0 +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-database-icon lucide-database"><ellipse cx="12" cy="5" rx="9" ry="3"/><path d="M3 5V19A9 3 0 0 0 21 19V5"/><path d="M3 12A9 3 0 0 0 21 12"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/db.svg b/packages/assets/icons/db.svg
deleted file mode 100644
index 196cf349e..000000000
--- a/packages/assets/icons/db.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    fill="none"
-    viewBox="0 0 24 24"
-    stroke-width="1.5"
-    stroke="currentColor"
-    class="absolute right-8 top-8 size-8"
->
-    <path
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125"
-    />
-</svg>
\ No newline at end of file
diff --git a/packages/assets/icons/memory-stick.svg b/packages/assets/icons/memory-stick.svg
new file mode 100644
index 000000000..53bef3f86
--- /dev/null
+++ b/packages/assets/icons/memory-stick.svg
@@ -0,0 +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-memory-stick-icon lucide-memory-stick"><path d="M6 19v-3"/><path d="M10 19v-3"/><path d="M14 19v-3"/><path d="M18 19v-3"/><path d="M8 11V9"/><path d="M16 11V9"/><path d="M12 11V9"/><path d="M2 15h20"/><path d="M2 7a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v1.1a2 2 0 0 0 0 3.837V17a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-5.1a2 2 0 0 0 0-3.837Z"/></svg>
\ No newline at end of file
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index 87c724138..c491cbd1a 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -77,6 +77,7 @@ import _CopyrightIcon from './icons/copyright.svg?component'
 import _CrownIcon from './icons/crown.svg?component'
 import _CurrencyIcon from './icons/currency.svg?component'
 import _DashboardIcon from './icons/dashboard.svg?component'
+import _DatabaseIcon from './icons/database.svg?component'
 import _DownloadIcon from './icons/download.svg?component'
 import _DropdownIcon from './icons/dropdown.svg?component'
 import _EditIcon from './icons/edit.svg?component'
@@ -125,6 +126,7 @@ import _LogOutIcon from './icons/log-out.svg?component'
 import _MailIcon from './icons/mail.svg?component'
 import _ManageIcon from './icons/manage.svg?component'
 import _MaximizeIcon from './icons/maximize.svg?component'
+import _MemoryStickIcon from './icons/memory-stick.svg?component'
 import _MessageIcon from './icons/message.svg?component'
 import _MicrophoneIcon from './icons/microphone.svg?component'
 import _MinimizeIcon from './icons/minimize.svg?component'
@@ -205,7 +207,6 @@ import _CubeIcon from './icons/cube.svg?component'
 import _CloudIcon from './icons/cloud.svg?component'
 import _CogIcon from './icons/cog.svg?component'
 import _CPUIcon from './icons/cpu.svg?component'
-import _DBIcon from './icons/db.svg?component'
 import _LoaderIcon from './icons/loader.svg?component'
 import _ImportIcon from './icons/import.svg?component'
 import _TimerIcon from './icons/timer.svg?component'
@@ -311,6 +312,7 @@ export const CopyrightIcon = _CopyrightIcon
 export const CrownIcon = _CrownIcon
 export const CurrencyIcon = _CurrencyIcon
 export const DashboardIcon = _DashboardIcon
+export const DatabaseIcon = _DatabaseIcon
 export const DownloadIcon = _DownloadIcon
 export const DropdownIcon = _DropdownIcon
 export const EditIcon = _EditIcon
@@ -360,6 +362,7 @@ export const LogOutIcon = _LogOutIcon
 export const MailIcon = _MailIcon
 export const ManageIcon = _ManageIcon
 export const MaximizeIcon = _MaximizeIcon
+export const MemoryStickIcon = _MemoryStickIcon
 export const MessageIcon = _MessageIcon
 export const MicrophoneIcon = _MicrophoneIcon
 export const MinimizeIcon = _MinimizeIcon
@@ -450,7 +453,6 @@ export const CubeIcon = _CubeIcon
 export const CloudIcon = _CloudIcon
 export const CogIcon = _CogIcon
 export const CPUIcon = _CPUIcon
-export const DBIcon = _DBIcon
 export const LoaderIcon = _LoaderIcon
 export const ImportIcon = _ImportIcon
 export const CardIcon = _CardIcon
diff --git a/packages/assets/styles/variables.scss b/packages/assets/styles/variables.scss
index 315c98989..f46f24e37 100644
--- a/packages/assets/styles/variables.scss
+++ b/packages/assets/styles/variables.scss
@@ -200,6 +200,8 @@ html {
   --color-platform-sponge: #f9e580;
 
   --hover-brightness: 1.25;
+
+  --experimental-color-button-bg: #33363d;
 }
 
 .oled-mode {
@@ -257,7 +259,7 @@ html {
 }
 
 .dark-experiments {
-  --color-button-bg: #33363d;
+  --color-button-bg: var(--experimental-color-button-bg);
 }
 
 .dark-mode:not(.oled-mode),
diff --git a/packages/daedalus/Cargo.toml b/packages/daedalus/Cargo.toml
index 014ce6f83..0b2bbdd83 100644
--- a/packages/daedalus/Cargo.toml
+++ b/packages/daedalus/Cargo.toml
@@ -2,7 +2,7 @@
 name = "daedalus"
 version = "0.2.3"
 authors = ["Jai A <jai@modrinth.com>"]
-edition = "2024"
+edition.workspace = true
 license = "MIT"
 description = "Utilities for querying and parsing Minecraft metadata"
 repository = "https://github.com/modrinth/daedalus/"
@@ -18,3 +18,6 @@ serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 chrono = { workspace = true, features = ["serde"] }
 thiserror.workspace = true
+
+[lints]
+workspace = true
diff --git a/packages/daedalus/package.json b/packages/daedalus/package.json
index a5af9cf71..b2ee389f8 100644
--- a/packages/daedalus/package.json
+++ b/packages/daedalus/package.json
@@ -2,9 +2,8 @@
   "name": "@modrinth/daedalus",
   "scripts": {
     "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix",
-    "dev": "cargo run",
-    "test": "cargo test"
+    "lint": "cargo fmt --check && cargo clippy --all-targets",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
+    "test": "cargo nextest run --all-targets --no-fail-fast"
   }
 }
diff --git a/packages/daedalus/src/modded.rs b/packages/daedalus/src/modded.rs
index b828cd6dc..6c4733dfa 100644
--- a/packages/daedalus/src/modded.rs
+++ b/packages/daedalus/src/modded.rs
@@ -1,7 +1,7 @@
 use crate::minecraft::{
     Argument, ArgumentType, Library, VersionInfo, VersionType,
 };
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::{DateTime, NaiveDateTime, Utc};
 use serde::{Deserialize, Deserializer, Serialize};
 use std::collections::HashMap;
 
@@ -26,7 +26,6 @@ pub struct SidedDataEntry {
     pub server: String,
 }
 
-#[allow(deprecated)]
 fn deserialize_date<'de, D>(deserializer: D) -> Result<DateTime<Utc>, D::Error>
 where
     D: Deserializer<'de>,
@@ -34,7 +33,10 @@ where
     let s = String::deserialize(deserializer)?;
 
     serde_json::from_str::<DateTime<Utc>>(&format!("\"{s}\""))
-        .or_else(|_| Utc.datetime_from_str(&s, "%Y-%m-%dT%H:%M:%S%.9f"))
+        .or_else(|_| {
+            NaiveDateTime::parse_from_str(&s, "%Y-%m-%dT%H:%M:%S%.9f")
+                .map(|date| date.and_utc())
+        })
         .map_err(serde::de::Error::custom)
 }
 
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 0599a8077..314dadf02 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -11,10 +11,12 @@
   },
   "devDependencies": {
     "@formatjs/cli": "^6.2.12",
+    "@stripe/stripe-js": "^7.3.1",
     "@vintl/unplugin": "^1.5.1",
     "@vintl/vintl": "^4.4.1",
     "eslint": "^8.57.0",
     "eslint-config-custom": "workspace:*",
+    "stripe": "^18.1.1",
     "tsconfig": "workspace:*",
     "typescript": "^5.4.5",
     "vue": "^3.5.13",
diff --git a/packages/ui/src/components/base/ErrorInformationCard.vue b/packages/ui/src/components/base/ErrorInformationCard.vue
new file mode 100644
index 000000000..9edfc0263
--- /dev/null
+++ b/packages/ui/src/components/base/ErrorInformationCard.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-8 shadow-xl">
+    <div class="flex flex-col items-center text-center">
+      <div class="flex flex-col items-center gap-4">
+        <div class="grid place-content-center rounded-full bg-bg-orange p-4">
+          <component :is="icon" class="size-12 text-orange" />
+        </div>
+        <h1 class="m-0 mb-2 w-fit text-4xl font-bold">{{ title }}</h1>
+      </div>
+      <div v-if="!description">
+        <slot name="description" />
+      </div>
+      <p v-else class="text-lg text-secondary">{{ description }}</p>
+    </div>
+
+    <div v-if="errorDetails" class="my-4 w-full rounded-lg border border-divider bg-bg-raised">
+      <div class="divide-y divide-divider">
+        <div
+          v-for="detail in errorDetails.filter((detail) => detail.type !== 'hidden')"
+          :key="detail.label"
+          class="px-4 py-3"
+        >
+          <div v-if="detail.type === 'inline'" class="flex items-center justify-between">
+            <span class="font-medium text-secondary">{{ detail.label }}</span>
+            <div class="flex items-center gap-2">
+              <code class="rounded-lg bg-code-bg px-2 py-1 text-sm text-code-text">
+                {{ detail.value }}
+              </code>
+            </div>
+          </div>
+
+          <div v-else-if="detail.type === 'block'" class="flex flex-col gap-2">
+            <div class="flex items-center justify-between">
+              <span class="font-medium text-secondary">{{ detail.label }}</span>
+            </div>
+            <div class="w-full overflow-hidden rounded-lg bg-code-bg p-3">
+              <code
+                class="block w-full overflow-x-auto break-words text-sm text-code-text whitespace-pre-wrap"
+              >
+                {{ detail.value }}
+              </code>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="mt-4 flex !w-full flex-row gap-4">
+      <ButtonStyled
+        v-if="action"
+        size="large"
+        :color="action.color || 'brand'"
+        :disabled="action.disabled"
+        @click="action.onClick"
+      >
+        <button class="!w-full">
+          <component :is="action.icon" v-if="action.icon && !action.showAltIcon" class="size-4" />
+          <component
+            :is="action.altIcon"
+            v-else-if="action.icon && action.showAltIcon"
+            class="size-4"
+          />
+          {{ action.label }}
+        </button>
+      </ButtonStyled>
+
+      <ButtonStyled v-if="errorDetails" size="large" color="standard" @click="copyErrorInformation">
+        <button class="!w-full">
+          <CopyIcon v-if="!infoCopied" class="size-4" />
+          <CheckIcon v-else class="size-4" />
+          Copy Information
+        </button>
+      </ButtonStyled>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import ButtonStyled from './ButtonStyled.vue'
+import { CopyIcon, CheckIcon } from '@modrinth/assets'
+import type { Component } from 'vue'
+
+const infoCopied = ref(false)
+
+const props = defineProps<{
+  title: string
+  description?: string
+  icon: Component
+  errorDetails?: {
+    label?: string
+    value?: string
+    type?: 'inline' | 'block' | 'hidden'
+  }[]
+  action?: {
+    label: string
+    onClick: () => void
+    color?: 'brand' | 'standard' | 'red' | 'orange' | 'blue'
+    disabled?: boolean
+    icon?: Component
+    altIcon?: Component
+    showAltIcon?: boolean
+  }
+}>()
+
+const copyErrorInformation = async () => {
+  if (!props.errorDetails || props.errorDetails.length === 0) return
+
+  const formattedErrorInfo = props.errorDetails
+    .filter((detail) => detail.label && detail.value)
+    .map((detail) => `${detail.label}: ${detail.value}`)
+    .join('\n\n')
+
+  await navigator.clipboard.writeText(formattedErrorInfo)
+  infoCopied.value = true
+  setTimeout(() => {
+    infoCopied.value = false
+  }, 2000)
+}
+</script>
diff --git a/packages/ui/src/components/base/ManySelect.vue b/packages/ui/src/components/base/ManySelect.vue
index 1e340b916..b5287b392 100644
--- a/packages/ui/src/components/base/ManySelect.vue
+++ b/packages/ui/src/components/base/ManySelect.vue
@@ -34,7 +34,7 @@
             "
           />
         </div>
-        <ScrollablePanel v-if="search" class="h-[17rem]">
+        <ScrollablePanel v-if="search">
           <Button
             v-for="(option, index) in filteredOptions"
             :key="`option-${index}`"
diff --git a/packages/ui/src/components/base/RadioButtons.vue b/packages/ui/src/components/base/RadioButtons.vue
index db5c7ec4a..70d9da44f 100644
--- a/packages/ui/src/components/base/RadioButtons.vue
+++ b/packages/ui/src/components/base/RadioButtons.vue
@@ -3,9 +3,9 @@
     <button
       v-for="(item, index) in items"
       :key="`radio-button-${index}`"
-      class="p-0 py-2 px-2 border-0 flex gap-2 transition-all items-center cursor-pointer active:scale-95 hover:bg-button-bg rounded-xl"
+      class="p-0 py-2 px-2 border-0 font-medium flex gap-2 transition-all items-center cursor-pointer active:scale-95 hover:bg-button-bg rounded-xl"
       :class="{
-        'text-contrast font-medium bg-button-bg': selected === item,
+        'text-contrast bg-button-bg': selected === item,
         'text-primary bg-transparent': selected !== item,
       }"
       @click="selected = item"
diff --git a/packages/ui/src/components/base/ScrollablePanel.vue b/packages/ui/src/components/base/ScrollablePanel.vue
index 2fd7cf714..35766efd4 100644
--- a/packages/ui/src/components/base/ScrollablePanel.vue
+++ b/packages/ui/src/components/base/ScrollablePanel.vue
@@ -3,11 +3,18 @@
     <div
       class="wrapper-wrapper"
       :class="{
-        'top-fade': !scrollableAtTop && !props.disableScrolling,
-        'bottom-fade': !scrollableAtBottom && !props.disableScrolling,
+        'top-fade': !scrollableAtTop && !disableScrolling,
+        'bottom-fade': !scrollableAtBottom && !disableScrolling,
       }"
     >
-      <div ref="scrollablePane" class="scrollable-pane" @scroll="onScroll">
+      <div
+        ref="scrollablePane"
+        :class="{
+          'max-h-[19rem]': !disableScrolling,
+        }"
+        class="scrollable-pane"
+        @scroll="onScroll"
+      >
         <slot />
       </div>
     </div>
@@ -17,7 +24,7 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue'
 
-const props = withDefaults(
+withDefaults(
   defineProps<{
     disableScrolling?: boolean
   }>(),
diff --git a/packages/ui/src/components/billing/AddPaymentMethod.vue b/packages/ui/src/components/billing/AddPaymentMethod.vue
new file mode 100644
index 000000000..7f5027ff1
--- /dev/null
+++ b/packages/ui/src/components/billing/AddPaymentMethod.vue
@@ -0,0 +1,104 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { createStripeElements } from '@modrinth/utils'
+import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
+import { loadStripe, type Stripe as StripsJs, type StripeElements } from '@stripe/stripe-js'
+
+const emit = defineEmits<{
+  (e: 'startLoading' | 'stopLoading'): void
+}>()
+
+export type SetupIntentResponse = {
+  client_secret: string
+}
+
+export type AddPaymentMethodProps = {
+  publishableKey: string
+  createSetupIntent: () => Promise<SetupIntentResponse>
+  returnUrl: string
+  onError: (error: Error) => void
+}
+
+const props = defineProps<AddPaymentMethodProps>()
+
+const elementsLoaded = ref<0 | 1 | 2>(0)
+const stripe = ref<StripsJs>()
+const elements = ref<StripeElements>()
+const error = ref(false)
+
+function handleError(error: Error) {
+  props.onError(error)
+  error.value = true
+}
+
+async function reload(paymentMethods: Stripe.PaymentMethod[]) {
+  try {
+    elementsLoaded.value = 0
+    error.value = false
+
+    const result = await props.createSetupIntent()
+
+    stripe.value = await loadStripe(props.publishableKey)
+    const {
+      elements: newElements,
+      addressElement,
+      paymentElement,
+    } = createStripeElements(stripe.value, paymentMethods, {
+      clientSecret: result.client_secret,
+    })
+
+    elements.value = newElements
+    paymentElement.on('ready', () => {
+      elementsLoaded.value += 1
+    })
+    addressElement.on('ready', () => {
+      elementsLoaded.value += 1
+    })
+  } catch (err) {
+    handleError(err)
+  }
+}
+
+async function submit(): Promise<boolean> {
+  emit('startLoading')
+
+  const result = await stripe.value.confirmSetup({
+    elements: elements.value,
+    confirmParams: {
+      return_url: props.returnUrl,
+    },
+  })
+
+  console.log(result)
+
+  const { error } = result
+
+  emit('stopLoading')
+  if (error && error.type !== 'validation_error') {
+    handleError(error.message)
+    return false
+  } else if (!error) {
+    return true
+  }
+}
+
+defineExpose({
+  reload,
+  submit,
+})
+</script>
+
+<template>
+  <div class="min-h-[16rem] flex flex-col gap-2 justify-center items-center">
+    <div v-show="elementsLoaded < 2">
+      <ModalLoadingIndicator :error="error">
+        Loading...
+        <template #error> Error loading Stripe payment UI. </template>
+      </ModalLoadingIndicator>
+    </div>
+    <div class="w-full">
+      <div id="address-element"></div>
+      <div id="payment-element" class="mt-4"></div>
+    </div>
+  </div>
+</template>
diff --git a/packages/ui/src/components/billing/AddPaymentMethodModal.vue b/packages/ui/src/components/billing/AddPaymentMethodModal.vue
new file mode 100644
index 000000000..8175501e9
--- /dev/null
+++ b/packages/ui/src/components/billing/AddPaymentMethodModal.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import { ButtonStyled, NewModal } from '../index'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import AddPaymentMethod from './AddPaymentMethod.vue'
+import type { AddPaymentMethodProps } from './AddPaymentMethod.vue'
+import { commonMessages } from '../../utils'
+import { PlusIcon, XIcon } from '@modrinth/assets'
+
+const { formatMessage } = useVIntl()
+
+const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
+const addPaymentMethod = useTemplateRef<InstanceType<typeof AddPaymentMethod>>('addPaymentMethod')
+
+const props = defineProps<AddPaymentMethodProps>()
+const loading = ref(false)
+
+async function open(paymentMethods: Stripe.PaymentMethod[]) {
+  modal.value?.show()
+  await nextTick()
+  await addPaymentMethod.value?.reload(paymentMethods)
+}
+
+const messages = defineMessages({
+  addingPaymentMethod: {
+    id: 'modal.add-payment-method.title',
+    defaultMessage: 'Adding a payment method',
+  },
+  paymentMethodAdd: {
+    id: 'modal.add-payment-method.action',
+    defaultMessage: 'Add payment method',
+  },
+})
+
+defineExpose({
+  show: open,
+})
+</script>
+
+<template>
+  <NewModal ref="modal">
+    <template #title>
+      <span class="text-lg font-extrabold text-contrast">
+        {{ formatMessage(messages.addingPaymentMethod) }}
+      </span>
+    </template>
+    <div class="w-[40rem] max-w-full">
+      <AddPaymentMethod
+        ref="addPaymentMethod"
+        :publishable-key="props.publishableKey"
+        :return-url="props.returnUrl"
+        :create-setup-intent="props.createSetupIntent"
+        :on-error="props.onError"
+        @start-loading="loading = true"
+        @stop-loading="loading = false"
+      />
+      <div class="input-group mt-auto pt-4">
+        <ButtonStyled color="brand">
+          <button :disabled="loading" @click="addPaymentMethod.submit()">
+            <PlusIcon />
+            {{ formatMessage(messages.paymentMethodAdd) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled>
+          <button @click="modal.hide()">
+            <XIcon />
+            {{ formatMessage(commonMessages.cancelButton) }}
+          </button>
+        </ButtonStyled>
+      </div>
+    </div>
+  </NewModal>
+</template>
diff --git a/packages/ui/src/components/billing/ExpandableInvoiceTotal.vue b/packages/ui/src/components/billing/ExpandableInvoiceTotal.vue
new file mode 100644
index 000000000..d586464c4
--- /dev/null
+++ b/packages/ui/src/components/billing/ExpandableInvoiceTotal.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import Accordion from '../base/Accordion.vue'
+import { formatPrice } from '@modrinth/utils'
+import { useVIntl } from '@vintl/vintl'
+import { SpinnerIcon } from '@modrinth/assets'
+import { computed } from 'vue'
+
+const { locale } = useVIntl()
+
+export type BillingItem = {
+  title: string
+  amount: number
+}
+
+const props = defineProps<{
+  period?: string
+  currency: string
+  total: number
+  billingItems: BillingItem[]
+  loading?: boolean
+}>()
+
+const periodSuffix = computed(() => {
+  return props.period ? ` / ${props.period}` : ''
+})
+</script>
+<template>
+  <Accordion
+    class="rounded-2xl overflow-hidden bg-bg"
+    button-class="bg-transparent p-0 w-full p-4 active:scale-[0.98] transition-transform duration-100"
+  >
+    <template #title>
+      <div class="w-full flex items-center justify-between">
+        <div class="flex items-center gap-2 text-contrast font-bold">Total</div>
+        <div class="text-right mr-1">
+          <span class="text-primary font-bold">
+            <template v-if="loading">
+              <SpinnerIcon class="animate-spin size-4" />
+            </template>
+            <template v-else> {{ formatPrice(locale, total, currency) }} </template
+            ><span class="text-xs text-secondary">{{ periodSuffix }}</span>
+          </span>
+        </div>
+      </div>
+    </template>
+    <div class="p-4 flex flex-col gap-4 bg-table-alternateRow">
+      <div
+        v-for="{ title, amount } in billingItems"
+        :key="title"
+        class="flex items-center justify-between"
+      >
+        <div class="font-semibold">
+          {{ title }}
+        </div>
+        <div class="text-right">
+          <template v-if="loading">
+            <SpinnerIcon class="animate-spin size-4" />
+          </template>
+          <template v-else> {{ formatPrice(locale, amount, currency) }} </template
+          ><span class="text-xs text-secondary">{{ periodSuffix }}</span>
+        </div>
+      </div>
+    </div>
+  </Accordion>
+</template>
diff --git a/packages/ui/src/components/billing/FormattedPaymentMethod.vue b/packages/ui/src/components/billing/FormattedPaymentMethod.vue
new file mode 100644
index 000000000..617adf81e
--- /dev/null
+++ b/packages/ui/src/components/billing/FormattedPaymentMethod.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { CardIcon, CurrencyIcon, PayPalIcon, UnknownIcon } from '@modrinth/assets'
+import { commonMessages, paymentMethodMessages } from '../../utils'
+import type Stripe from 'stripe'
+import { useVIntl } from '@vintl/vintl'
+
+const { formatMessage } = useVIntl()
+defineProps<{
+  method: Stripe.PaymentMethod
+}>()
+</script>
+
+<template>
+  <template v-if="'type' in method">
+    <CardIcon v-if="method.type === 'card'" class="size-[1.5em]" />
+    <CurrencyIcon v-else-if="method.type === 'cashapp'" class="size-[1.5em]" />
+    <PayPalIcon v-else-if="method.type === 'paypal'" class="size-[1.5em]" />
+    <UnknownIcon v-else class="size-[1.5em]" />
+    <span v-if="method.type === 'card' && 'card' in method && method.card">
+      {{
+        formatMessage(commonMessages.paymentMethodCardDisplay, {
+          card_brand:
+            formatMessage(paymentMethodMessages[method.card.brand]) ??
+            formatMessage(paymentMethodMessages.unknown),
+          last_four: method.card.last4,
+        })
+      }}
+    </span>
+    <template v-else>
+      {{
+        formatMessage(paymentMethodMessages[method.type]) ??
+        formatMessage(paymentMethodMessages.unknown)
+      }}
+    </template>
+
+    <span v-if="method.type === 'cashapp' && 'cashapp' in method && method.cashapp">
+      ({{ method.cashapp.cashtag }})
+    </span>
+    <span v-else-if="method.type === 'paypal' && 'paypal' in method && method.paypal">
+      ({{ method.paypal.payer_email }})
+    </span>
+  </template>
+</template>
diff --git a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
new file mode 100644
index 000000000..74e618fe6
--- /dev/null
+++ b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
@@ -0,0 +1,346 @@
+<script setup lang="ts">
+import { ref, computed, useTemplateRef, nextTick, watch } from 'vue'
+import NewModal from '../modal/NewModal.vue'
+import { type MessageDescriptor, useVIntl, defineMessage } from '@vintl/vintl'
+import {
+  ChevronRightIcon,
+  LeftArrowIcon,
+  RightArrowIcon,
+  XIcon,
+  CheckCircleIcon,
+  SpinnerIcon,
+} from '@modrinth/assets'
+import type {
+  CreatePaymentIntentRequest,
+  CreatePaymentIntentResponse,
+  ServerBillingInterval,
+  ServerPlan,
+  ServerRegion,
+  ServerStockRequest,
+  UpdatePaymentIntentRequest,
+  UpdatePaymentIntentResponse,
+} from '../../utils/billing'
+import { ButtonStyled } from '../index'
+import type Stripe from 'stripe'
+
+import { commonMessages } from '../../utils'
+import RegionSelector from './ServersPurchase1Region.vue'
+import PaymentMethodSelector from './ServersPurchase2PaymentMethod.vue'
+import ConfirmPurchase from './ServersPurchase3Review.vue'
+import { useStripe } from '../../composables/stripe'
+import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
+
+const { formatMessage } = useVIntl()
+
+export type RegionPing = {
+  region: string
+  ping: number
+}
+
+const props = defineProps<{
+  publishableKey: string
+  returnUrl: string
+  paymentMethods: Stripe.PaymentMethod[]
+  customer: Stripe.Customer
+  currency: string
+  pings: RegionPing[]
+  regions: ServerRegion[]
+  availableProducts: ServerPlan[]
+  refreshPaymentMethods: () => Promise<void>
+  fetchStock: (region: ServerRegion, request: ServerStockRequest) => Promise<number>
+  initiatePayment: (
+    body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
+  ) => Promise<UpdatePaymentIntentResponse | CreatePaymentIntentResponse>
+  onError: (err: Error) => void
+}>()
+
+const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
+const selectedPlan = ref<ServerPlan>()
+const selectedInterval = ref<ServerBillingInterval>('quarterly')
+const loading = ref(false)
+const selectedRegion = ref<string>()
+
+const {
+  initializeStripe,
+  selectPaymentMethod,
+  primaryPaymentMethodId,
+  loadStripeElements,
+  selectedPaymentMethod,
+  inputtedPaymentMethod,
+  createNewPaymentMethod,
+  loadingElements,
+  loadingElementsFailed,
+  tax,
+  total,
+  paymentMethodLoading,
+  reloadPaymentIntent,
+  hasPaymentMethod,
+  submitPayment,
+  completingPurchase,
+} = useStripe(
+  props.publishableKey,
+  props.customer,
+  props.paymentMethods,
+  props.currency,
+  selectedPlan,
+  selectedInterval,
+  selectedRegion,
+  props.initiatePayment,
+  props.onError,
+)
+
+const customServer = ref<boolean>(false)
+const acceptedEula = ref<boolean>(false)
+const skipPaymentMethods = ref<boolean>(true)
+
+type Step = 'region' | 'payment' | 'review'
+
+const steps: Step[] = ['region', 'payment', 'review']
+
+const titles: Record<Step, MessageDescriptor> = {
+  region: defineMessage({ id: 'servers.purchase.step.region.title', defaultMessage: 'Region' }),
+  payment: defineMessage({
+    id: 'servers.purchase.step.payment.title',
+    defaultMessage: 'Payment method',
+  }),
+  review: defineMessage({ id: 'servers.purchase.step.review.title', defaultMessage: 'Review' }),
+}
+
+const currentRegion = computed(() => {
+  return props.regions.find((region) => region.shortcode === selectedRegion.value)
+})
+
+const currentPing = computed(() => {
+  return props.pings.find((ping) => ping.region === currentRegion.value?.shortcode)?.ping
+})
+
+const currentStep = ref<Step>()
+
+const currentStepIndex = computed(() => (currentStep.value ? steps.indexOf(currentStep.value) : -1))
+const previousStep = computed(() => {
+  const step = currentStep.value ? steps[steps.indexOf(currentStep.value) - 1] : undefined
+  if (step === 'payment' && skipPaymentMethods.value && primaryPaymentMethodId.value) {
+    return 'region'
+  }
+  return step
+})
+const nextStep = computed(() =>
+  currentStep.value ? steps[steps.indexOf(currentStep.value) + 1] : undefined,
+)
+
+const canProceed = computed(() => {
+  switch (currentStep.value) {
+    case 'region':
+      return selectedRegion.value && selectedPlan.value && selectedInterval.value
+    case 'payment':
+      return selectedPaymentMethod.value || !loadingElements.value
+    case 'review':
+      return acceptedEula.value && hasPaymentMethod.value && !completingPurchase.value
+    default:
+      return false
+  }
+})
+
+async function beforeProceed(step: string) {
+  switch (step) {
+    case 'region':
+      return true
+    case 'payment':
+      await initializeStripe()
+
+      if (primaryPaymentMethodId.value && skipPaymentMethods.value) {
+        const paymentMethod = await props.paymentMethods.find(
+          (x) => x.id === primaryPaymentMethodId.value,
+        )
+        await selectPaymentMethod(paymentMethod)
+        await setStep('review', true)
+        return false
+      }
+      return true
+    case 'review':
+      if (selectedPaymentMethod.value) {
+        return true
+      } else {
+        const token = await createNewPaymentMethod()
+        return !!token
+      }
+  }
+}
+
+async function afterProceed(step: string) {
+  switch (step) {
+    case 'region':
+      break
+    case 'payment':
+      await loadStripeElements()
+      break
+    case 'review':
+      break
+  }
+}
+
+async function setStep(step: Step | undefined, skipValidation = false) {
+  if (!step) {
+    await submitPayment(props.returnUrl)
+    return
+  }
+
+  if (!skipValidation && !canProceed.value) {
+    return
+  }
+
+  if (await beforeProceed(step)) {
+    currentStep.value = step
+    await nextTick()
+
+    await afterProceed(step)
+  }
+}
+
+watch(selectedPlan, () => {
+  console.log(selectedPlan.value)
+})
+
+function begin(interval: ServerBillingInterval, plan?: ServerPlan) {
+  loading.value = false
+  selectedPlan.value = plan
+  selectedInterval.value = interval
+  customServer.value = !selectedPlan.value
+  selectedPaymentMethod.value = undefined
+  currentStep.value = steps[0]
+  skipPaymentMethods.value = true
+  modal.value?.show()
+}
+
+defineExpose({
+  show: begin,
+})
+</script>
+<template>
+  <NewModal ref="modal">
+    <template #title>
+      <div class="flex items-center gap-1 font-bold text-secondary">
+        <template v-for="(title, id, index) in titles" :key="id">
+          <button
+            v-if="index < currentStepIndex"
+            class="bg-transparent active:scale-95 font-bold text-secondary p-0"
+            @click="setStep(id, true)"
+          >
+            {{ formatMessage(title) }}
+          </button>
+          <span
+            v-else
+            :class="{
+              'text-contrast': index === currentStepIndex,
+            }"
+          >
+            {{ formatMessage(title) }}
+          </span>
+          <ChevronRightIcon
+            v-if="index < steps.length - 1"
+            class="h-5 w-5 text-secondary"
+            stroke-width="3"
+          />
+        </template>
+      </div>
+    </template>
+    <div class="w-[40rem] max-w-full">
+      <RegionSelector
+        v-if="currentStep === 'region'"
+        v-model:region="selectedRegion"
+        v-model:plan="selectedPlan"
+        :regions="regions"
+        :pings="pings"
+        :custom="customServer"
+        :available-products="availableProducts"
+        :fetch-stock="fetchStock"
+      />
+      <PaymentMethodSelector
+        v-else-if="currentStep === 'payment' && selectedPlan && selectedInterval"
+        :payment-methods="paymentMethods"
+        :selected="selectedPaymentMethod"
+        :loading-elements="loadingElements"
+        :loading-elements-failed="loadingElementsFailed"
+        @select="selectPaymentMethod"
+      />
+      <ConfirmPurchase
+        v-else-if="
+          currentStep === 'review' &&
+          hasPaymentMethod &&
+          currentRegion &&
+          selectedInterval &&
+          selectedPlan
+        "
+        v-model:interval="selectedInterval"
+        v-model:accepted-eula="acceptedEula"
+        :currency="currency"
+        :plan="selectedPlan"
+        :region="currentRegion"
+        :ping="currentPing"
+        :loading="paymentMethodLoading"
+        :selected-payment-method="selectedPaymentMethod || inputtedPaymentMethod"
+        :tax="tax"
+        :total="total"
+        @change-payment-method="
+          () => {
+            skipPaymentMethods = false
+            setStep('payment', true)
+          }
+        "
+        @reload-payment-intent="reloadPaymentIntent"
+      />
+      <div v-else>Something went wrong</div>
+      <div
+        v-show="
+          selectedPaymentMethod === undefined &&
+          currentStep === 'payment' &&
+          selectedPlan &&
+          selectedInterval
+        "
+        class="min-h-[16rem] flex flex-col gap-2 mt-2 p-4 bg-table-alternateRow rounded-xl justify-center items-center"
+      >
+        <div v-show="loadingElements">
+          <ModalLoadingIndicator :error="loadingElementsFailed">
+            Loading...
+            <template #error> Error loading Stripe payment UI. </template>
+          </ModalLoadingIndicator>
+        </div>
+        <div class="w-full">
+          <div id="address-element"></div>
+          <div id="payment-element" class="mt-4"></div>
+        </div>
+      </div>
+    </div>
+    <div class="flex gap-2 justify-between mt-4">
+      <ButtonStyled>
+        <button v-if="previousStep" @click="previousStep && setStep(previousStep, true)">
+          <LeftArrowIcon /> {{ formatMessage(commonMessages.backButton) }}
+        </button>
+        <button v-else @click="modal?.hide()">
+          <XIcon />
+          {{ formatMessage(commonMessages.cancelButton) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled color="brand">
+        <button
+          v-tooltip="
+            currentStep === 'review' && !acceptedEula
+              ? 'You must accept the Minecraft EULA to proceed.'
+              : undefined
+          "
+          :disabled="!canProceed"
+          @click="setStep(nextStep)"
+        >
+          <template v-if="currentStep === 'review'">
+            <SpinnerIcon v-if="completingPurchase" class="animate-spin" />
+            <CheckCircleIcon v-else />
+            Subscribe
+          </template>
+          <template v-else>
+            {{ formatMessage(commonMessages.nextButton) }} <RightArrowIcon />
+          </template>
+        </button>
+      </ButtonStyled>
+    </div>
+  </NewModal>
+</template>
diff --git a/packages/ui/src/components/billing/PaymentMethodOption.vue b/packages/ui/src/components/billing/PaymentMethodOption.vue
new file mode 100644
index 000000000..a600054e8
--- /dev/null
+++ b/packages/ui/src/components/billing/PaymentMethodOption.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { RadioButtonIcon, RadioButtonCheckedIcon, SpinnerIcon } from '@modrinth/assets'
+import type Stripe from 'stripe'
+import FormattedPaymentMethod from './FormattedPaymentMethod.vue'
+
+const emit = defineEmits<{
+  (e: 'select'): void
+}>()
+
+withDefaults(
+  defineProps<{
+    item: Stripe.PaymentMethod | undefined
+    selected: boolean
+    loading?: boolean
+  }>(),
+  {
+    loading: false,
+  },
+)
+</script>
+
+<template>
+  <button
+    class="flex items-center w-full gap-2 border-none p-3 text-primary rounded-xl transition-all duration-200 hover:bg-button-bg hover:brightness-[--hover-brightness] active:scale-[0.98] hover:cursor-pointer"
+    :class="selected ? 'bg-button-bg' : 'bg-transparent'"
+    @click="emit('select')"
+  >
+    <RadioButtonCheckedIcon v-if="selected" class="size-6 text-brand" />
+    <RadioButtonIcon v-else class="size-6 text-secondary" />
+
+    <template v-if="item === undefined">
+      <span>New payment method</span>
+    </template>
+    <FormattedPaymentMethod v-else-if="item" :method="item" />
+    <SpinnerIcon v-if="loading" class="ml-auto size-4 text-secondary animate-spin" />
+  </button>
+</template>
diff --git a/packages/ui/src/components/billing/PurchaseModal.vue b/packages/ui/src/components/billing/PurchaseModal.vue
index 65d92dae3..7b216b9a6 100644
--- a/packages/ui/src/components/billing/PurchaseModal.vue
+++ b/packages/ui/src/components/billing/PurchaseModal.vue
@@ -214,10 +214,17 @@
               {{ interval }}
             </span>
             <span
-              v-if="interval === 'yearly'"
+              v-if="interval === 'yearly' || interval === 'quarterly'"
               class="rounded-full bg-brand px-2 py-1 font-bold text-brand-inverted"
             >
-              SAVE {{ calculateSavings(price.prices.intervals.monthly, rawPrice) }}%
+              SAVE
+              {{
+                calculateSavings(
+                  price.prices.intervals.monthly,
+                  rawPrice,
+                  interval === 'quarterly' ? 3 : 12,
+                )
+              }}%
             </span>
             <span class="ml-auto text-lg" :class="{ 'text-secondary': selectedPlan !== interval }">
               {{ formatPrice(locale, rawPrice, price.currency_code) }}
diff --git a/packages/ui/src/components/billing/ServersPurchase1Region.vue b/packages/ui/src/components/billing/ServersPurchase1Region.vue
new file mode 100644
index 000000000..eeaadadd8
--- /dev/null
+++ b/packages/ui/src/components/billing/ServersPurchase1Region.vue
@@ -0,0 +1,246 @@
+<script setup lang="ts">
+import ServersRegionButton from './ServersRegionButton.vue'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { IntlFormatted } from '@vintl/vintl/components'
+import { onMounted, ref, computed, watch } from 'vue'
+import type { RegionPing } from './ModrinthServersPurchaseModal.vue'
+import type { ServerPlan, ServerRegion, ServerStockRequest } from '../../utils/billing'
+import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
+import Slider from '../base/Slider.vue'
+import { SpinnerIcon, XIcon, InfoIcon } from '@modrinth/assets'
+import ServersSpecs from './ServersSpecs.vue'
+
+const { formatMessage } = useVIntl()
+
+const props = defineProps<{
+  regions: ServerRegion[]
+  pings: RegionPing[]
+  fetchStock: (region: ServerRegion, request: ServerStockRequest) => Promise<number>
+  custom: boolean
+  availableProducts: ServerPlan[]
+}>()
+
+const loading = ref(true)
+const checkingCustomStock = ref(false)
+const selectedPlan = defineModel<ServerPlan>('plan')
+const selectedRegion = defineModel<string>('region')
+
+const regionOrder: string[] = ['us-vin', 'eu-lim']
+
+const sortedRegions = computed(() => {
+  return props.regions.slice().sort((a, b) => {
+    return regionOrder.indexOf(a.shortcode) - regionOrder.indexOf(b.shortcode)
+  })
+})
+
+const selectedRam = ref<number>(-1)
+
+const ramOptions = computed(() => {
+  return props.availableProducts
+    .map((product) => (product.metadata.ram ?? 0) / 1024)
+    .filter((x) => x > 0)
+})
+
+const minRam = computed(() => {
+  return Math.min(...ramOptions.value)
+})
+const maxRam = computed(() => {
+  return Math.max(...ramOptions.value)
+})
+
+const lowestProduct = computed(() => {
+  return (
+    props.availableProducts.find(
+      (product) => (product.metadata.ram ?? 0) / 1024 === minRam.value,
+    ) ?? props.availableProducts[0]
+  )
+})
+
+function updateRamStock(regionToCheck: string, newRam: number) {
+  if (newRam > 0) {
+    checkingCustomStock.value = true
+    const plan = props.availableProducts.find(
+      (product) => (product.metadata.ram ?? 0) / 1024 === newRam,
+    )
+    if (plan) {
+      const region = sortedRegions.value.find((region) => region.shortcode === regionToCheck)
+      if (region) {
+        props
+          .fetchStock(region, {
+            cpu: plan.metadata.cpu ?? 0,
+            memory_mb: plan.metadata.ram ?? 0,
+            swap_mb: plan.metadata.swap ?? 0,
+            storage_mb: plan.metadata.storage ?? 0,
+          })
+          .then((stock: number) => {
+            if (stock > 0) {
+              selectedPlan.value = plan
+            } else {
+              selectedPlan.value = undefined
+            }
+          })
+          .finally(() => {
+            checkingCustomStock.value = false
+          })
+      } else {
+        checkingCustomStock.value = false
+      }
+    }
+  }
+}
+
+watch(selectedRam, (newRam: number) => {
+  if (props.custom && selectedRegion.value) {
+    updateRamStock(selectedRegion.value, newRam)
+  }
+})
+
+watch(selectedRegion, (newRegion: string | undefined) => {
+  if (props.custom && newRegion) {
+    updateRamStock(newRegion, selectedRam.value)
+  }
+})
+
+const currentStock = ref<{ [region: string]: number }>({})
+const bestPing = ref<string>()
+
+const messages = defineMessages({
+  prompt: {
+    id: 'servers.region.prompt',
+    defaultMessage: 'Where would you like your server to be located?',
+  },
+  regionUnsupported: {
+    id: 'servers.region.region-unsupported',
+    defaultMessage: `Region not listed? <link>Let us know where you'd like to see Modrinth Servers next!</link>`,
+  },
+  customPrompt: {
+    id: 'servers.region.custom.prompt',
+    defaultMessage: `How much RAM do you want your server to have?`,
+  },
+})
+
+async function updateStock() {
+  currentStock.value = {}
+  const capacityChecks = sortedRegions.value.map((region) =>
+    props.fetchStock(
+      region,
+      selectedPlan.value
+        ? {
+            cpu: selectedPlan.value?.metadata.cpu ?? 0,
+            memory_mb: selectedPlan.value?.metadata.ram ?? 0,
+            swap_mb: selectedPlan.value?.metadata.swap ?? 0,
+            storage_mb: selectedPlan.value?.metadata.storage ?? 0,
+          }
+        : {
+            cpu: lowestProduct.value.metadata.cpu ?? 0,
+            memory_mb: lowestProduct.value.metadata.ram ?? 0,
+            swap_mb: lowestProduct.value.metadata.swap ?? 0,
+            storage_mb: lowestProduct.value.metadata.storage ?? 0,
+          },
+    ),
+  )
+  const results = await Promise.all(capacityChecks)
+  results.forEach((result, index) => {
+    currentStock.value[sortedRegions.value[index].shortcode] = result
+  })
+}
+
+onMounted(() => {
+  // auto select region with lowest ping
+  loading.value = true
+  bestPing.value =
+    props.pings.length > 0
+      ? props.pings.reduce((acc, cur) => {
+          return acc.ping < cur.ping ? acc : cur
+        })?.region
+      : undefined
+  selectedRegion.value = undefined
+  selectedRam.value = minRam.value
+  checkingCustomStock.value = true
+  updateStock().then(() => {
+    const firstWithStock = sortedRegions.value.find(
+      (region) => currentStock.value[region.shortcode] > 0,
+    )
+    let stockedRegion = selectedRegion.value
+    if (!stockedRegion) {
+      stockedRegion =
+        bestPing.value && currentStock.value[bestPing.value] > 0
+          ? bestPing.value
+          : firstWithStock?.shortcode
+    }
+    selectedRegion.value = stockedRegion
+    if (props.custom && stockedRegion) {
+      updateRamStock(stockedRegion, minRam.value)
+    }
+    loading.value = false
+  })
+})
+</script>
+
+<template>
+  <ModalLoadingIndicator v-if="loading" class="flex py-40 justify-center">
+    Checking availability...
+  </ModalLoadingIndicator>
+  <template v-else>
+    <h2 class="mt-0 mb-4 text-xl font-bold text-contrast">
+      {{ formatMessage(messages.prompt) }}
+    </h2>
+    <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+      <ServersRegionButton
+        v-for="region in sortedRegions"
+        :key="region.shortcode"
+        v-model="selectedRegion"
+        :region="region"
+        :out-of-stock="currentStock[region.shortcode] === 0"
+        :ping="pings.find((p) => p.region === region.shortcode)?.ping"
+        :best-ping="bestPing === region.shortcode"
+      />
+    </div>
+    <div class="mt-3 text-sm">
+      <IntlFormatted :message-id="messages.regionUnsupported">
+        <template #link="{ children }">
+          <a
+            class="text-link"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://surveys.modrinth.com/servers-region-waitlist"
+          >
+            <component :is="() => children" />
+          </a>
+        </template>
+      </IntlFormatted>
+    </div>
+    <template v-if="custom">
+      <h2 class="mt-4 mb-2 text-xl font-bold text-contrast">
+        {{ formatMessage(messages.customPrompt) }}
+      </h2>
+      <div>
+        <Slider v-model="selectedRam" :min="minRam" :max="maxRam" :step="2" unit="GB" />
+        <div class="bg-bg rounded-xl p-4 mt-4 text-secondary">
+          <div v-if="checkingCustomStock" class="flex gap-2 items-center">
+            <SpinnerIcon class="size-5 shrink-0 animate-spin" /> Checking availability...
+          </div>
+          <div v-else-if="selectedPlan">
+            <ServersSpecs
+              class="!flex-row justify-between"
+              :ram="selectedPlan.metadata.ram ?? 0"
+              :storage="selectedPlan.metadata.storage ?? 0"
+              :cpus="selectedPlan.metadata.cpu ?? 0"
+            />
+          </div>
+          <div v-else class="flex gap-2 items-center">
+            <XIcon class="size-5 shrink-0 text-red" /> Sorry, we don't have any plans available with
+            {{ selectedRam }} GB RAM in this region.
+          </div>
+        </div>
+        <div class="flex gap-2 mt-2">
+          <InfoIcon class="hidden sm:block shrink-0 mt-1" />
+          <span class="text-sm text-secondary">
+            Storage and shared CPU count are currently not configurable independently, and are based
+            on the amount of RAM you select.
+          </span>
+        </div>
+      </div>
+    </template>
+  </template>
+</template>
diff --git a/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue b/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue
new file mode 100644
index 000000000..91fdafc32
--- /dev/null
+++ b/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import type Stripe from 'stripe'
+import { useVIntl, defineMessages } from '@vintl/vintl'
+import PaymentMethodOption from './PaymentMethodOption.vue'
+
+const { formatMessage } = useVIntl()
+
+const emit = defineEmits<{
+  (e: 'select', paymentMethod: Stripe.PaymentMethod | undefined): void
+}>()
+
+defineProps<{
+  paymentMethods: Stripe.PaymentMethod[]
+  selected?: Stripe.PaymentMethod
+  loadingElements: boolean
+  loadingElementsFailed: boolean
+}>()
+
+const messages = defineMessages({
+  prompt: {
+    id: 'servers.purchase.step.payment.prompt',
+    defaultMessage: 'Select a payment method',
+  },
+  description: {
+    id: 'servers.purchase.step.payment.description',
+    defaultMessage: `You won't be charged yet.`,
+  },
+})
+</script>
+
+<template>
+  <h2 class="mt-0 mb-1 text-xl font-bold text-contrast">
+    {{ formatMessage(messages.prompt) }}
+  </h2>
+  <p class="mt-0 mb-4 text-secondary">
+    {{ formatMessage(messages.description) }}
+  </p>
+  <div class="flex flex-col gap-1">
+    <PaymentMethodOption
+      v-for="method in paymentMethods"
+      :key="method.id"
+      :item="method"
+      :selected="selected?.id === method.id"
+      @select="emit('select', method)"
+    />
+    <PaymentMethodOption
+      :loading="false"
+      :item="undefined"
+      :selected="selected === undefined"
+      @select="emit('select', undefined)"
+    />
+  </div>
+</template>
diff --git a/packages/ui/src/components/billing/ServersPurchase3Review.vue b/packages/ui/src/components/billing/ServersPurchase3Review.vue
new file mode 100644
index 000000000..3978e2366
--- /dev/null
+++ b/packages/ui/src/components/billing/ServersPurchase3Review.vue
@@ -0,0 +1,263 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { ServerBillingInterval, ServerPlan, ServerRegion } from '../../utils/billing'
+import TagItem from '../base/TagItem.vue'
+import ServersSpecs from './ServersSpecs.vue'
+import { formatPrice, getPingLevel } from '@modrinth/utils'
+import { useVIntl } from '@vintl/vintl'
+import { regionOverrides } from '../../utils/regions'
+import {
+  EditIcon,
+  RightArrowIcon,
+  SignalIcon,
+  SpinnerIcon,
+  XIcon,
+  RadioButtonIcon,
+  RadioButtonCheckedIcon,
+  ExternalIcon,
+} from '@modrinth/assets'
+import type Stripe from 'stripe'
+import FormattedPaymentMethod from './FormattedPaymentMethod.vue'
+import ButtonStyled from '../base/ButtonStyled.vue'
+import Checkbox from '../base/Checkbox.vue'
+import ExpandableInvoiceTotal from './ExpandableInvoiceTotal.vue'
+
+const vintl = useVIntl()
+const { locale, formatMessage } = vintl
+
+const emit = defineEmits<{
+  (e: 'changePaymentMethod' | 'reloadPaymentIntent'): void
+}>()
+
+const props = defineProps<{
+  plan: ServerPlan
+  region: ServerRegion
+  tax?: number
+  total?: number
+  currency: string
+  ping?: number
+  loading?: boolean
+  selectedPaymentMethod: Stripe.PaymentMethod | undefined
+}>()
+
+const interval = defineModel<ServerBillingInterval>('interval', { required: true })
+const acceptedEula = defineModel<boolean>('acceptedEula', { required: true })
+
+const prices = computed(() => {
+  return props.plan.prices.find((x) => x.currency_code === props.currency)
+})
+
+const planName = computed(() => {
+  if (!props.plan || !props.plan.metadata || props.plan.metadata.type !== 'pyro') return 'Unknown'
+  const ram = props.plan.metadata.ram
+  if (ram === 4096) return 'Small'
+  if (ram === 6144) return 'Medium'
+  if (ram === 8192) return 'Large'
+  return 'Custom'
+})
+
+const flag = computed(
+  () =>
+    regionOverrides[props.region.shortcode]?.flag ??
+    `https://flagcdn.com/${props.region.country_code}.svg`,
+)
+const overrideTitle = computed(() => regionOverrides[props.region.shortcode]?.name)
+const title = computed(() =>
+  overrideTitle.value ? formatMessage(overrideTitle.value) : props.region.display_name,
+)
+const locationSubtitle = computed(() =>
+  overrideTitle.value ? props.region.display_name : undefined,
+)
+const pingLevel = computed(() => getPingLevel(props.ping ?? 0))
+
+const period = computed(() => {
+  if (interval.value === 'monthly') return 'month'
+  if (interval.value === 'quarterly') return '3 months'
+  if (interval.value === 'yearly') return 'year'
+  return '???'
+})
+
+const monthsInInterval: Record<ServerBillingInterval, number> = {
+  monthly: 1,
+  quarterly: 3,
+  yearly: 12,
+}
+
+function setInterval(newInterval: ServerBillingInterval) {
+  interval.value = newInterval
+  emit('reloadPaymentIntent')
+}
+</script>
+
+<template>
+  <div class="grid sm:grid-cols-[3fr_2fr] gap-4">
+    <div class="bg-table-alternateRow p-4 rounded-2xl">
+      <div class="flex items-center gap-2 mb-3">
+        <LazyUiServersModrinthServersIcon class="flex h-5 w-fit" />
+        <TagItem>{{ planName }}</TagItem>
+      </div>
+      <div>
+        <ServersSpecs
+          v-if="plan.metadata && plan.metadata.ram && plan.metadata.storage && plan.metadata.cpu"
+          class="!grid sm:grid-cols-2"
+          :ram="plan.metadata.ram"
+          :storage="plan.metadata.storage"
+          :cpus="plan.metadata.cpu"
+        />
+      </div>
+    </div>
+    <div
+      class="bg-table-alternateRow p-4 rounded-2xl flex flex-col gap-2 items-center justify-center"
+    >
+      <img
+        v-if="flag"
+        class="aspect-[16/10] max-w-12 w-full object-cover rounded-md border-1 border-button-border border-solid"
+        :src="flag"
+        alt=""
+        aria-hidden="true"
+      />
+      <span class="font-semibold">
+        {{ title }}
+      </span>
+      <span class="text-xs flex items-center gap-1 text-secondary font-medium">
+        <template v-if="locationSubtitle">
+          <span>
+            {{ locationSubtitle }}
+          </span>
+          <span v-if="ping !== -1">•</span>
+        </template>
+        <template v-if="ping !== -1">
+          <SignalIcon
+            v-if="ping"
+            aria-hidden="true"
+            :style="`--_signal-${pingLevel}: ${pingLevel <= 2 ? 'var(--color-red)' : pingLevel <= 4 ? 'var(--color-orange)' : 'var(--color-green)'}`"
+            stroke-width="3px"
+            class="shrink-0"
+          />
+          <SpinnerIcon v-else class="animate-spin" />
+          <template v-if="ping"> {{ ping }}ms </template>
+          <span v-else> Testing connection... </span>
+        </template>
+      </span>
+    </div>
+  </div>
+
+  <div class="grid grid-cols-2 gap-2 mt-4">
+    <button
+      :class="
+        interval === 'monthly'
+          ? 'bg-button-bg border-transparent'
+          : 'bg-transparent  border-button-border'
+      "
+      class="rounded-2xl active:scale-[0.98] transition-transform duration-100 border-2 border-solid p-4 flex items-center gap-2"
+      @click="setInterval('monthly')"
+    >
+      <RadioButtonCheckedIcon v-if="interval === 'monthly'" class="size-6 text-brand" />
+      <RadioButtonIcon v-else class="size-6 text-secondary" />
+      <div class="flex flex-col items-start gap-1 font-medium text-primary">
+        <span class="flex items-center gap-1" :class="{ 'text-contrast': interval === 'monthly' }"
+          >Pay monthly</span
+        >
+        <span class="text-sm text-secondary flex items-center gap-1"
+          >{{ formatPrice(locale, prices?.prices.intervals['monthly'], currency, true) }} /
+          month</span
+        >
+      </div>
+    </button>
+    <button
+      :class="
+        interval === 'quarterly'
+          ? 'bg-button-bg border-transparent'
+          : 'bg-transparent  border-button-border'
+      "
+      class="rounded-2xl active:scale-[0.98] transition-transform duration-100 border-2 border-solid p-4 flex items-center gap-2"
+      @click="setInterval('quarterly')"
+    >
+      <RadioButtonCheckedIcon v-if="interval === 'quarterly'" class="size-6 text-brand" />
+      <RadioButtonIcon v-else class="size-6 text-secondary" />
+      <div class="flex flex-col items-start gap-1 font-medium text-primary">
+        <span class="flex items-center gap-1" :class="{ 'text-contrast': interval === 'quarterly' }"
+          >Pay quarterly
+          <span class="text-xs font-bold text-brand px-1.5 py-0.5 rounded-full bg-brand-highlight"
+            >{{ interval === 'quarterly' ? 'Saving' : 'Save' }} 16%</span
+          ></span
+        >
+        <span class="text-sm text-secondary flex items-center gap-1"
+          >{{
+            formatPrice(
+              locale,
+              (prices?.prices?.intervals?.['quarterly'] ?? 0) / monthsInInterval['quarterly'],
+              currency,
+              true,
+            )
+          }}
+          / month</span
+        >
+      </div>
+    </button>
+  </div>
+  <div class="mt-2">
+    <ExpandableInvoiceTotal
+      :period="period"
+      :currency="currency"
+      :loading="loading"
+      :total="total ?? -1"
+      :billing-items="
+        total !== undefined && tax !== undefined
+          ? [
+              {
+                title: `Modrinth Servers (${planName})`,
+                amount: total - tax,
+              },
+              {
+                title: 'Tax',
+                amount: tax,
+              },
+            ]
+          : []
+      "
+    />
+  </div>
+  <div class="mt-2 flex items-center pl-4 pr-2 py-3 bg-bg rounded-2xl gap-2 text-secondary">
+    <template v-if="selectedPaymentMethod">
+      <FormattedPaymentMethod :method="selectedPaymentMethod" />
+    </template>
+    <template v-else>
+      <div class="flex items-center gap-2 text-red">
+        <XIcon />
+        No payment method selected
+      </div>
+    </template>
+    <ButtonStyled size="small" type="transparent">
+      <button class="ml-auto" @click="emit('changePaymentMethod')">
+        <template v-if="selectedPaymentMethod"> <EditIcon /> Change </template>
+        <template v-else> Select payment method <RightArrowIcon /> </template>
+      </button>
+    </ButtonStyled>
+  </div>
+  <p class="m-0 mt-4 text-sm text-secondary">
+    <span class="font-semibold"
+      >By clicking "Subscribe", you are purchasing a recurring subscription.</span
+    >
+    <br />
+    You'll be charged
+    <SpinnerIcon v-if="loading" class="animate-spin relative top-0.5 mx-2" /><template v-else>{{
+      formatPrice(locale, total, currency)
+    }}</template>
+    every {{ period }} plus applicable taxes starting today, until you cancel. You can cancel
+    anytime from your settings page.
+  </p>
+  <div class="mt-2 flex items-center gap-1 text-sm">
+    <Checkbox
+      v-model="acceptedEula"
+      label="I acknowledge that I have read and agree to the"
+      description="I acknowledge that I have read and agree to the Minecraft EULA"
+    />
+    <a
+      href="https://www.minecraft.net/en-us/eula"
+      target="_blank"
+      class="text-brand underline hover:brightness-[--hover-brightness]"
+      >Minecraft EULA<ExternalIcon class="size-3 shrink-0 ml-0.5 mb-0.5"
+    /></a>
+  </div>
+</template>
diff --git a/packages/ui/src/components/billing/ServersRegionButton.vue b/packages/ui/src/components/billing/ServersRegionButton.vue
new file mode 100644
index 000000000..48a86834b
--- /dev/null
+++ b/packages/ui/src/components/billing/ServersRegionButton.vue
@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import { useVIntl } from '@vintl/vintl'
+import { getPingLevel } from '@modrinth/utils'
+import { SignalIcon, SpinnerIcon } from '@modrinth/assets'
+import { computed } from 'vue'
+import type { ServerRegion } from '../../utils/billing'
+import { regionOverrides } from '../../utils/regions'
+
+const { formatMessage } = useVIntl()
+
+const currentRegion = defineModel<string | undefined>({ required: true })
+
+const props = defineProps<{
+  region: ServerRegion
+  ping?: number
+  bestPing?: boolean
+  outOfStock?: boolean
+}>()
+
+const isCurrentRegion = computed(() => currentRegion.value === props.region.shortcode)
+const flag = computed(
+  () =>
+    regionOverrides[props.region.shortcode]?.flag ??
+    `https://flagcdn.com/${props.region.country_code}.svg`,
+)
+const overrideTitle = computed(() => regionOverrides[props.region.shortcode]?.name)
+const title = computed(() =>
+  overrideTitle.value ? formatMessage(overrideTitle.value) : props.region.display_name,
+)
+const locationSubtitle = computed(() =>
+  overrideTitle.value ? props.region.display_name : undefined,
+)
+const pingLevel = computed(() => getPingLevel(props.ping ?? 0))
+
+function setRegion() {
+  currentRegion.value = props.region.shortcode
+}
+</script>
+
+<template>
+  <button
+    :disabled="outOfStock"
+    class="rounded-2xl p-4 font-semibold transition-all border-2 border-solid flex flex-col items-center gap-3"
+    :class="{
+      'bg-button-bg border-transparent text-primary': !isCurrentRegion,
+      'bg-brand-highlight border-brand text-contrast': isCurrentRegion,
+      'opacity-50 cursor-not-allowed': outOfStock,
+      'hover:text-contrast active:scale-95 hover:brightness-[--hover-brightness] focus-visible:brightness-[--hover-brightness] ':
+        !outOfStock,
+    }"
+    @click="setRegion"
+  >
+    <img
+      v-if="flag"
+      class="aspect-[16/10] max-w-16 w-full object-cover rounded-md border-1 border-solid"
+      :class="[
+        isCurrentRegion ? 'border-brand' : 'border-button-border',
+        { 'saturate-[0.25]': outOfStock },
+      ]"
+      :src="flag"
+      alt=""
+      aria-hidden="true"
+    />
+    <span class="flex flex-col gap-1 items-center">
+      <span class="flex items-center gap-1 flex-wrap justify-center">
+        {{ title }} <span v-if="outOfStock" class="text-sm text-secondary">(Out of stock)</span>
+      </span>
+      <span class="text-xs flex items-center gap-1 text-secondary font-medium">
+        <template v-if="locationSubtitle">
+          <span>
+            {{ locationSubtitle }}
+          </span>
+          <span v-if="ping !== -1">•</span>
+        </template>
+        <template v-if="ping !== -1">
+          <SignalIcon
+            v-if="ping"
+            aria-hidden="true"
+            :style="`--_signal-${pingLevel}: ${pingLevel <= 2 ? 'var(--color-red)' : pingLevel <= 4 ? 'var(--color-orange)' : 'var(--color-green)'}`"
+            stroke-width="3px"
+            class="shrink-0"
+          />
+          <SpinnerIcon v-else class="animate-spin" />
+          <template v-if="ping"> {{ ping }}ms </template>
+          <span v-else> Testing connection... </span>
+        </template>
+      </span>
+    </span>
+  </button>
+</template>
diff --git a/packages/ui/src/components/billing/ServersSpecs.vue b/packages/ui/src/components/billing/ServersSpecs.vue
new file mode 100644
index 000000000..f9a581242
--- /dev/null
+++ b/packages/ui/src/components/billing/ServersSpecs.vue
@@ -0,0 +1,60 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import AutoLink from '../base/AutoLink.vue'
+import { MemoryStickIcon, DatabaseIcon, CPUIcon, SparklesIcon, UnknownIcon } from '@modrinth/assets'
+
+const emit = defineEmits<{
+  (e: 'click-bursting-link'): void
+}>()
+
+const props = withDefaults(
+  defineProps<{
+    ram: number
+    storage: number
+    cpus: number
+    burstingLink?: string
+  }>(),
+  {
+    burstingLink: undefined,
+  },
+)
+
+const formattedRam = computed(() => {
+  return props.ram / 1024
+})
+
+const formattedStorage = computed(() => {
+  return props.storage / 1024
+})
+
+const sharedCpus = computed(() => {
+  return props.cpus / 2
+})
+</script>
+<template>
+  <ul class="m-0 flex list-none flex-col gap-2 px-0 text-sm leading-normal text-secondary">
+    <li class="flex items-center gap-2">
+      <MemoryStickIcon class="h-5 w-5 shrink-0" /> {{ formattedRam }} GB RAM
+    </li>
+    <li class="flex items-center gap-2">
+      <DatabaseIcon class="h-5 w-5 shrink-0" /> {{ formattedStorage }} GB Storage
+    </li>
+    <li class="flex items-center gap-2">
+      <CPUIcon class="h-5 w-5 shrink-0" /> {{ sharedCpus }} Shared CPUs
+    </li>
+    <li class="flex items-center gap-2">
+      <SparklesIcon class="h-5 w-5 shrink-0" /> Bursts up to {{ cpus }} CPUs
+      <AutoLink
+        v-if="burstingLink"
+        v-tooltip="
+          `CPU bursting allows your server to temporarily use additional threads to help mitigate TPS spikes. Click for more info.`
+        "
+        class="flex"
+        :to="burstingLink"
+        @click="() => emit('click-bursting-link')"
+      >
+        <UnknownIcon class="h-4 w-4 text-secondary opacity-80" />
+      </AutoLink>
+    </li>
+  </ul>
+</template>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index 899a89320..3ca10fb98 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -16,6 +16,7 @@ export { default as DoubleIcon } from './base/DoubleIcon.vue'
 export { default as DropArea } from './base/DropArea.vue'
 export { default as DropdownSelect } from './base/DropdownSelect.vue'
 export { default as EnvironmentIndicator } from './base/EnvironmentIndicator.vue'
+export { default as ErrorInformationCard } from './base/ErrorInformationCard.vue'
 export { default as FileInput } from './base/FileInput.vue'
 export { default as FilterBar } from './base/FilterBar.vue'
 export type { FilterBarOption } from './base/FilterBar.vue'
@@ -96,6 +97,8 @@ export { default as SearchSidebarFilter } from './search/SearchSidebarFilter.vue
 
 // Billing
 export { default as PurchaseModal } from './billing/PurchaseModal.vue'
+export { default as AddPaymentMethodModal } from './billing/AddPaymentMethodModal.vue'
+export { default as ModrinthServersPurchaseModal } from './billing/ModrinthServersPurchaseModal.vue'
 
 // Version
 export { default as VersionChannelIndicator } from './version/VersionChannelIndicator.vue'
@@ -107,3 +110,4 @@ export { default as ThemeSelector } from './settings/ThemeSelector.vue'
 
 // Servers
 export { default as BackupWarning } from './servers/backups/BackupWarning.vue'
+export { default as ServersSpecs } from './billing/ServersSpecs.vue'
diff --git a/packages/ui/src/components/modal/ModalLoadingIndicator.vue b/packages/ui/src/components/modal/ModalLoadingIndicator.vue
new file mode 100644
index 000000000..8815d74d8
--- /dev/null
+++ b/packages/ui/src/components/modal/ModalLoadingIndicator.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import { SpinnerIcon, XCircleIcon } from '@modrinth/assets'
+
+withDefaults(
+  defineProps<{
+    error?: boolean
+  }>(),
+  {
+    error: false,
+  },
+)
+</script>
+<template>
+  <div class="flex items-center gap-2 font-semibold" :class="error ? 'text-red' : 'animate-pulse'">
+    <XCircleIcon v-if="error" class="w-6 h-6" />
+    <SpinnerIcon v-else class="w-6 h-6 animate-spin" />
+    <slot v-if="error" name="error" />
+    <slot v-else />
+  </div>
+</template>
+<style scoped>
+.animate-pulse {
+  animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+}
+
+@keyframes pulse {
+  0%,
+  100% {
+    scale: 1;
+  }
+  50% {
+    scale: 0.95;
+  }
+}
+</style>
diff --git a/packages/ui/src/composables/stripe.ts b/packages/ui/src/composables/stripe.ts
new file mode 100644
index 000000000..02b6d2f1e
--- /dev/null
+++ b/packages/ui/src/composables/stripe.ts
@@ -0,0 +1,403 @@
+import type Stripe from 'stripe'
+import { type Stripe as StripeJs, loadStripe, type StripeElements } from '@stripe/stripe-js'
+import { computed, ref, type Ref } from 'vue'
+import type { ContactOption } from '@stripe/stripe-js/dist/stripe-js/elements/address'
+import type {
+  ServerPlan,
+  BasePaymentIntentResponse,
+  ChargeRequestType,
+  CreatePaymentIntentRequest,
+  CreatePaymentIntentResponse,
+  PaymentRequestType,
+  ServerBillingInterval,
+  UpdatePaymentIntentRequest,
+  UpdatePaymentIntentResponse,
+} from '../utils/billing.ts'
+
+// export type CreateElements = (
+//   paymentMethods: Stripe.PaymentMethod[],
+//   options: StripeElementsOptionsMode,
+// ) => {
+//   elements: StripeElements
+//   paymentElement: StripePaymentElement
+//   addressElement: StripeAddressElement
+// }
+
+export const useStripe = (
+  publishableKey: string,
+  customer: Stripe.Customer,
+  paymentMethods: Stripe.PaymentMethod[],
+  currency: string,
+  product: Ref<ServerPlan | undefined>,
+  interval: Ref<ServerBillingInterval>,
+  region: Ref<string | undefined>,
+  initiatePayment: (
+    body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
+  ) => Promise<CreatePaymentIntentResponse | UpdatePaymentIntentResponse>,
+  onError: (err: Error) => void,
+) => {
+  const stripe = ref<StripeJs | null>(null)
+
+  let elements: StripeElements | undefined = undefined
+  const elementsLoaded = ref<0 | 1 | 2>(0)
+  const loadingElementsFailed = ref<boolean>(false)
+
+  const paymentMethodLoading = ref(false)
+  const loadingFailed = ref<string>()
+  const paymentIntentId = ref<string>()
+  const tax = ref<number>()
+  const total = ref<number>()
+  const confirmationToken = ref<string>()
+  const submittingPayment = ref(false)
+  const selectedPaymentMethod = ref<Stripe.PaymentMethod>()
+  const inputtedPaymentMethod = ref<Stripe.PaymentMethod>()
+  const clientSecret = ref<string>()
+  const completingPurchase = ref<boolean>(false)
+
+  async function initialize() {
+    stripe.value = await loadStripe(publishableKey)
+  }
+
+  function createIntent(body: CreatePaymentIntentRequest): Promise<CreatePaymentIntentResponse> {
+    return initiatePayment(body) as Promise<CreatePaymentIntentResponse>
+  }
+
+  function updateIntent(body: UpdatePaymentIntentRequest): Promise<UpdatePaymentIntentResponse> {
+    return initiatePayment(body) as Promise<UpdatePaymentIntentResponse>
+  }
+
+  const planPrices = computed(() => {
+    return product.value?.prices.find((x) => x.currency_code === currency)
+  })
+
+  const createElements = (options) => {
+    const styles = getComputedStyle(document.body)
+
+    if (!stripe.value) {
+      throw new Error('Stripe API not yet loaded')
+    }
+
+    elements = stripe.value.elements({
+      appearance: {
+        variables: {
+          colorPrimary: styles.getPropertyValue('--color-brand'),
+          colorBackground: styles.getPropertyValue('--experimental-color-button-bg'),
+          colorText: styles.getPropertyValue('--color-base'),
+          colorTextPlaceholder: styles.getPropertyValue('--color-secondary'),
+          colorDanger: styles.getPropertyValue('--color-red'),
+          fontFamily: styles.getPropertyValue('--font-standard'),
+          spacingUnit: '0.25rem',
+          borderRadius: '0.75rem',
+        },
+      },
+      loader: 'never',
+      ...options,
+    })
+
+    const paymentElement = elements.create('payment', {
+      layout: {
+        type: 'tabs',
+        defaultCollapsed: false,
+      },
+    })
+    paymentElement.mount('#payment-element')
+
+    const contacts: ContactOption[] = []
+
+    paymentMethods.forEach((method) => {
+      const addr = method.billing_details?.address
+      if (
+        addr &&
+        addr.line1 &&
+        addr.city &&
+        addr.postal_code &&
+        addr.country &&
+        addr.state &&
+        method.billing_details.name
+      ) {
+        contacts.push({
+          address: {
+            line1: addr.line1,
+            line2: addr.line2 ?? undefined,
+            city: addr.city,
+            state: addr.state,
+            postal_code: addr.postal_code,
+            country: addr.country,
+          },
+          name: method.billing_details.name,
+        })
+      }
+    })
+
+    const addressElement = elements.create('address', {
+      mode: 'billing',
+      contacts: contacts.length > 0 ? contacts : undefined,
+    })
+    addressElement.mount('#address-element')
+
+    return { elements, paymentElement, addressElement }
+  }
+
+  const primaryPaymentMethodId = computed<string | null>(() => {
+    if (customer && customer.invoice_settings && customer.invoice_settings.default_payment_method) {
+      const method = customer.invoice_settings.default_payment_method
+      if (typeof method === 'string') {
+        return method
+      } else {
+        return method.id
+      }
+    } else if (paymentMethods && paymentMethods[0] && paymentMethods[0].id) {
+      return paymentMethods[0].id
+    } else {
+      return null
+    }
+  })
+
+  const loadStripeElements = async () => {
+    loadingFailed.value = undefined
+    try {
+      if (!customer && primaryPaymentMethodId.value) {
+        paymentMethodLoading.value = true
+        await refreshPaymentIntent(primaryPaymentMethodId.value, false)
+        paymentMethodLoading.value = false
+      }
+
+      if (!selectedPaymentMethod.value) {
+        elementsLoaded.value = 0
+
+        const {
+          elements: newElements,
+          addressElement,
+          paymentElement,
+        } = createElements({
+          mode: 'payment',
+          currency: currency.toLowerCase(),
+          amount: product.value?.prices.find((x) => x.currency_code === currency)?.prices.intervals[
+            interval.value
+          ],
+          paymentMethodCreation: 'manual',
+          setupFutureUsage: 'off_session',
+        })
+
+        elements = newElements
+        paymentElement.on('ready', () => {
+          elementsLoaded.value += 1
+        })
+        addressElement.on('ready', () => {
+          elementsLoaded.value += 1
+        })
+      }
+    } catch (err) {
+      loadingFailed.value = String(err)
+      console.log(err)
+    }
+  }
+
+  async function refreshPaymentIntent(id: string, confirmation: boolean) {
+    try {
+      paymentMethodLoading.value = true
+      if (!confirmation) {
+        selectedPaymentMethod.value = paymentMethods.find((x) => x.id === id)
+      }
+
+      const requestType: PaymentRequestType = confirmation
+        ? {
+            type: 'confirmation_token',
+            token: id,
+          }
+        : {
+            type: 'payment_method',
+            id: id,
+          }
+
+      if (!product.value) {
+        return handlePaymentError('No product selected')
+      }
+
+      const charge: ChargeRequestType = {
+        type: 'new',
+        product_id: product.value?.id,
+        interval: interval.value,
+      }
+
+      let result: BasePaymentIntentResponse
+
+      if (paymentIntentId.value) {
+        result = await updateIntent({
+          ...requestType,
+          charge,
+          existing_payment_intent: paymentIntentId.value,
+          metadata: {
+            type: 'pyro',
+            server_region: region.value,
+            source: {},
+          },
+        })
+        console.log(`Updated payment intent: ${interval.value} for ${result.total}`)
+      } else {
+        ;({
+          payment_intent_id: paymentIntentId.value,
+          client_secret: clientSecret.value,
+          ...result
+        } = await createIntent({
+          ...requestType,
+          charge,
+          metadata: {
+            type: 'pyro',
+            server_region: region.value,
+            source: {},
+          },
+        }))
+        console.log(`Created payment intent: ${interval.value} for ${result.total}`)
+      }
+
+      tax.value = result.tax
+      total.value = result.total
+
+      if (confirmation) {
+        confirmationToken.value = id
+        if (result.payment_method) {
+          inputtedPaymentMethod.value = result.payment_method
+        }
+      }
+    } catch (err) {
+      handlePaymentError(err as string)
+    }
+    paymentMethodLoading.value = false
+  }
+
+  async function createConfirmationToken() {
+    if (!elements) {
+      return handlePaymentError('No elements')
+    }
+    if (!stripe.value) {
+      return handlePaymentError('No stripe')
+    }
+
+    const { error, confirmationToken: confirmation } = await stripe.value.createConfirmationToken({
+      elements,
+    })
+
+    if (error) {
+      handlePaymentError(error.message ?? 'Unknown error creating confirmation token')
+      return
+    }
+
+    return confirmation.id
+  }
+
+  function handlePaymentError(err: string | Error) {
+    paymentMethodLoading.value = false
+    completingPurchase.value = false
+    onError(typeof err === 'string' ? new Error(err) : err)
+  }
+
+  async function createNewPaymentMethod() {
+    paymentMethodLoading.value = true
+
+    if (!elements) {
+      return handlePaymentError('No elements')
+    }
+
+    const { error: submitError } = await elements.submit()
+
+    if (submitError) {
+      return handlePaymentError(submitError.message ?? 'Unknown error creating payment method')
+    }
+
+    const token = await createConfirmationToken()
+    if (!token) {
+      return handlePaymentError('Failed to create confirmation token')
+    }
+    await refreshPaymentIntent(token, true)
+
+    if (!planPrices.value) {
+      return handlePaymentError('No plan prices')
+    }
+    if (!total.value) {
+      return handlePaymentError('No total amount')
+    }
+
+    elements.update({ currency: planPrices.value.currency_code.toLowerCase(), amount: total.value })
+
+    elementsLoaded.value = 0
+    confirmationToken.value = token
+    paymentMethodLoading.value = false
+
+    return token
+  }
+
+  async function selectPaymentMethod(paymentMethod: Stripe.PaymentMethod | undefined) {
+    selectedPaymentMethod.value = paymentMethod
+    if (paymentMethod === undefined) {
+      await loadStripeElements()
+    } else {
+      refreshPaymentIntent(paymentMethod.id, false)
+    }
+  }
+
+  const loadingElements = computed(() => elementsLoaded.value < 2)
+
+  async function submitPayment(returnUrl: string) {
+    completingPurchase.value = true
+    const secert = clientSecret.value
+
+    if (!secert) {
+      return handlePaymentError('No client secret')
+    }
+
+    if (!stripe.value) {
+      return handlePaymentError('No stripe')
+    }
+
+    submittingPayment.value = true
+    const { error } = await stripe.value.confirmPayment({
+      clientSecret: secert,
+      confirmParams: {
+        confirmation_token: confirmationToken.value,
+        return_url: `${returnUrl}?priceId=${product.value?.prices.find((x) => x.currency_code === currency)?.id}&plan=${interval.value}`,
+      },
+    })
+
+    if (error) {
+      handlePaymentError(error.message ?? 'Unknown error submitting payment')
+      return false
+    }
+    submittingPayment.value = false
+    completingPurchase.value = false
+    return true
+  }
+
+  async function reloadPaymentIntent() {
+    console.log('selected:', selectedPaymentMethod.value)
+    console.log('token:', confirmationToken.value)
+    if (selectedPaymentMethod.value) {
+      await refreshPaymentIntent(selectedPaymentMethod.value.id, false)
+    } else if (confirmationToken.value) {
+      await refreshPaymentIntent(confirmationToken.value, true)
+    } else {
+      throw new Error('No payment method selected')
+    }
+  }
+
+  const hasPaymentMethod = computed(() => selectedPaymentMethod.value || confirmationToken.value)
+
+  return {
+    initializeStripe: initialize,
+    selectPaymentMethod,
+    reloadPaymentIntent,
+    primaryPaymentMethodId,
+    selectedPaymentMethod,
+    inputtedPaymentMethod,
+    hasPaymentMethod,
+    createNewPaymentMethod,
+    loadingElements,
+    loadingElementsFailed,
+    paymentMethodLoading,
+    loadStripeElements,
+    tax,
+    total,
+    submitPayment,
+    completingPurchase,
+  }
+}
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 44ba1c6e7..e60885082 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -1,4 +1,7 @@
 {
+  "button.back": {
+    "defaultMessage": "Back"
+  },
   "button.cancel": {
     "defaultMessage": "Cancel"
   },
@@ -23,6 +26,9 @@
   "button.edit": {
     "defaultMessage": "Edit"
   },
+  "button.next": {
+    "defaultMessage": "Next"
+  },
   "button.open-folder": {
     "defaultMessage": "Open folder"
   },
@@ -173,6 +179,12 @@
   "label.visit-your-profile": {
     "defaultMessage": "Visit your profile"
   },
+  "modal.add-payment-method.action": {
+    "defaultMessage": "Add payment method"
+  },
+  "modal.add-payment-method.title": {
+    "defaultMessage": "Adding a payment method"
+  },
   "notification.error.title": {
     "defaultMessage": "An error occurred"
   },
@@ -485,6 +497,36 @@
   "servers.notice.undismissable": {
     "defaultMessage": "Undismissable"
   },
+  "servers.purchase.step.payment.description": {
+    "defaultMessage": "You won't be charged yet."
+  },
+  "servers.purchase.step.payment.prompt": {
+    "defaultMessage": "Select a payment method"
+  },
+  "servers.purchase.step.payment.title": {
+    "defaultMessage": "Payment method"
+  },
+  "servers.purchase.step.region.title": {
+    "defaultMessage": "Region"
+  },
+  "servers.purchase.step.review.title": {
+    "defaultMessage": "Review"
+  },
+  "servers.region.custom.prompt": {
+    "defaultMessage": "How much RAM do you want your server to have?"
+  },
+  "servers.region.europe": {
+    "defaultMessage": "Europe"
+  },
+  "servers.region.north-america": {
+    "defaultMessage": "North America"
+  },
+  "servers.region.prompt": {
+    "defaultMessage": "Where would you like your server to be located?"
+  },
+  "servers.region.region-unsupported": {
+    "defaultMessage": "Region not listed? <link>Let us know where you'd like to see Modrinth Servers next!</link>"
+  },
   "settings.account.title": {
     "defaultMessage": "Account and security"
   },
diff --git a/packages/ui/src/utils/billing.ts b/packages/ui/src/utils/billing.ts
new file mode 100644
index 000000000..da2c7c0c6
--- /dev/null
+++ b/packages/ui/src/utils/billing.ts
@@ -0,0 +1,102 @@
+import type Stripe from 'stripe'
+
+export type ServerBillingInterval = 'monthly' | 'yearly' | 'quarterly'
+
+export interface ServerPlan {
+  id: string
+  name: string
+  description: string
+  metadata: {
+    type: string
+    ram?: number
+    cpu?: number
+    storage?: number
+    swap?: number
+  }
+  prices: {
+    id: string
+    currency_code: string
+    prices: {
+      intervals: {
+        monthly: number
+        yearly: number
+      }
+    }
+  }[]
+}
+
+export interface ServerStockRequest {
+  cpu?: number
+  memory_mb?: number
+  swap_mb?: number
+  storage_mb?: number
+}
+
+export interface ServerRegion {
+  shortcode: string
+  country_code: string
+  display_name: string
+  lat: number
+  lon: number
+}
+
+/*
+  Request types
+*/
+export type PaymentMethodRequest = {
+  type: 'payment_method'
+  id: string
+}
+
+export type ConfirmationTokenRequest = {
+  type: 'confirmation_token'
+  token: string
+}
+
+export type PaymentRequestType = PaymentMethodRequest | ConfirmationTokenRequest
+
+export type ChargeRequestType =
+  | {
+      type: 'existing'
+      id: string
+    }
+  | {
+      type: 'new'
+      product_id: string
+      interval?: ServerBillingInterval
+    }
+
+export type CreatePaymentIntentRequest = PaymentRequestType & {
+  charge: ChargeRequestType
+  metadata?: {
+    type: 'pyro'
+    server_name?: string
+    server_region?: string
+    source: {
+      loader?: string
+      game_version?: string
+      loader_version?: string
+    }
+  }
+}
+
+export type UpdatePaymentIntentRequest = CreatePaymentIntentRequest & {
+  existing_payment_intent: string
+}
+
+/*
+  Response types
+*/
+export type BasePaymentIntentResponse = {
+  price_id: string
+  tax: number
+  total: number
+  payment_method: Stripe.PaymentMethod
+}
+
+export type UpdatePaymentIntentResponse = BasePaymentIntentResponse
+
+export type CreatePaymentIntentResponse = BasePaymentIntentResponse & {
+  payment_intent_id: string
+  client_secret: string
+}
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index d878f11d4..424d33cad 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -17,6 +17,14 @@ export const commonMessages = defineMessages({
     id: 'button.continue',
     defaultMessage: 'Continue',
   },
+  nextButton: {
+    id: 'button.next',
+    defaultMessage: 'Next',
+  },
+  backButton: {
+    id: 'button.back',
+    defaultMessage: 'Back',
+  },
   copyIdButton: {
     id: 'button.copy-id',
     defaultMessage: 'Copy ID',
@@ -205,6 +213,10 @@ export const commonMessages = defineMessages({
     id: 'label.visit-your-profile',
     defaultMessage: 'Visit your profile',
   },
+  paymentMethodCardDisplay: {
+    id: 'omorphia.component.purchase_modal.payment_method_card_display',
+    defaultMessage: '{card_brand} ending in {last_four}',
+  },
 })
 
 export const commonSettingsMessages = defineMessages({
@@ -245,3 +257,51 @@ export const commonSettingsMessages = defineMessages({
     defaultMessage: 'Billing and subscriptions',
   },
 })
+
+export const paymentMethodMessages = defineMessages({
+  visa: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.visa',
+    defaultMessage: 'Visa',
+  },
+  amex: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.amex',
+    defaultMessage: 'American Express',
+  },
+  diners: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.diners',
+    defaultMessage: 'Diners Club',
+  },
+  discover: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.discover',
+    defaultMessage: 'Discover',
+  },
+  eftpos: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.eftpos',
+    defaultMessage: 'EFTPOS',
+  },
+  jcb: { id: 'omorphia.component.purchase_modal.payment_method_type.jcb', defaultMessage: 'JCB' },
+  mastercard: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.mastercard',
+    defaultMessage: 'MasterCard',
+  },
+  unionpay: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.unionpay',
+    defaultMessage: 'UnionPay',
+  },
+  paypal: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.paypal',
+    defaultMessage: 'PayPal',
+  },
+  cashapp: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.cashapp',
+    defaultMessage: 'Cash App',
+  },
+  amazon_pay: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.amazon_pay',
+    defaultMessage: 'Amazon Pay',
+  },
+  unknown: {
+    id: 'omorphia.component.purchase_modal.payment_method_type.unknown',
+    defaultMessage: 'Unknown payment method',
+  },
+})
diff --git a/packages/ui/src/utils/notices.ts b/packages/ui/src/utils/notices.ts
index 9c67c69fb..4871ee2e1 100644
--- a/packages/ui/src/utils/notices.ts
+++ b/packages/ui/src/utils/notices.ts
@@ -46,7 +46,7 @@ export const NOTICE_LEVELS: Record<
   },
 }
 
-const DISMISSABLE = {
+export const DISMISSABLE = {
   name: defineMessage({
     id: 'servers.notice.dismissable',
     defaultMessage: 'Dismissable',
@@ -57,7 +57,7 @@ const DISMISSABLE = {
   },
 }
 
-const UNDISMISSABLE = {
+export const UNDISMISSABLE = {
   name: defineMessage({
     id: 'servers.notice.undismissable',
     defaultMessage: 'Undismissable',
diff --git a/packages/ui/src/utils/regions.ts b/packages/ui/src/utils/regions.ts
new file mode 100644
index 000000000..5167a2911
--- /dev/null
+++ b/packages/ui/src/utils/regions.ts
@@ -0,0 +1,16 @@
+import { defineMessage, type MessageDescriptor } from '@vintl/vintl'
+
+export const regionOverrides = {
+  'us-vin': {
+    name: defineMessage({ id: 'servers.region.north-america', defaultMessage: 'North America' }),
+    flag: 'https://flagcdn.com/us.svg',
+  },
+  'eu-lim': {
+    name: defineMessage({ id: 'servers.region.europe', defaultMessage: 'Europe' }),
+    flag: 'https://flagcdn.com/eu.svg',
+  },
+  'de-fra': {
+    name: defineMessage({ id: 'servers.region.europe', defaultMessage: 'Europe' }),
+    flag: 'https://flagcdn.com/eu.svg',
+  },
+} satisfies Record<string, { name?: MessageDescriptor; flag?: string }>
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index a5d165a01..3c7340846 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -5,5 +5,6 @@
   "compilerOptions": {
     "lib": ["esnext", "dom"],
     "noImplicitAny": false
-  }
+  },
+  "types": ["@stripe/stripe-js"]
 }
diff --git a/packages/utils/billing.ts b/packages/utils/billing.ts
index 7e27099c2..a24e51ad9 100644
--- a/packages/utils/billing.ts
+++ b/packages/utils/billing.ts
@@ -61,23 +61,33 @@ export const getCurrency = (userCountry) => {
   return countryCurrency[userCountry] ?? 'USD'
 }
 
-export const formatPrice = (locale, price, currency) => {
-  const formatter = new Intl.NumberFormat(locale, {
+export const formatPrice = (locale, price, currency, trimZeros = false) => {
+  let formatter = new Intl.NumberFormat(locale, {
     style: 'currency',
     currency,
   })
 
   const maxDigits = formatter.resolvedOptions().maximumFractionDigits
-
   const convertedPrice = price / Math.pow(10, maxDigits)
 
+  let minimumFractionDigits = maxDigits
+
+  if (trimZeros && Number.isInteger(convertedPrice)) {
+    minimumFractionDigits = 0
+  }
+
+  formatter = new Intl.NumberFormat(locale, {
+    style: 'currency',
+    currency,
+    minimumFractionDigits,
+  })
   return formatter.format(convertedPrice)
 }
 
-export const calculateSavings = (monthlyPlan, annualPlan) => {
-  const monthlyAnnualized = monthlyPlan * 12
+export const calculateSavings = (monthlyPlan, plan, months = 12) => {
+  const monthlyAnnualized = monthlyPlan * months
 
-  return Math.floor(((monthlyAnnualized - annualPlan) / monthlyAnnualized) * 100)
+  return Math.floor(((monthlyAnnualized - plan) / monthlyAnnualized) * 100)
 }
 
 export const createStripeElements = (stripe, paymentMethods, options) => {
@@ -87,13 +97,13 @@ export const createStripeElements = (stripe, paymentMethods, options) => {
     appearance: {
       variables: {
         colorPrimary: styles.getPropertyValue('--color-brand'),
-        colorBackground: styles.getPropertyValue('--color-bg'),
+        colorBackground: styles.getPropertyValue('--experimental-color-button-bg'),
         colorText: styles.getPropertyValue('--color-base'),
         colorTextPlaceholder: styles.getPropertyValue('--color-secondary'),
         colorDanger: styles.getPropertyValue('--color-red'),
         fontFamily: styles.getPropertyValue('--font-standard'),
         spacingUnit: '0.25rem',
-        borderRadius: '1rem',
+        borderRadius: '0.75rem',
       },
     },
     loader: 'never',
diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index edcca4c6d..b0bde3b77 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,58 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-06-16T11:00:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Rolled out hotfixes with the previous days' updates.
+- Failed subscriptions can now be cancelled.`,
+  },
+  {
+    date: `2025-06-16T11:00:00-07:00`,
+    product: 'servers',
+    body: `### Improvements
+- Improved error handling.
+- Rolled out hotfixes with the previous days' updates.'`,
+  },
+  {
+    date: `2025-06-15T16:25:00-07:00`,
+    product: 'servers',
+    body: `### Improvements
+- Fixed installing modpacks from search.
+- Fixed setting subdomains.`,
+  },
+  {
+    date: `2025-06-15T14:30:00-07:00`,
+    product: 'servers',
+    body: `### Improvements
+- Fixed various issues with the panel loading improperly in certain cases.
+- Fixed CPU icon being smaller than the rest.
+- Server panel performance should be a little faster now.`,
+  },
+  {
+    date: `2025-06-15T14:30:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Creator analytics charts will now show up to 15 projects in a tooltip instead of 5.
+- Made certain scrollable containers not have a fixed height, and allow them to be smaller if they have fewer items. (Contributed by [Erb3](https://github.com/modrinth/code/pull/2898))
+- Made organizations sort consistently alphabetically. (Contributed by [WorldWidePixel](https://github.com/modrinth/code/pull/3755))
+- Clarified the 'File too large' error message when uploading an image larger than 1MiB in the text editor. (Contributed by [IThundxr](https://github.com/modrinth/code/pull/3774))`,
+  },
+  {
+    date: `2025-06-03T14:35:00-07:00`,
+    product: 'servers',
+    body: `### Added
+- Added support for servers in Europe.
+- Added server setup for new servers upon opening the panel for the first time.`,
+  },
+  {
+    date: `2025-06-03T14:35:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Overhauled Modrinth Servers purchase flow.
+- Added the ability to donate creator rewards to charity.`,
+  },
   {
     date: `2025-05-08T09:00:00-07:00`,
     product: 'servers',
diff --git a/packages/utils/index.ts b/packages/utils/index.ts
index 8cac23953..dc3e767c9 100644
--- a/packages/utils/index.ts
+++ b/packages/utils/index.ts
@@ -7,3 +7,4 @@ export * from './projects'
 export * from './types'
 export * from './users'
 export * from './utils'
+export * from './servers'
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 8a4141b05..5e6d89c54 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -23,6 +23,7 @@
     "dayjs": "^1.11.10",
     "highlight.js": "^11.9.0",
     "markdown-it": "^14.1.0",
+    "ofetch": "^1.3.4",
     "xss": "^1.0.14"
   }
 }
diff --git a/packages/utils/servers/errors/index.ts b/packages/utils/servers/errors/index.ts
new file mode 100644
index 000000000..48f33c65f
--- /dev/null
+++ b/packages/utils/servers/errors/index.ts
@@ -0,0 +1,3 @@
+export * from './modrinth-servers-multi-error'
+export * from './modrinth-servers-fetch-error'
+export * from './modrinth-server-error'
diff --git a/packages/utils/servers/errors/modrinth-server-error.ts b/packages/utils/servers/errors/modrinth-server-error.ts
new file mode 100644
index 000000000..c0a548a77
--- /dev/null
+++ b/packages/utils/servers/errors/modrinth-server-error.ts
@@ -0,0 +1,59 @@
+import { FetchError } from 'ofetch'
+import { V1ErrorInfo } from '../types'
+
+export class ModrinthServerError extends Error {
+  constructor(
+    message: string,
+    public readonly statusCode?: number,
+    public readonly originalError?: Error,
+    public readonly module?: string,
+    public readonly v1Error?: V1ErrorInfo,
+  ) {
+    let errorMessage = message
+    let method = 'GET'
+    let path = ''
+
+    if (originalError instanceof FetchError) {
+      const matches = message.match(/\[([A-Z]+)\]\s+"([^"]+)":/)
+      if (matches) {
+        method = matches[1]
+        path = matches[2].replace(/https?:\/\/[^/]+\/[^/]+\/v\d+\//, '')
+      }
+
+      const statusMessage = (() => {
+        if (!statusCode) return 'Unknown Error'
+        switch (statusCode) {
+          case 400:
+            return 'Bad Request'
+          case 401:
+            return 'Unauthorized'
+          case 403:
+            return 'Forbidden'
+          case 404:
+            return 'Not Found'
+          case 408:
+            return 'Request Timeout'
+          case 429:
+            return 'Too Many Requests'
+          case 500:
+            return 'Internal Server Error'
+          case 502:
+            return 'Bad Gateway'
+          case 503:
+            return 'Service Unavailable'
+          case 504:
+            return 'Gateway Timeout'
+          default:
+            return `HTTP ${statusCode}`
+        }
+      })()
+
+      errorMessage = `[${method}] ${statusMessage} (${statusCode}) while fetching ${path}${module ? ` in ${module}` : ''}`
+    } else {
+      errorMessage = `${message}${statusCode ? ` (${statusCode})` : ''}${module ? ` in ${module}` : ''}`
+    }
+
+    super(errorMessage)
+    this.name = 'ModrinthServersFetchError'
+  }
+}
diff --git a/packages/utils/servers/errors/modrinth-servers-fetch-error.ts b/packages/utils/servers/errors/modrinth-servers-fetch-error.ts
new file mode 100644
index 000000000..a2df7baa3
--- /dev/null
+++ b/packages/utils/servers/errors/modrinth-servers-fetch-error.ts
@@ -0,0 +1,10 @@
+export class ModrinthServersFetchError extends Error {
+  constructor(
+    message: string,
+    public statusCode?: number,
+    public originalError?: Error,
+  ) {
+    super(message)
+    this.name = 'ModrinthFetchError'
+  }
+}
diff --git a/packages/utils/servers/errors/modrinth-servers-multi-error.ts b/packages/utils/servers/errors/modrinth-servers-multi-error.ts
new file mode 100644
index 000000000..f9cfb1d60
--- /dev/null
+++ b/packages/utils/servers/errors/modrinth-servers-multi-error.ts
@@ -0,0 +1,27 @@
+export class ModrinthServersMultiError extends Error {
+  public readonly errors: Map<string, Error> = new Map()
+  public readonly timestamp: number = Date.now()
+
+  constructor(message?: string) {
+    super(message || 'Multiple errors occurred')
+    this.name = 'MultipleErrors'
+  }
+
+  addError(module: string, error: Error) {
+    this.errors.set(module, error)
+    this.message = this.buildErrorMessage()
+  }
+
+  hasErrors() {
+    return this.errors.size > 0
+  }
+
+  private buildErrorMessage(): string {
+    return (
+      Array.from(this.errors.entries())
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        .map(([_module, error]) => error.message)
+        .join('\n')
+    )
+  }
+}
diff --git a/packages/utils/servers/index.ts b/packages/utils/servers/index.ts
new file mode 100644
index 000000000..979493029
--- /dev/null
+++ b/packages/utils/servers/index.ts
@@ -0,0 +1,2 @@
+export * from './errors'
+export * from './types'
diff --git a/packages/utils/servers/types/api.ts b/packages/utils/servers/types/api.ts
new file mode 100644
index 000000000..a9ba86f10
--- /dev/null
+++ b/packages/utils/servers/types/api.ts
@@ -0,0 +1,19 @@
+import { ModrinthServerError } from '../errors'
+
+export interface V1ErrorInfo {
+  context?: string
+  error: string
+  description: string
+}
+
+export interface JWTAuth {
+  url: string
+  token: string
+}
+
+export interface ModuleError {
+  error: ModrinthServerError
+  timestamp: number
+}
+
+export type ModuleName = 'general' | 'content' | 'backups' | 'network' | 'startup' | 'ws' | 'fs'
diff --git a/packages/utils/servers/types/backup.ts b/packages/utils/servers/types/backup.ts
new file mode 100644
index 000000000..485880bfa
--- /dev/null
+++ b/packages/utils/servers/types/backup.ts
@@ -0,0 +1,28 @@
+import type { WSBackupTask, WSBackupState } from './websocket'
+
+export interface Backup {
+  id: string
+  name: string
+  created_at: string
+  locked: boolean
+  automated: boolean
+  interrupted: boolean
+  ongoing: boolean
+  task: {
+    [K in WSBackupTask]?: {
+      progress: number
+      state: WSBackupState
+    }
+  }
+}
+
+export interface AutoBackupSettings {
+  enabled: boolean
+  interval: number
+}
+
+export interface ServerBackup {
+  id: string
+  name: string
+  created_at: string
+}
diff --git a/packages/utils/servers/types/common.ts b/packages/utils/servers/types/common.ts
new file mode 100644
index 000000000..deae3b138
--- /dev/null
+++ b/packages/utils/servers/types/common.ts
@@ -0,0 +1,59 @@
+import type { Project } from '../../types'
+import { Allocation } from './server'
+import { ServerBackup } from './backup'
+import { Mod } from './content'
+
+export type ServerNotice = {
+  id: number
+  message: string
+  title?: string
+  level: 'info' | 'warn' | 'critical' | 'survey'
+  dismissable: boolean
+  announce_at: string
+  expires: string
+  assigned: {
+    kind: 'server' | 'node'
+    id: string
+    name: string
+  }[]
+  dismissed_by: {
+    server: string
+    dismissed_on: string
+  }[]
+}
+
+export interface Server {
+  server_id: string
+  name: string
+  status: string
+  net: {
+    ip: string
+    port: number
+    domain: string
+    allocations: Allocation[]
+  }
+  game: string
+  loader: string | null
+  loader_version: string | null
+  mc_version: string | null
+  backup_quota: number
+  used_backup_quota: number
+  backups: ServerBackup[]
+  mods: Mod[]
+  project: Project | null
+  suspension_reason: string | null
+  image: string | null
+  upstream?: {
+    kind: 'modpack'
+    project_id: string
+    version_id: string
+  }
+  motd: string
+  flows: {
+    intro?: boolean
+  }
+}
+
+export interface Servers {
+  servers: Server[]
+}
diff --git a/packages/utils/servers/types/content.ts b/packages/utils/servers/types/content.ts
new file mode 100644
index 000000000..322de1dc4
--- /dev/null
+++ b/packages/utils/servers/types/content.ts
@@ -0,0 +1,13 @@
+export interface Mod {
+  filename: string
+  project_id: string | undefined
+  version_id: string | undefined
+  name: string | undefined
+  version_number: string | undefined
+  icon_url: string | undefined
+  owner: string | undefined
+  disabled: boolean
+  installing: boolean
+}
+
+export type ContentType = 'mod' | 'plugin'
diff --git a/packages/utils/servers/types/filesystem.ts b/packages/utils/servers/types/filesystem.ts
new file mode 100644
index 000000000..624ade6dd
--- /dev/null
+++ b/packages/utils/servers/types/filesystem.ts
@@ -0,0 +1,33 @@
+import type { FSQueuedOp, FilesystemOp } from './websocket'
+import { JWTAuth } from './api'
+
+export interface DirectoryItem {
+  name: string
+  type: 'directory' | 'file'
+  count?: number
+  modified: number
+  created: number
+  path: string
+}
+
+export interface FileUploadQuery {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  promise: Promise<any>
+  onProgress: (
+    callback: (progress: { loaded: number; total: number; progress: number }) => void,
+  ) => void
+  cancel: () => void
+}
+
+export interface DirectoryResponse {
+  items: DirectoryItem[]
+  total: number
+  current?: number
+}
+
+export interface FSModule {
+  auth: JWTAuth
+  ops: FilesystemOp[]
+  queuedOps: FSQueuedOp[]
+  opsQueuedForModification: string[]
+}
diff --git a/packages/utils/servers/types/index.ts b/packages/utils/servers/types/index.ts
new file mode 100644
index 000000000..30b251a42
--- /dev/null
+++ b/packages/utils/servers/types/index.ts
@@ -0,0 +1,8 @@
+export * from './api'
+export * from './content'
+export * from './server'
+export * from './backup'
+export * from './filesystem'
+export * from './websocket'
+export * from './stats'
+export * from './common'
diff --git a/packages/utils/servers/types/server.ts b/packages/utils/servers/types/server.ts
new file mode 100644
index 000000000..8d8eba0af
--- /dev/null
+++ b/packages/utils/servers/types/server.ts
@@ -0,0 +1,76 @@
+import type { Project } from '../../types'
+import type { ServerNotice } from './common'
+
+export interface ServerGeneral {
+  server_id: string
+  name: string
+  net: {
+    ip: string
+    port: number
+    domain: string
+  }
+  game: string
+  backup_quota: number
+  used_backup_quota: number
+  status: string
+  suspension_reason: 'moderated' | 'paymentfailed' | 'cancelled' | 'upgrading' | 'other' | string
+  loader: string
+  loader_version: string
+  mc_version: string
+  upstream: {
+    kind: 'modpack' | 'mod' | 'resourcepack'
+    version_id: string
+    project_id: string
+  } | null
+  motd?: string
+  image?: string
+  project?: Project
+  sftp_username: string
+  sftp_password: string
+  sftp_host: string
+  datacenter?: string
+  notices?: ServerNotice[]
+  node: {
+    token: string
+    instance: string
+  }
+  flows?: {
+    intro?: boolean
+  }
+}
+
+export interface Allocation {
+  port: number
+  name: string
+}
+
+export interface Startup {
+  invocation: string
+  original_invocation: string
+  jdk_version: 'lts8' | 'lts11' | 'lts17' | 'lts21'
+  jdk_build: 'corretto' | 'temurin' | 'graal'
+}
+
+export type PowerAction = 'Start' | 'Stop' | 'Restart' | 'Kill'
+export type JDKVersion = 'lts8' | 'lts11' | 'lts17' | 'lts21'
+export type JDKBuild = 'corretto' | 'temurin' | 'graal'
+
+export type Loaders =
+  | 'Fabric'
+  | 'Quilt'
+  | 'Forge'
+  | 'NeoForge'
+  | 'Paper'
+  | 'Spigot'
+  | 'Bukkit'
+  | 'Vanilla'
+  | 'Purpur'
+
+export type ServerState =
+  | 'starting'
+  | 'running'
+  | 'restarting'
+  | 'stopping'
+  | 'stopped'
+  | 'crashed'
+  | 'unknown'
diff --git a/packages/utils/servers/types/stats.ts b/packages/utils/servers/types/stats.ts
new file mode 100644
index 000000000..f2a9c1d1b
--- /dev/null
+++ b/packages/utils/servers/types/stats.ts
@@ -0,0 +1,20 @@
+export interface Stats {
+  current: {
+    cpu_percent: number
+    ram_usage_bytes: number
+    ram_total_bytes: number
+    storage_usage_bytes: number
+    storage_total_bytes: number
+  }
+  past: {
+    cpu_percent: number
+    ram_usage_bytes: number
+    ram_total_bytes: number
+    storage_usage_bytes: number
+    storage_total_bytes: number
+  }
+  graph: {
+    cpu: number[]
+    ram: number[]
+  }
+}
diff --git a/packages/utils/servers/types/websocket.ts b/packages/utils/servers/types/websocket.ts
new file mode 100644
index 000000000..78eea4677
--- /dev/null
+++ b/packages/utils/servers/types/websocket.ts
@@ -0,0 +1,124 @@
+import type { Stats } from './stats'
+import type { ServerState } from './server'
+
+export interface WSAuth {
+  url: string
+  token: string
+}
+
+export interface WSLogEvent {
+  event: 'log'
+  message: string
+}
+
+type CurrentStats = Stats['current']
+
+export interface WSStatsEvent extends CurrentStats {
+  event: 'stats'
+}
+
+export interface WSAuthExpiringEvent {
+  event: 'auth-expiring'
+}
+
+export interface WSPowerStateEvent {
+  event: 'power-state'
+  state: ServerState
+  // if state "crashed"
+  oom_killed?: boolean
+  exit_code?: number
+}
+
+export interface WSAuthIncorrectEvent {
+  event: 'auth-incorrect'
+}
+
+export interface WSInstallationResultOkEvent {
+  event: 'installation-result'
+  result: 'ok'
+}
+
+export interface WSInstallationResultErrEvent {
+  event: 'installation-result'
+  result: 'err'
+  reason: string
+}
+
+export type WSInstallationResultEvent = WSInstallationResultOkEvent | WSInstallationResultErrEvent
+
+export interface WSAuthOkEvent {
+  event: 'auth-ok'
+}
+
+export interface WSUptimeEvent {
+  event: 'uptime'
+  uptime: number // seconds
+}
+
+export interface WSNewModEvent {
+  event: 'new-mod'
+}
+
+export type WSBackupTask = 'file' | 'create' | 'restore'
+export type WSBackupState = 'ongoing' | 'done' | 'failed' | 'cancelled' | 'unchanged'
+
+export interface WSBackupProgressEvent {
+  event: 'backup-progress'
+  task: WSBackupTask
+  id: string
+  progress: number // percentage
+  state: WSBackupState
+  ready: boolean
+}
+
+export type FSQueuedOpUnarchive = {
+  op: 'unarchive'
+  src: string
+}
+
+export type FSQueuedOp = FSQueuedOpUnarchive
+
+export type FSOpUnarchive = {
+  op: 'unarchive'
+  progress: number // Note: 1 does not mean it's done
+  id: string // UUID
+
+  mime: string
+  src: string
+  state:
+    | 'queued'
+    | 'ongoing'
+    | 'cancelled'
+    | 'done'
+    | 'failed-corrupted'
+    | 'failed-invalid-path'
+    | 'failed-cf-no-serverpack'
+    | 'failed-cf-not-available'
+    | 'failed-not-reachable'
+
+  current_file: string | null
+  failed_path?: string
+  bytes_processed: number
+  files_processed: number
+  started: string
+}
+
+export type FilesystemOp = FSOpUnarchive
+
+export interface WSFilesystemOpsEvent {
+  event: 'filesystem-ops'
+  all: FilesystemOp[]
+}
+
+export type WSEvent =
+  | WSLogEvent
+  | WSStatsEvent
+  | WSPowerStateEvent
+  | WSAuthExpiringEvent
+  | WSAuthIncorrectEvent
+  | WSInstallationResultEvent
+  | WSAuthOkEvent
+  | WSUptimeEvent
+  | WSNewModEvent
+  | WSBackupProgressEvent
+  | WSFilesystemOpsEvent
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index 08b7e2712..b5ccbd503 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -294,22 +294,3 @@ export type Report = {
   created: string
   body: string
 }
-
-export type ServerNotice = {
-  id: number
-  message: string
-  title?: string
-  level: 'info' | 'warn' | 'critical' | 'survey'
-  dismissable: boolean
-  announce_at: string
-  expires: string
-  assigned: {
-    kind: 'server' | 'node'
-    id: string
-    name: string
-  }[]
-  dismissed_by: {
-    server: string
-    dismissed_on: string
-  }[]
-}
diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts
index 56f34523a..546358c3f 100644
--- a/packages/utils/utils.ts
+++ b/packages/utils/utils.ts
@@ -177,8 +177,15 @@ export const formatCategory = (name) => {
     return 'Colored Lighting'
   } else if (name === 'optifine') {
     return 'OptiFine'
+  } else if (name === 'bta-babric') {
+    return 'BTA (Babric)'
+  } else if (name === 'legacy-fabric') {
+    return 'Legacy Fabric'
+  } else if (name === 'java-agent') {
+    return 'Java Agent'
+  } else if (name === 'nilloader') {
+    return 'NilLoader'
   }
-
   return capitalizeString(name)
 }
 
@@ -341,3 +348,17 @@ export const getArrayOrString = (x: string[] | string): string[] => {
     return x
   }
 }
+
+export function getPingLevel(ping: number) {
+  if (ping < 120) {
+    return 5
+  } else if (ping < 200) {
+    return 4
+  } else if (ping < 300) {
+    return 3
+  } else if (ping < 400) {
+    return 2
+  } else {
+    return 1
+  }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 36e74b9f5..105e80f5c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,12 +13,15 @@ importers:
 
   .:
     devDependencies:
+      if-ci:
+        specifier: ^3.0.0
+        version: 3.0.0
       prettier:
-        specifier: ^3.4.2
+        specifier: ^3.3.2
         version: 3.4.2
       turbo:
-        specifier: ^2.3.3
-        version: 2.3.3
+        specifier: ^2.5.4
+        version: 2.5.4
       vue:
         specifier: ^3.5.13
         version: 3.5.13(typescript@5.8.2)
@@ -133,8 +136,8 @@ importers:
         specifier: workspace:*
         version: link:../../packages/eslint-config-custom
       eslint-plugin-turbo:
-        specifier: ^2.1.1
-        version: 2.2.0(eslint@9.13.0(jiti@2.4.1))
+        specifier: ^2.5.4
+        version: 2.5.4(eslint@9.13.0(jiti@2.4.1))(turbo@2.5.4)
       postcss:
         specifier: ^8.4.39
         version: 8.4.49
@@ -460,6 +463,9 @@ importers:
       '@formatjs/cli':
         specifier: ^6.2.12
         version: 6.2.12(@vue/compiler-core@3.5.13)(vue@3.5.13(typescript@5.5.4))
+      '@stripe/stripe-js':
+        specifier: ^7.3.1
+        version: 7.3.1
       '@vintl/unplugin':
         specifier: ^1.5.1
         version: 1.5.2(@vue/compiler-core@3.5.13)(rollup@3.29.4)(vite@4.5.3(@types/node@22.13.1)(sass@1.77.6)(terser@5.38.1))(vue@3.5.13(typescript@5.5.4))(webpack@5.92.1)
@@ -472,6 +478,9 @@ importers:
       eslint-config-custom:
         specifier: workspace:*
         version: link:../eslint-config-custom
+      stripe:
+        specifier: ^18.1.1
+        version: 18.2.1(@types/node@22.13.1)
       tsconfig:
         specifier: workspace:*
         version: link:../tsconfig
@@ -514,6 +523,9 @@ importers:
       markdown-it:
         specifier: ^14.1.0
         version: 14.1.0
+      ofetch:
+        specifier: ^1.3.4
+        version: 1.4.1
       xss:
         specifier: ^1.0.14
         version: 1.0.15
@@ -2338,6 +2350,10 @@ packages:
     resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
     engines: {node: '>=18'}
 
+  '@stripe/stripe-js@7.3.1':
+    resolution: {integrity: sha512-pTzb864TQWDRQBPLgSPFRoyjSDUqpCkbEgTzpsjiTjGz1Z5SxZNXJek28w1s6Dyry4CyW4/Izj5jHE/J9hCJYQ==}
+    engines: {node: '>=12.16'}
+
   '@stylistic/eslint-plugin@2.9.0':
     resolution: {integrity: sha512-OrDyFAYjBT61122MIY1a3SfEgy3YCMgt2vL4eoPmvTwDBwyQhAXurxNQznlRD/jESNfYWfID8Ej+31LljvF7Xg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -3331,10 +3347,18 @@ packages:
     resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
     engines: {node: '>=8'}
 
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
   call-bind@1.0.7:
     resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
     engines: {node: '>= 0.4'}
 
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
   call-me-maybe@1.0.2:
     resolution: {integrity: sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==}
 
@@ -3405,6 +3429,9 @@ packages:
     resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
     engines: {node: '>=6.0'}
 
+  ci-info@2.0.0:
+    resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==}
+
   ci-info@3.9.0:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
@@ -3572,6 +3599,10 @@ packages:
     resolution: {integrity: sha512-NKgHbWkSZXJUcaBHSsyzC8eegD6bBd4O0oCI6XMIJ+y4Bq3v4w7sY3wfWoKPuVlq9pQHRB6od0lmKpIqi8TlKA==}
     hasBin: true
 
+  cross-spawn@6.0.6:
+    resolution: {integrity: sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==}
+    engines: {node: '>=4.8'}
+
   cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
@@ -3849,6 +3880,10 @@ packages:
     resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==}
     engines: {node: '>=4'}
 
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
   duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
 
@@ -3887,6 +3922,9 @@ packages:
     resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
     engines: {node: '>= 0.8'}
 
+  end-of-stream@1.4.5:
+    resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
+
   enhanced-resolve@5.17.1:
     resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
     engines: {node: '>=10.13.0'}
@@ -3923,6 +3961,10 @@ packages:
     resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
     engines: {node: '>= 0.4'}
 
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
   es-errors@1.3.0:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
@@ -3937,6 +3979,10 @@ packages:
     resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
     engines: {node: '>= 0.4'}
 
+  es-object-atoms@1.1.1:
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+    engines: {node: '>= 0.4'}
+
   es-set-tostringtag@2.0.3:
     resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
     engines: {node: '>= 0.4'}
@@ -4129,10 +4175,11 @@ packages:
     peerDependencies:
       eslint: '>6.6.0'
 
-  eslint-plugin-turbo@2.2.0:
-    resolution: {integrity: sha512-Xu99K8R6/wEVX34WreTbItyX25YYqW7VZU7/nyvKtlusHdsO6Be8IfhWIzIOgThigq4IiBsZXk/lhdcG1KzaNQ==}
+  eslint-plugin-turbo@2.5.4:
+    resolution: {integrity: sha512-IZsW61DFj5mLMMaCJxhh1VE4HvNhfdnHnAaXajgne+LUzdyHk2NvYT0ECSa/1SssArcqgTvV74MrLL68hWLLFw==}
     peerDependencies:
       eslint: '>6.6.0'
+      turbo: '>2.0.0'
 
   eslint-plugin-unicorn@44.0.2:
     resolution: {integrity: sha512-GLIDX1wmeEqpGaKcnMcqRvMVsoabeF0Ton0EX4Th5u6Kmf7RM9WBl705AXFEsns56ESkEs0uyelLuUTvz9Tr0w==}
@@ -4284,6 +4331,10 @@ packages:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
 
+  execa@1.0.0:
+    resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
+    engines: {node: '>=6'}
+
   execa@7.2.0:
     resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}
     engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}
@@ -4474,9 +4525,21 @@ packages:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
     engines: {node: '>= 0.4'}
 
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
+
   get-port-please@3.1.2:
     resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==}
 
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
+  get-stream@4.1.0:
+    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
+    engines: {node: '>=6'}
+
   get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
@@ -4564,6 +4627,10 @@ packages:
   gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
 
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
@@ -4601,6 +4668,10 @@ packages:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
   has-tostringtag@1.0.2:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
@@ -4741,6 +4812,11 @@ packages:
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  if-ci@3.0.0:
+    resolution: {integrity: sha512-/0vPNr5ZDR3znyP83SFMqe6oUVeiAeGt5QnPanVJjPGH7Z7JrZnYUEt7gpkK7C8NTIH5BLSqnA5IPdUnYof6pA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
   ignore@5.3.1:
     resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
     engines: {node: '>= 4'}
@@ -4849,6 +4925,10 @@ packages:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
 
+  is-ci@2.0.0:
+    resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==}
+    hasBin: true
+
   is-core-module@2.15.0:
     resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==}
     engines: {node: '>= 0.4'}
@@ -4939,6 +5019,10 @@ packages:
   is-ssh@1.4.0:
     resolution: {integrity: sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==}
 
+  is-stream@1.1.0:
+    resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
+    engines: {node: '>=0.10.0'}
+
   is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
@@ -5239,6 +5323,10 @@ packages:
   markdown-table@3.0.3:
     resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==}
 
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
   mdast-util-definitions@6.0.0:
     resolution: {integrity: sha512-scTllyX6pnYNZH/AIp/0ePz6s4cZtARxImwoPJ7kS42n+MnVsI4XbnG6d4ibehRIldYMWM2LD7ImQblVhUejVQ==}
 
@@ -5558,6 +5646,9 @@ packages:
     resolution: {integrity: sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==}
     engines: {node: '>= 10'}
 
+  nice-try@1.0.5:
+    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
+
   nitropack@2.10.4:
     resolution: {integrity: sha512-sJiG/MIQlZCVSw2cQrFG1H6mLeSqHlYfFerRjLKz69vUfdu0EL2l0WdOxlQbzJr3mMv/l4cOlCCLzVRzjzzF/g==}
     engines: {node: ^16.11.0 || >=17.0.0}
@@ -5626,6 +5717,10 @@ packages:
   not@0.1.0:
     resolution: {integrity: sha512-5PDmaAsVfnWUgTUbJ3ERwn7u79Z0dYxN9ErxCpVJJqe2RK0PJ3z+iFUxuqjwtlDDegXvtWoxD/3Fzxox7tFGWA==}
 
+  npm-run-path@2.0.2:
+    resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
+    engines: {node: '>=4'}
+
   npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
@@ -5681,6 +5776,10 @@ packages:
     resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
     engines: {node: '>= 0.4'}
 
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
   object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
@@ -5742,6 +5841,10 @@ packages:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
+  p-finally@1.0.0:
+    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
+    engines: {node: '>=4'}
+
   p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
@@ -5837,6 +5940,10 @@ packages:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
+  path-key@2.0.1:
+    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
+    engines: {node: '>=4'}
+
   path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
@@ -6240,6 +6347,9 @@ packages:
   protocols@2.0.1:
     resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==}
 
+  pump@3.0.3:
+    resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
+
   punycode.js@2.3.1:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
     engines: {node: '>=6'}
@@ -6253,6 +6363,10 @@ packages:
     peerDependencies:
       vue: ^3.0.0
 
+  qs@6.14.0:
+    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
+    engines: {node: '>=0.6'}
+
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -6597,10 +6711,18 @@ packages:
     resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
+  shebang-command@1.2.0:
+    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
+    engines: {node: '>=0.10.0'}
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
 
+  shebang-regex@1.0.0:
+    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
+    engines: {node: '>=0.10.0'}
+
   shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
@@ -6611,10 +6733,26 @@ packages:
   shiki@1.29.2:
     resolution: {integrity: sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg==}
 
+  side-channel-list@1.0.0:
+    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
   side-channel@1.0.6:
     resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
     engines: {node: '>= 0.4'}
 
+  side-channel@1.1.0:
+    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+    engines: {node: '>= 0.4'}
+
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
@@ -6769,6 +6907,10 @@ packages:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
 
+  strip-eof@1.0.0:
+    resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
+    engines: {node: '>=0.10.0'}
+
   strip-final-newline@3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
@@ -6784,6 +6926,15 @@ packages:
   strip-literal@2.1.1:
     resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==}
 
+  stripe@18.2.1:
+    resolution: {integrity: sha512-GwB1B7WSwEBzW4dilgyJruUYhbGMscrwuyHsPUmSRKrGHZ5poSh2oU9XKdii5BFVJzXHn35geRvGJ6R8bYcp8w==}
+    engines: {node: '>=12.*'}
+    peerDependencies:
+      '@types/node': '>=12.x.x'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
   style-mod@4.1.2:
     resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==}
 
@@ -6992,38 +7143,38 @@ packages:
   tslib@2.6.3:
     resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==}
 
-  turbo-darwin-64@2.3.3:
-    resolution: {integrity: sha512-bxX82xe6du/3rPmm4aCC5RdEilIN99VUld4HkFQuw+mvFg6darNBuQxyWSHZTtc25XgYjQrjsV05888w1grpaA==}
+  turbo-darwin-64@2.5.4:
+    resolution: {integrity: sha512-ah6YnH2dErojhFooxEzmvsoZQTMImaruZhFPfMKPBq8sb+hALRdvBNLqfc8NWlZq576FkfRZ/MSi4SHvVFT9PQ==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@2.3.3:
-    resolution: {integrity: sha512-DYbQwa3NsAuWkCUYVzfOUBbSUBVQzH5HWUFy2Kgi3fGjIWVZOFk86ss+xsWu//rlEAfYwEmopigsPYSmW4X15A==}
+  turbo-darwin-arm64@2.5.4:
+    resolution: {integrity: sha512-2+Nx6LAyuXw2MdXb7pxqle3MYignLvS7OwtsP9SgtSBaMlnNlxl9BovzqdYAgkUW3AsYiQMJ/wBRb7d+xemM5A==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@2.3.3:
-    resolution: {integrity: sha512-eHj9OIB0dFaP6BxB88jSuaCLsOQSYWBgmhy2ErCu6D2GG6xW3b6e2UWHl/1Ho9FsTg4uVgo4DB9wGsKa5erjUA==}
+  turbo-linux-64@2.5.4:
+    resolution: {integrity: sha512-5May2kjWbc8w4XxswGAl74GZ5eM4Gr6IiroqdLhXeXyfvWEdm2mFYCSWOzz0/z5cAgqyGidF1jt1qzUR8hTmOA==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@2.3.3:
-    resolution: {integrity: sha512-NmDE/NjZoDj1UWBhMtOPmqFLEBKhzGS61KObfrDEbXvU3lekwHeoPvAMfcovzswzch+kN2DrtbNIlz+/rp8OCg==}
+  turbo-linux-arm64@2.5.4:
+    resolution: {integrity: sha512-/2yqFaS3TbfxV3P5yG2JUI79P7OUQKOUvAnx4MV9Bdz6jqHsHwc9WZPpO4QseQm+NvmgY6ICORnoVPODxGUiJg==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@2.3.3:
-    resolution: {integrity: sha512-O2+BS4QqjK3dOERscXqv7N2GXNcqHr9hXumkMxDj/oGx9oCatIwnnwx34UmzodloSnJpgSqjl8iRWiY65SmYoQ==}
+  turbo-windows-64@2.5.4:
+    resolution: {integrity: sha512-EQUO4SmaCDhO6zYohxIjJpOKRN3wlfU7jMAj3CgcyTPvQR/UFLEKAYHqJOnJtymbQmiiM/ihX6c6W6Uq0yC7mA==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@2.3.3:
-    resolution: {integrity: sha512-dW4ZK1r6XLPNYLIKjC4o87HxYidtRRcBeo/hZ9Wng2XM/MqqYkAyzJXJGgRMsc0MMEN9z4+ZIfnSNBrA0b08ag==}
+  turbo-windows-arm64@2.5.4:
+    resolution: {integrity: sha512-oQ8RrK1VS8lrxkLriotFq+PiF7iiGgkZtfLKF4DDKsmdbPo0O9R2mQxm7jHLuXraRCuIQDWMIw6dpcr7Iykf4A==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@2.3.3:
-    resolution: {integrity: sha512-DUHWQAcC8BTiUZDRzAYGvpSpGLiaOQPfYXlCieQbwUvmml/LRGIe3raKdrOPOoiX0DYlzxs2nH6BoWJoZrj8hA==}
+  turbo@2.5.4:
+    resolution: {integrity: sha512-kc8ZibdRcuWUG1pbYSBFWqmIjynlD8Lp7IB6U3vIzvOv9VG+6Sp8bzyeBWE3Oi8XV5KsQrznyRTBPvrf99E4mA==}
     hasBin: true
 
   type-check@0.4.0:
@@ -7759,6 +7910,10 @@ packages:
     resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
     engines: {node: '>= 0.4'}
 
+  which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
+
   which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
@@ -9037,7 +9192,7 @@ snapshots:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.6.3
+      semver: 7.7.1
       tar: 6.2.1
     transitivePeerDependencies:
       - encoding
@@ -9349,7 +9504,7 @@ snapshots:
   '@nuxt/telemetry@2.6.0(magicast@0.3.5)(rollup@4.28.1)':
     dependencies:
       '@nuxt/kit': 3.14.1592(magicast@0.3.5)(rollup@4.28.1)
-      ci-info: 4.0.0
+      ci-info: 4.1.0
       consola: 3.2.3
       create-require: 1.1.1
       defu: 6.1.4
@@ -9902,6 +10057,8 @@ snapshots:
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
+  '@stripe/stripe-js@7.3.1': {}
+
   '@stylistic/eslint-plugin@2.9.0(eslint@9.13.0(jiti@2.4.1))(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/utils': 8.10.0(eslint@9.13.0(jiti@2.4.1))(typescript@5.5.4)
@@ -11303,7 +11460,7 @@ snapshots:
 
   builtins@5.1.0:
     dependencies:
-      semver: 7.6.3
+      semver: 7.7.1
 
   bundle-name@4.1.0:
     dependencies:
@@ -11328,6 +11485,11 @@ snapshots:
 
   cac@6.7.14: {}
 
+  call-bind-apply-helpers@1.0.2:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
   call-bind@1.0.7:
     dependencies:
       es-define-property: 1.0.0
@@ -11336,6 +11498,11 @@ snapshots:
       get-intrinsic: 1.2.4
       set-function-length: 1.2.2
 
+  call-bound@1.0.4:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
+
   call-me-maybe@1.0.2: {}
 
   callsites@3.1.0: {}
@@ -11400,6 +11567,8 @@ snapshots:
   chrome-trace-event@1.0.4:
     optional: true
 
+  ci-info@2.0.0: {}
+
   ci-info@3.9.0: {}
 
   ci-info@4.0.0: {}
@@ -11527,6 +11696,14 @@ snapshots:
 
   cronstrue@2.52.0: {}
 
+  cross-spawn@6.0.6:
+    dependencies:
+      nice-try: 1.0.5
+      path-key: 2.0.1
+      semver: 5.7.2
+      shebang-command: 1.2.0
+      which: 1.3.1
+
   cross-spawn@7.0.3:
     dependencies:
       path-key: 3.1.1
@@ -11776,6 +11953,12 @@ snapshots:
 
   dset@3.1.4: {}
 
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
   duplexer@0.1.2: {}
 
   eastasianwidth@0.2.0: {}
@@ -11804,6 +11987,10 @@ snapshots:
 
   encodeurl@2.0.0: {}
 
+  end-of-stream@1.4.5:
+    dependencies:
+      once: 1.4.0
+
   enhanced-resolve@5.17.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -11882,6 +12069,8 @@ snapshots:
     dependencies:
       get-intrinsic: 1.2.4
 
+  es-define-property@1.0.1: {}
+
   es-errors@1.3.0: {}
 
   es-module-lexer@1.5.4: {}
@@ -11892,6 +12081,10 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
 
+  es-object-atoms@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+
   es-set-tostringtag@2.0.3:
     dependencies:
       get-intrinsic: 1.2.4
@@ -12263,10 +12456,11 @@ snapshots:
       dotenv: 16.0.3
       eslint: 9.13.0(jiti@2.4.1)
 
-  eslint-plugin-turbo@2.2.0(eslint@9.13.0(jiti@2.4.1)):
+  eslint-plugin-turbo@2.5.4(eslint@9.13.0(jiti@2.4.1))(turbo@2.5.4):
     dependencies:
       dotenv: 16.0.3
       eslint: 9.13.0(jiti@2.4.1)
+      turbo: 2.5.4
 
   eslint-plugin-unicorn@44.0.2(eslint@9.13.0(jiti@2.4.1)):
     dependencies:
@@ -12532,6 +12726,16 @@ snapshots:
 
   events@3.3.0: {}
 
+  execa@1.0.0:
+    dependencies:
+      cross-spawn: 6.0.6
+      get-stream: 4.1.0
+      is-stream: 1.1.0
+      npm-run-path: 2.0.2
+      p-finally: 1.0.0
+      signal-exit: 3.0.7
+      strip-eof: 1.0.0
+
   execa@7.2.0:
     dependencies:
       cross-spawn: 7.0.3
@@ -12753,8 +12957,30 @@ snapshots:
       has-symbols: 1.0.3
       hasown: 2.0.2
 
+  get-intrinsic@1.3.0:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      function-bind: 1.1.2
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      math-intrinsics: 1.1.0
+
   get-port-please@3.1.2: {}
 
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.1
+
+  get-stream@4.1.0:
+    dependencies:
+      pump: 3.0.3
+
   get-stream@6.0.1: {}
 
   get-stream@8.0.1: {}
@@ -12863,6 +13089,8 @@ snapshots:
     dependencies:
       get-intrinsic: 1.2.4
 
+  gopd@1.2.0: {}
+
   graceful-fs@4.2.11: {}
 
   grapheme-splitter@1.0.4: {}
@@ -12910,6 +13138,8 @@ snapshots:
 
   has-symbols@1.0.3: {}
 
+  has-symbols@1.1.0: {}
+
   has-tostringtag@1.0.2:
     dependencies:
       has-symbols: 1.0.3
@@ -13179,6 +13409,11 @@ snapshots:
 
   ieee754@1.2.1: {}
 
+  if-ci@3.0.0:
+    dependencies:
+      execa: 1.0.0
+      is-ci: 2.0.0
+
   ignore@5.3.1: {}
 
   ignore@6.0.2: {}
@@ -13291,6 +13526,10 @@ snapshots:
 
   is-callable@1.2.7: {}
 
+  is-ci@2.0.0:
+    dependencies:
+      ci-info: 2.0.0
+
   is-core-module@2.15.0:
     dependencies:
       hasown: 2.0.2
@@ -13361,6 +13600,8 @@ snapshots:
     dependencies:
       protocols: 2.0.1
 
+  is-stream@1.1.0: {}
+
   is-stream@2.0.1: {}
 
   is-stream@3.0.0: {}
@@ -13654,6 +13895,8 @@ snapshots:
 
   markdown-table@3.0.3: {}
 
+  math-intrinsics@1.1.0: {}
+
   mdast-util-definitions@6.0.0:
     dependencies:
       '@types/mdast': 4.0.4
@@ -14225,6 +14468,8 @@ snapshots:
 
   neotraverse@0.6.18: {}
 
+  nice-try@1.0.5: {}
+
   nitropack@2.10.4(typescript@5.5.4):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.3.4
@@ -14359,6 +14604,10 @@ snapshots:
 
   not@0.1.0: {}
 
+  npm-run-path@2.0.2:
+    dependencies:
+      path-key: 2.0.1
+
   npm-run-path@4.0.1:
     dependencies:
       path-key: 3.1.1
@@ -14517,6 +14766,8 @@ snapshots:
 
   object-inspect@1.13.2: {}
 
+  object-inspect@1.13.4: {}
+
   object-keys@1.1.1: {}
 
   object.assign@4.1.5:
@@ -14607,6 +14858,8 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
+  p-finally@1.0.0: {}
+
   p-limit@2.3.0:
     dependencies:
       p-try: 2.2.0
@@ -14717,6 +14970,8 @@ snapshots:
 
   path-is-absolute@1.0.1: {}
 
+  path-key@2.0.1: {}
+
   path-key@3.1.1: {}
 
   path-key@4.0.0: {}
@@ -15023,6 +15278,11 @@ snapshots:
 
   protocols@2.0.1: {}
 
+  pump@3.0.3:
+    dependencies:
+      end-of-stream: 1.4.5
+      once: 1.4.0
+
   punycode.js@2.3.1: {}
 
   punycode@2.3.1: {}
@@ -15031,6 +15291,10 @@ snapshots:
     dependencies:
       vue: 3.5.13(typescript@5.5.4)
 
+  qs@6.14.0:
+    dependencies:
+      side-channel: 1.1.0
+
   queue-microtask@1.2.3: {}
 
   queue-tick@1.0.1: {}
@@ -15574,10 +15838,16 @@ snapshots:
       '@img/sharp-win32-ia32': 0.33.5
       '@img/sharp-win32-x64': 0.33.5
 
+  shebang-command@1.2.0:
+    dependencies:
+      shebang-regex: 1.0.0
+
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
 
+  shebang-regex@1.0.0: {}
+
   shebang-regex@3.0.0: {}
 
   shell-quote@1.8.1: {}
@@ -15593,6 +15863,26 @@ snapshots:
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
 
+  side-channel-list@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-map: 1.0.1
+
   side-channel@1.0.6:
     dependencies:
       call-bind: 1.0.7
@@ -15600,6 +15890,14 @@ snapshots:
       get-intrinsic: 1.2.4
       object-inspect: 1.13.2
 
+  side-channel@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-list: 1.0.0
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
+
   signal-exit@3.0.7: {}
 
   signal-exit@4.1.0: {}
@@ -15766,6 +16064,8 @@ snapshots:
 
   strip-bom@3.0.0: {}
 
+  strip-eof@1.0.0: {}
+
   strip-final-newline@3.0.0: {}
 
   strip-indent@3.0.0:
@@ -15778,6 +16078,12 @@ snapshots:
     dependencies:
       js-tokens: 9.0.1
 
+  stripe@18.2.1(@types/node@22.13.1):
+    dependencies:
+      qs: 6.14.0
+    optionalDependencies:
+      '@types/node': 22.13.1
+
   style-mod@4.1.2: {}
 
   style-to-object@0.4.4:
@@ -16005,32 +16311,32 @@ snapshots:
 
   tslib@2.6.3: {}
 
-  turbo-darwin-64@2.3.3:
+  turbo-darwin-64@2.5.4:
     optional: true
 
-  turbo-darwin-arm64@2.3.3:
+  turbo-darwin-arm64@2.5.4:
     optional: true
 
-  turbo-linux-64@2.3.3:
+  turbo-linux-64@2.5.4:
     optional: true
 
-  turbo-linux-arm64@2.3.3:
+  turbo-linux-arm64@2.5.4:
     optional: true
 
-  turbo-windows-64@2.3.3:
+  turbo-windows-64@2.5.4:
     optional: true
 
-  turbo-windows-arm64@2.3.3:
+  turbo-windows-arm64@2.5.4:
     optional: true
 
-  turbo@2.3.3:
+  turbo@2.5.4:
     optionalDependencies:
-      turbo-darwin-64: 2.3.3
-      turbo-darwin-arm64: 2.3.3
-      turbo-linux-64: 2.3.3
-      turbo-linux-arm64: 2.3.3
-      turbo-windows-64: 2.3.3
-      turbo-windows-arm64: 2.3.3
+      turbo-darwin-64: 2.5.4
+      turbo-darwin-arm64: 2.5.4
+      turbo-linux-64: 2.5.4
+      turbo-linux-arm64: 2.5.4
+      turbo-windows-64: 2.5.4
+      turbo-windows-arm64: 2.5.4
 
   type-check@0.4.0:
     dependencies:
@@ -16604,7 +16910,7 @@ snapshots:
   vscode-languageclient@7.0.0:
     dependencies:
       minimatch: 3.1.2
-      semver: 7.6.3
+      semver: 7.7.1
       vscode-languageserver-protocol: 3.16.0
 
   vscode-languageserver-protocol@3.16.0:
@@ -16817,6 +17123,10 @@ snapshots:
       gopd: 1.0.1
       has-tostringtag: 1.0.2
 
+  which@1.3.1:
+    dependencies:
+      isexe: 2.0.0
+
   which@2.0.2:
     dependencies:
       isexe: 2.0.0
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..b8889a3bb
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.87.0"
diff --git a/turbo.json b/turbo.json
deleted file mode 100644
index 71cd9ce3b..000000000
--- a/turbo.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "tasks": {
-    "build": {
-      "dependsOn": ["^build"],
-      "inputs": ["$TURBO_DEFAULT$", ".env*"],
-      "outputs": [".nuxt/**", "dist/**", ".output/**", "target/**"],
-      "env": [
-        "NODE_ENV",
-        "SITE_URL",
-        "BASE_URL",
-        "FLAG_OVERRIDES",
-        "BROWSER_BASE_URL",
-        "RATE_LIMIT_IGNORE_KEY",
-        "VERCEL_*",
-        "CF_PAGES_*",
-        "HEROKU_APP_NAME",
-        "STRIPE_PUBLISHABLE_KEY",
-        "PYRO_BASE_URL",
-        "PROD_OVERRIDE",
-        "PYRO_MASTER_KEY",
-        "PORT",
-        "SQLX_OFFLINE"
-      ]
-    },
-    "lint": {
-      "env": ["SQLX_OFFLINE"]
-    },
-    "dev": {
-      "cache": false,
-      "persistent": true,
-      "inputs": ["$TURBO_DEFAULT$", ".env*"],
-      "env": ["DISPLAY", "WEBKIT_DISABLE_DMABUF_RENDERER"]
-    },
-    "test": {
-      "env": ["SQLX_OFFLINE", "DATABASE_URL"]
-    },
-    "fix": {
-      "cache": false
-    }
-  }
-}
diff --git a/turbo.jsonc b/turbo.jsonc
new file mode 100644
index 000000000..77696a173
--- /dev/null
+++ b/turbo.jsonc
@@ -0,0 +1,66 @@
+{
+  "$schema": "./node_modules/turbo/schema.json",
+  "concurrency": "100%",
+  "tasks": {
+    "build": {
+      "dependsOn": ["^build"],
+      "inputs": ["$TURBO_DEFAULT$", ".env*"],
+      "outputs": [".nuxt/**", "dist/**", ".output/**", "$TURBO_ROOT$/target/**"],
+      "env": [
+        "NODE_ENV",
+        "SITE_URL",
+        "BASE_URL",
+        "FLAG_OVERRIDES",
+        "BROWSER_BASE_URL",
+        "RATE_LIMIT_IGNORE_KEY",
+        "VERCEL_*",
+        "CF_PAGES_*",
+        "HEROKU_APP_NAME",
+        "STRIPE_PUBLISHABLE_KEY",
+        "PYRO_BASE_URL",
+        "PROD_OVERRIDE",
+        "PYRO_MASTER_KEY",
+        "PORT",
+        "SQLX_OFFLINE",
+        "DATABASE_URL",
+        "CARGO_*",
+        "RUST_*",
+        "RUSTFLAGS",
+        "FORCE_COLOR",
+        "NEXTEST_*"
+      ]
+    },
+    "lint": {
+      "env": [
+        "DATABASE_URL",
+        "SQLX_OFFLINE",
+        "CARGO_*",
+        "RUST_*",
+        "RUSTFLAGS",
+        "FORCE_COLOR",
+        "NEXTEST_*"
+      ]
+    },
+    "dev": {
+      "cache": false,
+      "persistent": true,
+      "inputs": ["$TURBO_DEFAULT$", ".env*"],
+      "env": ["CARGO_*", "RUST_*", "RUSTFLAGS", "FORCE_COLOR", "NEXTEST_*"],
+      "passThroughEnv": ["DISPLAY", "WEBKIT_DISABLE_DMABUF_RENDERER"]
+    },
+    "test": {
+      "env": [
+        "SQLX_OFFLINE",
+        "DATABASE_URL",
+        "CARGO_*",
+        "RUST_*",
+        "RUSTFLAGS",
+        "FORCE_COLOR",
+        "NEXTEST_*"
+      ]
+    },
+    "fix": {
+      "cache": false
+    }
+  }
+}