diff --git a/.github/assets/api_cover.png b/.github/assets/api_cover.png
index 5ad8f8b4..5de90400 100644
Binary files a/.github/assets/api_cover.png and b/.github/assets/api_cover.png differ
diff --git a/.github/assets/app_cover.png b/.github/assets/app_cover.png
index 62f027cf..5f98efe3 100644
Binary files a/.github/assets/app_cover.png and b/.github/assets/app_cover.png differ
diff --git a/.github/assets/monorepo_cover.png b/.github/assets/monorepo_cover.png
index c7effcb4..f768e4dd 100644
Binary files a/.github/assets/monorepo_cover.png and b/.github/assets/monorepo_cover.png differ
diff --git a/.github/assets/web_cover.png b/.github/assets/web_cover.png
index c0a3ad60..5c922277 100644
Binary files a/.github/assets/web_cover.png and b/.github/assets/web_cover.png differ
diff --git a/.vscode/settings.json b/.vscode/settings.json
index fbe97bcf..9caec96a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,7 @@
   "prettier.endOfLine": "lf",
   "editor.formatOnSave": true,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
+  "editor.detectIndentation": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   }
diff --git a/Cargo.lock b/Cargo.lock
index 180c4749..01c43b4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -44,9 +44,9 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "actix-web",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bytes",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "futures-core",
  "http-range",
  "log",
@@ -59,17 +59,17 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.10.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9"
+checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
  "base64 0.22.1",
- "bitflags 2.9.0",
- "brotli",
+ "bitflags 2.9.1",
+ "brotli 8.0.1",
  "bytes",
  "bytestring",
  "derive_more 2.0.1",
@@ -88,12 +88,12 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "rand 0.9.1",
- "sha1 0.10.6",
+ "sha1",
  "smallvec",
  "tokio",
  "tokio-util",
  "tracing",
- "zstd 0.13.3",
+ "zstd",
 ]
 
 [[package]]
@@ -103,20 +103,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "actix-multipart"
-version = "0.6.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d974dd6c4f78d102d057c672dcf6faa618fafa9df91d44f9c466688fc1275a3a"
+checksum = "d5118a26dee7e34e894f7e85aa0ee5080ae4c18bf03c0e30d49a80e418f00a53"
 dependencies = [
  "actix-multipart-derive",
  "actix-utils",
  "actix-web",
- "bytes",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "futures-core",
  "futures-util",
  "httparse",
@@ -134,15 +133,15 @@ dependencies = [
 
 [[package]]
 name = "actix-multipart-derive"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d"
+checksum = "e11eb847f49a700678ea2fa73daeb3208061afa2b9d1a8527c03390f4c4a1c6b"
 dependencies = [
- "darling 0.20.11",
+ "darling",
  "parse-size",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -173,16 +172,16 @@ dependencies = [
 
 [[package]]
 name = "actix-server"
-version = "2.5.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6398974fd4284f4768af07965701efbbb5fdc0616bff20cade1bb14b77675e24"
+checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502"
 dependencies = [
  "actix-rt",
  "actix-service",
  "actix-utils",
  "futures-core",
  "futures-util",
- "mio 1.0.3",
+ "mio",
  "socket2",
  "tokio",
  "tracing",
@@ -210,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.10.2"
+version = "4.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d"
+checksum = "a597b77b5c6d6a1e1097fddde329a83665e25c5437c696a3a9a4aa514a614dea"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -260,14 +259,14 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "actix-web-prom"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56a34f1825c3ae06567a9d632466809bbf34963c86002e8921b64f32d48d289d"
+checksum = "a7eb266b4c692a4a7e68429fcbe4eb3bd55c053f6d84c0522dc83df22395edf6"
 dependencies = [
  "actix-web",
  "futures-core",
@@ -307,39 +306,28 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.3.3",
  "once_cell",
  "version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
@@ -351,6 +339,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+
 [[package]]
 name = "alloc-no-stdlib"
 version = "2.0.4"
@@ -428,12 +422,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys 0.59.0",
 ]
 
@@ -453,10 +447,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "arc-swap"
-version = "1.7.1"
+name = "arg_enum_proc_macro"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "argon2"
@@ -467,7 +466,7 @@ dependencies = [
  "base64ct",
  "blake2",
  "cpufeatures",
- "password-hash 0.5.0",
+ "password-hash",
 ]
 
 [[package]]
@@ -481,8 +480,8 @@ dependencies = [
  "serde_bytes",
  "serde_cbor",
  "serde_json",
- "thiserror 1.0.69",
- "uuid 1.16.0",
+ "thiserror 2.0.12",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -507,7 +506,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "rand 0.9.1",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "serde",
  "serde_repr",
  "tokio",
@@ -552,34 +551,34 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64"
+checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
 dependencies = [
- "brotli",
- "bzip2 0.5.2",
+ "brotli 8.0.1",
+ "bzip2",
  "deflate64",
  "flate2",
  "futures-core",
  "futures-io",
- "liblzma",
  "memchr",
  "pin-project-lite",
  "tokio",
- "zstd 0.13.3",
- "zstd-safe 7.2.4",
+ "zstd",
+ "zstd-safe",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand 2.3.0",
  "futures-lite 2.6.0",
+ "pin-project-lite",
  "slab",
 ]
 
@@ -596,9 +595,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
 dependencies = [
  "async-lock",
  "cfg-if",
@@ -607,7 +606,7 @@ dependencies = [
  "futures-lite 2.6.0",
  "parking",
  "polling",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "slab",
  "tracing",
  "windows-sys 0.59.0",
@@ -651,7 +650,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -691,19 +690,19 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "async-stripe"
-version = "0.39.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30"
+checksum = "cecbddf002ad7a13d2041eadf1b234cb3f57653ffdd901a01bc3f1c65aa77440"
 dependencies = [
  "chrono",
  "futures-util",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "http-types",
  "hyper 0.14.32",
  "hyper-rustls 0.24.2",
@@ -711,12 +710,11 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_qs 0.10.1",
- "sha2 0.10.8",
+ "sha2",
  "smart-default",
  "smol_str",
  "thiserror 1.0.69",
  "tokio",
- "uuid 0.8.2",
 ]
 
 [[package]]
@@ -733,16 +731,19 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "async-tungstenite"
-version = "0.27.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5359381fd414fbdb272c48f2111c16cb0bb3447bfacd59311ff3736da9f6664"
+checksum = "ef0f7efedeac57d9b26170f72965ecfd31473ca52ca7a64e925b0b6f5f079886"
 dependencies = [
+ "atomic-waker",
+ "futures-core",
  "futures-io",
+ "futures-task",
  "futures-util",
  "log",
  "pin-project-lite",
@@ -750,7 +751,18 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.26.2",
  "tungstenite",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
+]
+
+[[package]]
+name = "async-walkdir"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37672978ae0febce7516ae0a85b53e6185159a9a28787391eb63fc44ec36037d"
+dependencies = [
+ "async-fs",
+ "futures-lite 2.6.0",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -809,19 +821,17 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "attohttpc"
-version = "0.22.0"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
+checksum = "07a9b245ba0739fc90935094c29adbaee3f977218b5fb95e822e261cda7f56a3"
 dependencies = [
- "http 0.2.12",
+ "http 1.3.1",
  "log",
- "native-tls",
- "rustls 0.20.9",
+ "rustls 0.23.27",
  "serde",
  "serde_json",
  "url",
- "webpki",
- "webpki-roots 0.22.6",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -831,16 +841,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
-name = "aws-creds"
-version = "0.34.1"
+name = "av1-grain"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3776743bb68d4ad02ba30ba8f64373f1be4e082fe47651767171ce75bb2f6cf5"
+checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8"
+dependencies = [
+ "anyhow",
+ "arrayvec",
+ "log",
+ "nom 7.1.3",
+ "num-rational",
+ "v_frame",
+]
+
+[[package]]
+name = "avif-serialize"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "aws-creds"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f84143206b9c72b3c5cb65415de60c7539c79cd1559290fddec657939131be0"
 dependencies = [
  "attohttpc",
- "dirs 4.0.0",
+ "home",
  "log",
- "quick-xml 0.26.0",
- "rust-ini 0.18.0",
+ "quick-xml 0.32.0",
+ "rust-ini",
  "serde",
  "thiserror 1.0.69",
  "time",
@@ -877,7 +910,7 @@ dependencies = [
  "pin-project-lite",
  "rustversion",
  "serde",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tower 0.5.2",
  "tower-layer",
  "tower-service",
@@ -898,16 +931,16 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -954,15 +987,6 @@ version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -992,13 +1016,19 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitstream-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -1017,22 +1047,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
- "digest 0.10.7",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
+ "digest",
 ]
 
 [[package]]
@@ -1055,11 +1070,11 @@ dependencies = [
 
 [[package]]
 name = "block2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d59b4c170e16f0405a2e95aff44432a0d41aa97675f3d52623effe95792a037"
+checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
 dependencies = [
- "objc2 0.6.0",
+ "objc2 0.6.1",
 ]
 
 [[package]]
@@ -1095,7 +1110,7 @@ dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1106,7 +1121,18 @@ checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
- "brotli-decompressor",
+ "brotli-decompressor 4.0.3",
+]
+
+[[package]]
+name = "brotli"
+version = "8.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor 5.0.0",
 ]
 
 [[package]]
@@ -1119,6 +1145,16 @@ dependencies = [
  "alloc-stdlib",
 ]
 
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
 [[package]]
 name = "bstr"
 version = "1.12.0"
@@ -1126,10 +1162,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata 0.4.9",
- "serde",
 ]
 
+[[package]]
+name = "built"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
+
 [[package]]
 name = "bumpalo"
 version = "3.17.0"
@@ -1160,9 +1200,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.22.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
 
 [[package]]
 name = "byteorder"
@@ -1194,16 +1234,6 @@ dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
 [[package]]
 name = "bzip2"
 version = "0.5.2"
@@ -1229,7 +1259,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -1292,9 +1322,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.19"
+version = "1.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
+checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
 dependencies = [
  "jobserver",
  "libc",
@@ -1324,7 +1354,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
 dependencies = [
  "byteorder",
  "fnv",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -1351,9 +1381,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -1375,20 +1405,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "cipher"
-version = "0.4.4"
+name = "cityhash-rs"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
+checksum = "93a719913643003b84bd13022b4b7e703c09342cd03b679c4641c7d2e50dc34d"
 
 [[package]]
 name = "clap"
-version = "4.5.37"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1396,14 +1422,14 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.37"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.1",
+ "strsim",
 ]
 
 [[package]]
@@ -1415,7 +1441,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1426,18 +1452,21 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "clickhouse"
-version = "0.11.6"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0875e527e299fc5f4faba42870bf199a39ab0bb2dbba1b8aef0a2151451130f"
+checksum = "d9894248c4c5a4402f76a56c273836a0c32547ec8a68166aedee7e01b7b8d102"
 dependencies = [
  "bstr",
  "bytes",
+ "cityhash-rs",
  "clickhouse-derive",
- "clickhouse-rs-cityhash-sys",
  "futures",
- "hyper 0.14.32",
- "hyper-tls 0.5.0",
- "lz4",
+ "futures-channel",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "lz4_flex",
+ "replace_with",
  "sealed",
  "serde",
  "static_assertions",
@@ -1445,58 +1474,19 @@ dependencies = [
  "time",
  "tokio",
  "url",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
 name = "clickhouse-derive"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18af5425854858c507eec70f7deb4d5d8cec4216fcb086283a78872387281ea5"
+checksum = "d70f3e2893f7d3e017eeacdc9a708fbc29a10488e3ebca21f9df6a5d2b616dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde_derive_internals 0.26.0",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "clickhouse-rs-cityhash-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4baf9d4700a28d6cb600e17ed6ae2b43298a5245f1f76b4eab63027ebfd592b9"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation 0.9.4",
- "core-graphics 0.23.2",
- "foreign-types 0.5.0",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "libc",
- "objc",
+ "serde_derive_internals",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1616,17 +1606,11 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "once_cell",
  "tiny-keccak",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
@@ -1681,9 +1665,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1695,51 +1679,27 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
-[[package]]
-name = "core-graphics"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "foreign-types 0.5.0",
- "libc",
-]
-
 [[package]]
 name = "core-graphics"
 version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
+ "core-graphics-types",
  "foreign-types 0.5.0",
  "libc",
 ]
 
-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "libc",
-]
-
 [[package]]
 name = "core-graphics-types"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.10.0",
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
  "libc",
 ]
 
@@ -1754,9 +1714,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 dependencies = [
  "crc-catalog",
 ]
@@ -1776,6 +1736,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -1847,16 +1813,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "cssparser"
 version = "0.27.2"
@@ -1881,7 +1837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1912,7 +1868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1922,7 +1878,7 @@ dependencies = [
  "chrono",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -1933,57 +1889,32 @@ dependencies = [
  "bytes",
  "chrono",
  "daedalus",
- "dashmap 5.5.3",
+ "dashmap",
  "dotenvy",
  "futures",
  "indexmap 2.9.0",
- "itertools 0.13.0",
- "lazy_static",
- "reqwest 0.12.15",
+ "itertools 0.14.0",
+ "reqwest",
  "rust-s3",
  "serde",
  "serde-xml-rs",
  "serde_json",
  "sha1_smol",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
  "tracing",
  "tracing-error",
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core 0.20.11",
- "darling_macro 0.20.11",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -1996,19 +1927,8 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.11.1",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
+ "strsim",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2017,22 +1937,9 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core 0.20.11",
+ "darling_core",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2056,17 +1963,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
-[[package]]
-name = "dbus"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
-dependencies = [
- "libc",
- "libdbus-sys",
- "winapi",
-]
-
 [[package]]
 name = "deadpool"
 version = "0.12.2"
@@ -2080,9 +1976,9 @@ dependencies = [
 
 [[package]]
 name = "deadpool-redis"
-version = "0.18.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfae6799b68a735270e4344ee3e834365f707c72da09c9a8bb89b45cc3351395"
+checksum = "667d186d69c8b4dd7f8cf1ac71bec88b312e1752f2d1a63028aa9ea124c3f191"
 dependencies = [
  "deadpool",
  "redis",
@@ -2104,7 +2000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -2134,17 +2030,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "derive-new"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
-]
-
 [[package]]
 name = "derive_arbitrary"
 version = "1.4.1"
@@ -2153,51 +2038,51 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "derive_builder"
-version = "0.12.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
 dependencies = [
  "derive_builder_macro",
 ]
 
 [[package]]
 name = "derive_builder_core"
-version = "0.12.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "darling 0.14.4",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "derive_builder_macro"
-version = "0.12.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.19"
+version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2217,56 +2102,29 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "unicode-xid",
 ]
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "const-oid",
  "crypto-common",
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
 [[package]]
 name = "dirs"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
- "dirs-sys 0.5.0",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -2279,29 +2137,6 @@ dependencies = [
  "dirs-sys-next",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users 0.4.6",
- "winapi",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.4.6",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.5.0"
@@ -2350,10 +2185,22 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a0d569e003ff27784e0e14e4a594048698e0c0f0b66cabcb51511be55a7caa0"
 dependencies = [
- "bitflags 2.9.0",
- "block2 0.6.0",
+ "bitflags 2.9.1",
+ "block2 0.6.1",
  "libc",
- "objc2 0.6.0",
+ "objc2 0.6.1",
+]
+
+[[package]]
+name = "dispatch2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+dependencies = [
+ "bitflags 2.9.1",
+ "block2 0.6.1",
+ "libc",
+ "objc2 0.6.1",
 ]
 
 [[package]]
@@ -2364,7 +2211,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2387,15 +2234,9 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
 [[package]]
 name = "dlv-list"
 version = "0.5.2"
@@ -2419,9 +2260,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "dpi"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 dependencies = [
  "serde",
 ]
@@ -2460,7 +2301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
- "digest 0.10.7",
+ "digest",
  "elliptic-curve",
  "rfc6979",
  "signature",
@@ -2484,7 +2325,7 @@ checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
- "digest 0.10.7",
+ "digest",
  "ff",
  "generic-array",
  "group",
@@ -2553,6 +2394,18 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.7.11"
@@ -2571,7 +2424,29 @@ checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "enumset"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11a6b7c3d347de0a9f7bfd2f853be43fe32fa6fac30c70f6d6d67a1e936b87ee"
+dependencies = [
+ "enumset_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumset_derive"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6da3ea9e1d1a3b1593e15781f930120e72aa7501610b2f82e5b6739c72e8eac5"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2583,6 +2458,12 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "env_home"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
+
 [[package]]
 name = "env_logger"
 version = "0.11.8"
@@ -2611,9 +2492,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2674,12 +2555,13 @@ dependencies = [
 
 [[package]]
 name = "fancy-regex"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
+checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
 dependencies = [
  "bit-set",
- "regex",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2757,6 +2639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
+ "libz-rs-sys",
  "miniz_oxide",
 ]
 
@@ -2768,7 +2651,7 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -2810,7 +2693,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2834,6 +2717,23 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "formatx"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8866fac38f53fc87fa3ae1b09ddd723e0482f8fa74323518b4c59df2c55a00a"
+
+[[package]]
+name = "fs4"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8640e34b88f7652208ce9e88b1a37a2ae95227d84abec377ccd3c5cfeb141ed4"
+dependencies = [
+ "rustix 1.0.7",
+ "tokio",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -2954,7 +2854,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3068,20 +2968,6 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "gdkx11"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe"
-dependencies = [
- "gdk",
- "gdkx11-sys",
- "gio",
- "glib",
- "libc",
- "x11",
-]
-
 [[package]]
 name = "gdkx11-sys"
 version = "0.18.2"
@@ -3095,6 +2981,20 @@ dependencies = [
  "x11",
 ]
 
+[[package]]
+name = "generator"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -3108,11 +3008,11 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7131e57abbde63513e0e6636f76668a1ca9798dcae2df4e283cae9ee83859e"
+checksum = "fc257fdb4038301ce4b9cd1b3b51704509692bb3ff716a410cbd07925d9dae55"
 dependencies = [
- "rustix 1.0.5",
+ "rustix 1.0.7",
  "windows-targets 0.52.6",
 ]
 
@@ -3129,9 +3029,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3142,9 +3042,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3208,7 +3108,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -3236,7 +3136,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3326,7 +3226,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3350,9 +3250,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -3398,15 +3298,15 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "allocator-api2",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -3419,7 +3319,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -3435,15 +3335,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -3464,15 +3355,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hermit-abi"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "hex"
@@ -3480,23 +3365,59 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hickory-proto"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna",
+ "ipnet",
+ "once_cell",
+ "rand 0.9.1",
+ "ring",
+ "thiserror 2.0.12",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "moka",
+ "once_cell",
+ "parking_lot",
+ "rand 0.9.1",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "hkdf"
 version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
+ "hmac",
 ]
 
 [[package]]
@@ -3505,7 +3426,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3676,7 +3597,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -3706,21 +3627,20 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d"
 dependencies = [
- "futures-util",
  "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.2",
  "tower-service",
- "webpki-roots 0.26.8",
+ "webpki-roots 1.0.0",
 ]
 
 [[package]]
@@ -3736,19 +3656,6 @@ dependencies = [
  "tower-service",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper 0.14.32",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -3767,9 +3674,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3797,7 +3704,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.0",
+ "windows-core",
 ]
 
 [[package]]
@@ -3821,21 +3728,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -3844,31 +3752,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -3876,83 +3764,60 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -3966,38 +3831,14 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
 ]
 
-[[package]]
-name = "if_chain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
-
-[[package]]
-name = "image"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
- "num-traits",
- "png",
- "qoi",
- "tiff",
-]
-
 [[package]]
 name = "image"
 version = "0.25.6"
@@ -4006,9 +3847,37 @@ checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
+ "color_quant",
+ "exr",
+ "gif",
+ "image-webp",
  "num-traits",
+ "png",
+ "qoi",
+ "ravif",
+ "rayon",
+ "rgb",
+ "tiff",
+ "zune-core",
+ "zune-jpeg",
 ]
 
+[[package]]
+name = "image-webp"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
+]
+
+[[package]]
+name = "imgref"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
+
 [[package]]
 name = "impl-more"
 version = "0.1.9"
@@ -4033,7 +3902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
  "serde",
 ]
 
@@ -4071,29 +3940,29 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2094aecddc672e902cd773bad7071542f63641e01e9187c3bba4b43005e837e9"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "clap",
  "crossbeam-channel",
  "crossbeam-utils",
- "dashmap 6.1.0",
+ "dashmap",
  "env_logger",
  "indexmap 2.9.0",
  "itoa 1.0.15",
  "log",
  "num-format",
  "once_cell",
- "quick-xml 0.37.4",
+ "quick-xml 0.37.5",
  "rgb",
  "str_stack",
 ]
 
 [[package]]
 name = "inotify"
-version = "0.9.6"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.1",
  "inotify-sys",
  "libc",
 ]
@@ -4107,15 +3976,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "inout"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.13"
@@ -4125,6 +3985,29 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "interpolate_name"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "ipconfig"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg 0.50.0",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -4133,12 +4016,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "ipnetwork"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
-dependencies = [
- "serde",
-]
+checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763"
 
 [[package]]
 name = "is-docker"
@@ -4155,7 +4035,7 @@ version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi 0.5.0",
+ "hermit-abi 0.5.1",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -4178,31 +4058,13 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "iso8601"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5c177cff824ab21a6f41079a4c401241c4e8be14f316c4c6b07d5fca351c98d"
+checksum = "e1082f0c48f143442a1ac6122f67e360ceee130b967af4d50996e5154a45df46"
 dependencies = [
  "nom 8.0.0",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -4310,7 +4172,7 @@ version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "libc",
 ]
 
@@ -4319,9 +4181,6 @@ name = "jpeg-decoder"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-dependencies = [
- "rayon",
-]
 
 [[package]]
 name = "js-sys"
@@ -4385,7 +4244,7 @@ checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
 dependencies = [
  "base64 0.22.1",
  "js-sys",
- "ring 0.17.14",
+ "ring",
  "serde",
  "serde_json",
 ]
@@ -4396,16 +4255,16 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "serde",
  "unicode-segmentation",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -4450,8 +4309,8 @@ dependencies = [
  "ariadne",
  "async-stripe",
  "async-trait",
- "base64 0.21.7",
- "bitflags 2.9.0",
+ "base64 0.22.1",
+ "bitflags 2.9.1",
  "bytes",
  "censor",
  "chrono",
@@ -4459,9 +4318,8 @@ dependencies = [
  "clickhouse",
  "color-thief",
  "console-subscriber",
- "dashmap 5.5.3",
+ "dashmap",
  "deadpool-redis",
- "derive-new",
  "dotenv-build",
  "dotenvy",
  "either",
@@ -4469,25 +4327,25 @@ dependencies = [
  "futures",
  "futures-util",
  "hex",
- "hmac 0.11.0",
- "hyper 0.14.32",
- "hyper-tls 0.5.0",
+ "hmac",
+ "hyper-tls",
+ "hyper-util",
  "iana-time-zone",
- "image 0.24.9",
- "itertools 0.12.1",
+ "image",
+ "itertools 0.14.0",
  "jemalloc_pprof",
  "json-patch 4.0.0",
- "lazy_static",
  "lettre",
  "maxminddb",
  "meilisearch-sdk",
  "murmur2",
+ "paste",
  "prometheus",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "redis",
  "regex",
- "reqwest 0.11.27",
+ "reqwest",
  "rust-s3",
  "rust_decimal",
  "rust_iso3166",
@@ -4497,12 +4355,12 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "sha1 0.6.1",
- "sha2 0.9.9",
+ "sha1",
+ "sha2",
  "spdx",
  "sqlx",
  "tar",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tikv-jemalloc-ctl",
  "tikv-jemallocator",
  "tokio",
@@ -4512,13 +4370,12 @@ dependencies = [
  "tracing-actix-web",
  "url",
  "urlencoding",
- "uuid 1.16.0",
+ "uuid 1.17.0",
  "validator",
  "webp",
  "woothee",
  "yaserde",
- "yaserde_derive",
- "zip 0.6.6",
+ "zip 3.0.0",
  "zxcvbn",
 ]
 
@@ -4534,7 +4391,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -4545,9 +4402,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "lettre"
-version = "0.11.15"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bc2b8eabb6a30b235d6f716f7f36479f4b38cbe65b8747aefee51f89e8437"
+checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2"
 dependencies = [
  "base64 0.22.1",
  "chumsky",
@@ -4557,12 +4414,13 @@ dependencies = [
  "futures-util",
  "hostname",
  "httpdate",
- "idna 1.0.3",
+ "idna",
  "mime",
- "native-tls",
  "nom 8.0.0",
  "percent-encoding",
  "quoted_printable",
+ "rustls 0.23.27",
+ "rustls-native-certs 0.8.1",
  "socket2",
  "tokio",
  "url",
@@ -4599,13 +4457,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
-name = "libdbus-sys"
-version = "0.2.5"
+name = "libfuzzer-sys"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
+checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
 dependencies = [
+ "arbitrary",
  "cc",
- "pkg-config",
 ]
 
 [[package]]
@@ -4618,31 +4476,11 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "liblzma"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a631d2b24be269775ba8f7789a6afa1ac228346a20c9e87dbbbe4975a79fd764"
-dependencies = [
- "liblzma-sys",
-]
-
-[[package]]
-name = "liblzma-sys"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efdadf1a99aceff34553de1461674ab6ac7e7f0843ae9875e339f4a14eb43475"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "libm"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
@@ -4650,7 +4488,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "libc",
  "redox_syscall",
 ]
@@ -4677,10 +4515,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "linked-hash-map"
-version = "0.5.6"
+name = "libz-rs-sys"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+dependencies = [
+ "zlib-rs",
+]
 
 [[package]]
 name = "linux-raw-sys"
@@ -4696,9 +4537,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "local-channel"
@@ -4734,32 +4575,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
-name = "lru-cache"
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
+
+[[package]]
+name = "lru-slab"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
-dependencies = [
- "linked-hash-map",
-]
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
-name = "lz4"
-version = "1.28.1"
+name = "lz4_flex"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4"
-dependencies = [
- "lz4-sys",
-]
-
-[[package]]
-name = "lz4-sys"
-version = "1.11.1+lz4-1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
-dependencies = [
- "cc",
- "libc",
-]
+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
 
 [[package]]
 name = "mac"
@@ -4767,15 +4614,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "mappings"
 version = "0.7.0"
@@ -4826,14 +4664,15 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "maxminddb"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6087e5d8ea14861bb7c7f573afbc7be3798d3ef0fae87ec4fd9a4de9a127c3c"
+checksum = "2a197e44322788858682406c74b0b59bf8d9b4954fe1f224d9a25147f1880bba"
 dependencies = [
  "ipnetwork",
  "log",
  "memchr",
  "serde",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -4844,7 +4683,17 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "maybe-rayon"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+dependencies = [
+ "cfg-if",
+ "rayon",
 ]
 
 [[package]]
@@ -4854,7 +4703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
  "cfg-if",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -4865,22 +4714,22 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "meilisearch-index-setting-macro"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "056e8c0652af81cc6525e0d9c0e1037ea7bcd77955dcd4aef1a1441be7ad7e55"
+checksum = "420f67f5943a0236eea7f199720cc465e806c48978d9b0fdc1fb62eceaee7556"
 dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
  "quote",
  "structmeta",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "meilisearch-sdk"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66958255878d712b4f2dece377a8661b41dc976ff15f564b91bfce8b4a619304"
+checksum = "2325355c73c96667178c09675389cfa7afc2382d5aa0e0d34d0cf29793d89090"
 dependencies = [
  "async-trait",
  "bytes",
@@ -4892,12 +4741,12 @@ dependencies = [
  "log",
  "meilisearch-index-setting-macro",
  "pin-project-lite",
- "reqwest 0.12.15",
+ "reqwest",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
  "time",
- "uuid 1.16.0",
+ "uuid 1.17.0",
  "wasm-bindgen-futures",
  "web-sys",
  "yaup",
@@ -4951,9 +4800,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "minisign-verify"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3"
+checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43"
 
 [[package]]
 name = "miniz_oxide"
@@ -4967,26 +4816,33 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "mio"
-version = "1.0.3"
+name = "moka"
+version = "0.12.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926"
 dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "crossbeam-channel",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "loom",
+ "parking_lot",
+ "portable-atomic",
+ "rustc_version",
+ "smallvec",
+ "tagptr",
+ "thiserror 1.0.69",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -4999,10 +4855,10 @@ dependencies = [
  "dpi",
  "gtk",
  "keyboard-types",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "once_cell",
  "png",
  "serde",
@@ -5024,21 +4880,22 @@ checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577"
 
 [[package]]
 name = "native-dialog"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e7038885d2aeab236bd60da9e159a5967b47cde3292da3b15ff1bec27c039f"
+checksum = "8f006431cea71a83e6668378cb5abc2d52af299cbac6dca1780c6eeca90822df"
 dependencies = [
  "ascii",
- "block",
- "cocoa",
- "core-foundation 0.9.4",
- "dirs-next",
- "objc",
- "objc-foundation",
- "objc_id",
- "once_cell",
- "raw-window-handle 0.5.2",
- "thiserror 1.0.69",
+ "block2 0.6.1",
+ "dirs",
+ "dispatch2 0.3.0",
+ "formatx",
+ "objc2 0.6.1",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.1",
+ "raw-window-handle",
+ "thiserror 2.0.12",
  "versions",
  "wfd",
  "which",
@@ -5068,12 +4925,12 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "jni-sys",
  "log",
  "ndk-sys",
  "num_enum",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "thiserror 1.0.69",
 ]
 
@@ -5100,11 +4957,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -5137,43 +4994,48 @@ dependencies = [
 ]
 
 [[package]]
-name = "normpath"
-version = "1.3.0"
+name = "noop_proc_macro"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
-dependencies = [
- "windows-sys 0.59.0",
-]
+checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
 [[package]]
 name = "notify"
-version = "6.1.1"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.9.0",
- "crossbeam-channel",
+ "bitflags 2.9.1",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
  "log",
- "mio 0.8.11",
+ "mio",
+ "notify-types",
  "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "notify-debouncer-mini"
-version = "0.4.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43"
+checksum = "a689eb4262184d9a1727f9087cd03883ea716682ab03ed24efec57d7716dccb8"
 dependencies = [
  "log",
  "notify",
+ "notify-types",
+ "tempfile",
 ]
 
+[[package]]
+name = "notify-types"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -5249,6 +5111,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "num-format"
 version = "0.4.4"
@@ -5328,7 +5201,7 @@ dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5337,26 +5210,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -5375,9 +5228,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
+checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
 dependencies = [
  "objc2-encode",
  "objc2-exception-helper",
@@ -5385,75 +5238,82 @@ dependencies = [
 
 [[package]]
 name = "objc2-app-kit"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb"
+checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
 dependencies = [
- "bitflags 2.9.0",
- "block2 0.6.0",
+ "bitflags 2.9.1",
+ "block2 0.6.1",
  "libc",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-core-image",
- "objc2-foundation 0.3.0",
- "objc2-quartz-core 0.3.0",
+ "objc2-foundation 0.3.1",
+ "objc2-quartz-core 0.3.1",
 ]
 
 [[package]]
 name = "objc2-cloud-kit"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c1948a9be5f469deadbd6bcb86ad7ff9e47b4f632380139722f7d9840c0d42c"
+checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
- "objc2-foundation 0.3.0",
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
 name = "objc2-core-data"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f860f8e841f6d32f754836f51e6bc7777cd7e7053cf18528233f6811d3eceb4"
+checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
- "objc2-foundation 0.3.0",
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
 name = "objc2-core-foundation"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
+ "bitflags 2.9.1",
+ "block2 0.6.1",
+ "dispatch2 0.3.0",
+ "libc",
+ "objc2 0.6.1",
 ]
 
 [[package]]
 name = "objc2-core-graphics"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02"
+checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
+ "bitflags 2.9.1",
+ "block2 0.6.1",
+ "dispatch2 0.3.0",
+ "libc",
+ "objc2 0.6.1",
  "objc2-core-foundation",
  "objc2-io-surface",
+ "objc2-metal 0.3.1",
 ]
 
 [[package]]
 name = "objc2-core-image"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ffa6bea72bf42c78b0b34e89c0bafac877d5f80bf91e159a5d96ea7f693ca56"
+checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e"
 dependencies = [
- "objc2 0.6.0",
- "objc2-foundation 0.3.0",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
@@ -5477,7 +5337,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -5485,25 +5345,35 @@ dependencies = [
 
 [[package]]
 name = "objc2-foundation"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
+checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+dependencies = [
+ "bitflags 2.9.1",
+ "block2 0.6.1",
+ "libc",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
 dependencies = [
- "bitflags 2.9.0",
- "block2 0.6.0",
  "libc",
- "objc2 0.6.0",
  "objc2-core-foundation",
 ]
 
 [[package]]
 name = "objc2-io-surface"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161a8b87e32610086e1a7a9e9ec39f84459db7b3a0881c1f16ca5a2605581c19"
+checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
  "objc2-core-foundation",
 ]
 
@@ -5513,22 +5383,33 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
 
 [[package]]
-name = "objc2-osa-kit"
-version = "0.3.0"
+name = "objc2-metal"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ac59da3ceebc4a82179b35dc550431ad9458f9cc326e053f49ba371ce76c5a"
+checksum = "7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
+]
+
+[[package]]
+name = "objc2-osa-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26bb88504b5a050dbba515d2414607bf5e57dd56b107bc5f0351197a3e7bdc5d"
+dependencies = [
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
@@ -5537,57 +5418,48 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
 ]
 
 [[package]]
 name = "objc2-quartz-core"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb3794501bb1bee12f08dcad8c61f2a5875791ad1c6f47faa71a0f033f20071"
+checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
- "objc2-foundation 0.3.0",
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
 name = "objc2-ui-kit"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777a571be14a42a3990d4ebedaeb8b54cd17377ec21b92e8200ac03797b3bee1"
+checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
 dependencies = [
- "bitflags 2.9.0",
- "objc2 0.6.0",
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
 name = "objc2-web-kit"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b717127e4014b0f9f3e8bba3d3f2acec81f1bde01f656823036e823ed2c94dce"
+checksum = "91672909de8b1ce1c2252e95bbee8c1649c9ad9d14b9248b3d7b4c47903c47ad"
 dependencies = [
- "bitflags 2.9.0",
- "block2 0.6.0",
- "objc2 0.6.0",
+ "bitflags 2.9.1",
+ "block2 0.6.1",
+ "objc2 0.6.1",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
+ "objc2-foundation 0.3.1",
 ]
 
 [[package]]
@@ -5604,18 +5476,16 @@ name = "once_cell"
 version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+dependencies = [
+ "critical-section",
+ "portable-atomic",
+]
 
 [[package]]
-name = "oncemutex"
-version = "0.1.1"
+name = "once_cell_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "open"
@@ -5629,26 +5499,13 @@ dependencies = [
  "pathdiff",
 ]
 
-[[package]]
-name = "opener"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681"
-dependencies = [
- "bstr",
- "dbus",
- "normpath",
- "url",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "openssl"
 version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -5665,7 +5522,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5674,24 +5531,14 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
-[[package]]
-name = "openssl-src"
-version = "300.5.0+3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
-version = "0.9.107"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -5702,23 +5549,13 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
-[[package]]
-name = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list 0.3.0",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "ordered-multimap"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
 dependencies = [
- "dlv-list 0.5.2",
+ "dlv-list",
  "hashbrown 0.14.5",
 ]
 
@@ -5734,9 +5571,9 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.10.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5"
+checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9"
 dependencies = [
  "log",
  "serde",
@@ -5749,8 +5586,8 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "732c71caeaa72c065bb69d7ea08717bd3f4863a4f451402fc9513e29dbd5261b"
 dependencies = [
- "objc2 0.6.0",
- "objc2-foundation 0.3.0",
+ "objc2 0.6.1",
+ "objc2-foundation 0.3.1",
  "objc2-osa-kit",
  "serde",
  "serde_json",
@@ -5772,7 +5609,7 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2 0.10.8",
+ "sha2",
 ]
 
 [[package]]
@@ -5835,17 +5672,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "487f2ccd1e17ce8c1bfab3a65c89525af41cfad4c8659021a1e9a2aacd73b89b"
 
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "password-hash"
 version = "0.5.0"
@@ -5869,18 +5695,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest 0.10.7",
- "hmac 0.12.1",
- "password-hash 0.4.2",
- "sha2 0.10.8",
-]
-
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -6000,7 +5814,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6030,26 +5844,6 @@ dependencies = [
  "siphasher 1.0.1",
 ]
 
-[[package]]
-name = "phonenumber"
-version = "0.3.7+8.13.52"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2247167dc3741816fdd4d3690e97f56a892a264b44f4c702078b72d1f8b6bd40"
-dependencies = [
- "bincode",
- "either",
- "fnv",
- "nom 7.1.3",
- "once_cell",
- "quick-xml 0.37.4",
- "regex",
- "regex-cache",
- "serde",
- "serde_derive",
- "strum",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.10"
@@ -6067,7 +5861,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6148,15 +5942,15 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.4"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi 0.5.1",
  "pin-project-lite",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -6167,6 +5961,15 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -6194,7 +5997,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.8.24",
+ "zerocopy",
 ]
 
 [[package]]
@@ -6251,7 +6054,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml_edit 0.22.24",
+ "toml_edit 0.22.26",
 ]
 
 [[package]]
@@ -6278,6 +6081,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.20+deprecated"
@@ -6295,32 +6120,50 @@ dependencies = [
 
 [[package]]
 name = "procfs"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
+checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "hex",
- "lazy_static",
  "procfs-core",
  "rustix 0.38.44",
 ]
 
 [[package]]
 name = "procfs-core"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "hex",
 ]
 
 [[package]]
-name = "prometheus"
-version = "0.13.4"
+name = "profiling"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
+dependencies = [
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "prometheus"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
 dependencies = [
  "cfg-if",
  "fnv",
@@ -6330,7 +6173,7 @@ dependencies = [
  "parking_lot",
  "procfs",
  "protobuf",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -6353,7 +6196,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6367,15 +6210,29 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.28.0"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
+checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
+dependencies = [
+ "once_cell",
+ "protobuf-support",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "protobuf-support"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
+dependencies = [
+ "thiserror 1.0.69",
+]
 
 [[package]]
 name = "psm"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58e5423e24c18cc840e1c98370b3993c6649cd1678b4d24318bcf0a083cbe88"
+checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
 dependencies = [
  "cc",
 ]
@@ -6409,22 +6266,37 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "quartz_nbt"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf389329ba2dad9c6d898b7955a64e58c89dd52d04f4e2753b9d86eb5f49821"
+dependencies = [
+ "anyhow",
+ "byteorder",
+ "cesu8",
+ "flate2",
+ "quartz_nbt_macros",
+ "serde",
+]
+
+[[package]]
+name = "quartz_nbt_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "289baa0c8a4d1f840d2de528a7f8c29e0e9af48b3018172b3edad4f716e8daed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "quick-error"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
-[[package]]
-name = "quick-xml"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.32.0"
@@ -6432,22 +6304,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.37.4"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4ce8c88de324ff838700f36fb6ab86c96df0e3c4ab6ef3a9b2044465cce1369"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
 dependencies = [
  "memchr",
+ "tokio",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.7"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3bd15a6f2967aef83887dcb9fec0014580467e33720d073560cf015a5683012"
+checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -6455,7 +6329,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "socket2",
  "thiserror 2.0.12",
  "tokio",
@@ -6465,16 +6339,17 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.10"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc"
+checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
 dependencies = [
  "bytes",
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
+ "lru-slab",
  "rand 0.9.1",
- "ring 0.17.14",
+ "ring",
  "rustc-hash",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.12",
@@ -6485,9 +6360,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5"
+checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
 dependencies = [
  "cfg_aliases",
  "libc",
@@ -6615,7 +6490,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -6624,7 +6499,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
 ]
 
 [[package]]
@@ -6646,10 +6521,54 @@ dependencies = [
 ]
 
 [[package]]
-name = "raw-window-handle"
-version = "0.5.2"
+name = "rav1e"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
+dependencies = [
+ "arbitrary",
+ "arg_enum_proc_macro",
+ "arrayvec",
+ "av1-grain",
+ "bitstream-io",
+ "built",
+ "cfg-if",
+ "interpolate_name",
+ "itertools 0.12.1",
+ "libc",
+ "libfuzzer-sys",
+ "log",
+ "maybe-rayon",
+ "new_debug_unreachable",
+ "noop_proc_macro",
+ "num-derive",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "profiling",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "simd_helpers",
+ "system-deps",
+ "thiserror 1.0.69",
+ "v_frame",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ravif"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6a5f31fcf7500f9401fea858ea4ab5525c99f2322cfcee732c0e6c74208c0c6"
+dependencies = [
+ "avif-serialize",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rayon",
+ "rgb",
+]
 
 [[package]]
 name = "raw-window-handle"
@@ -6679,17 +6598,15 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.27.6"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d8f99a4090c89cc489a94833c901ead69bfbf3877b4867d5482e321ee875bc"
+checksum = "0bc1ea653e0b2e097db3ebb5b7f678be339620b8041f66b30a308c1d45d36a7f"
 dependencies = [
- "ahash 0.8.11",
- "arc-swap",
- "async-trait",
+ "ahash 0.8.12",
  "bytes",
+ "cfg-if",
  "combine",
  "futures-util",
- "itertools 0.13.0",
  "itoa 1.0.15",
  "num-bigint",
  "percent-encoding",
@@ -6705,11 +6622,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -6718,7 +6635,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -6729,7 +6646,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror 2.0.12",
 ]
@@ -6766,18 +6683,6 @@ dependencies = [
  "regex-syntax 0.8.5",
 ]
 
-[[package]]
-name = "regex-cache"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7b62d69743b8b94f353b6b7c3deb4c5582828328bcb8d5fedf214373808793"
-dependencies = [
- "lru-cache",
- "oncemutex",
- "regex",
- "regex-syntax 0.6.29",
-]
-
 [[package]]
 name = "regex-lite"
 version = "0.1.6"
@@ -6806,51 +6711,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "reqwest"
-version = "0.11.27"
+name = "replace_with"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "hyper-tls 0.5.0",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "mime_guess",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.24.1",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots 0.25.4",
- "winreg 0.50.0",
-]
+checksum = "51743d3e274e2b18df81c4dc6caf8a5b8e15dbe799e0dca05c7617380094e884"
 
 [[package]]
 name = "reqwest"
@@ -6865,34 +6729,32 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.5",
- "hyper-tls 0.6.0",
+ "hyper-rustls 0.27.6",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
+ "mime_guess",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "rustls-native-certs 0.8.1",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls 0.26.2",
  "tokio-util",
  "tower 0.5.2",
@@ -6902,10 +6764,16 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
  "windows-registry 0.4.0",
 ]
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
+
 [[package]]
 name = "result"
 version = "1.0.0"
@@ -6918,7 +6786,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
  "subtle",
 ]
 
@@ -6929,18 +6797,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80c844748fdc82aae252ee4594a89b6e7ebef1063de7951545564cbc4e57075d"
 dependencies = [
  "ashpd",
- "block2 0.6.0",
- "dispatch2",
+ "block2 0.6.1",
+ "dispatch2 0.2.0",
  "glib-sys",
  "gobject-sys",
  "gtk-sys",
  "js-sys",
  "log",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
- "raw-window-handle 0.6.2",
+ "objc2-foundation 0.3.1",
+ "raw-window-handle",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -6956,21 +6824,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -6979,9 +6832,9 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
- "untrusted 0.9.0",
+ "untrusted",
  "windows-sys 0.52.0",
 ]
 
@@ -7000,7 +6853,7 @@ dependencies = [
  "rkyv_derive",
  "seahash",
  "tinyvec",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -7021,7 +6874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
 dependencies = [
  "const-oid",
- "digest 0.10.7",
+ "digest",
  "num-bigint-dig",
  "num-integer",
  "num-traits",
@@ -7034,16 +6887,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if",
- "ordered-multimap 0.4.3",
-]
-
 [[package]]
 name = "rust-ini"
 version = "0.21.1"
@@ -7051,39 +6894,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
 dependencies = [
  "cfg-if",
- "ordered-multimap 0.7.3",
+ "ordered-multimap",
  "trim-in-place",
 ]
 
 [[package]]
 name = "rust-s3"
-version = "0.33.0"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b2ac5ff6acfbe74226fa701b5ef793aaa054055c13ebb7060ad36942956e027"
+checksum = "c3df3f353b1f4209dcf437d777cda90279c397ab15a0cd6fd06bd32c88591533"
 dependencies = [
  "async-trait",
  "aws-creds",
  "aws-region",
- "base64 0.13.1",
+ "base64 0.22.1",
  "bytes",
  "cfg-if",
  "futures",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "http 0.2.12",
+ "hyper 0.14.32",
+ "hyper-rustls 0.24.2",
  "log",
  "maybe-async",
  "md5",
  "minidom",
  "percent-encoding",
- "quick-xml 0.26.0",
- "reqwest 0.11.27",
+ "quick-xml 0.32.0",
+ "rustls 0.21.12",
+ "rustls-native-certs 0.6.3",
  "serde",
  "serde_derive",
- "sha2 0.10.8",
+ "serde_json",
+ "sha2",
  "thiserror 1.0.69",
  "time",
  "tokio",
+ "tokio-rustls 0.24.1",
  "tokio-stream",
  "url",
 ]
@@ -7111,7 +6959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6268b74858287e1a062271b988a0c534bf85bbeb567fe09331bf40ed78113d5"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7153,7 +7001,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -7162,29 +7010,17 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
-dependencies = [
- "log",
- "ring 0.16.20",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "rustls"
 version = "0.21.12"
@@ -7192,36 +7028,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.17.14",
+ "ring",
  "rustls-webpki 0.101.7",
  "sct",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.14",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
  "log",
  "once_cell",
- "ring 0.17.14",
+ "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.1",
+ "rustls-webpki 0.103.3",
  "subtle",
  "zeroize",
 ]
@@ -7270,11 +7092,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
  "web-time",
+ "zeroize",
 ]
 
 [[package]]
@@ -7283,37 +7106,26 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
 dependencies = [
- "ring 0.17.14",
+ "ring",
  "rustls-pki-types",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.103.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
-dependencies = [
- "ring 0.17.14",
- "rustls-pki-types",
- "untrusted 0.9.0",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "rusty-money"
@@ -7387,7 +7199,7 @@ dependencies = [
  "serde",
  "serde_json",
  "url",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -7398,10 +7210,16 @@ checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde_derive_internals 0.29.1",
- "syn 2.0.100",
+ "serde_derive_internals",
+ "syn 2.0.101",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -7414,8 +7232,8 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
@@ -7426,14 +7244,13 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "sealed"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b5e421024b5e5edfbaa8e60ecf90bda9dbffc602dbb230e6028763f85f0c68c"
+checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107"
 dependencies = [
- "heck 0.3.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7456,7 +7273,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -7469,8 +7286,8 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.10.0",
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -7494,7 +7311,7 @@ checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
 dependencies = [
  "bitflags 1.3.2",
  "cssparser",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "fxhash",
  "log",
  "matches",
@@ -7517,13 +7334,13 @@ dependencies = [
 
 [[package]]
 name = "sentry"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066"
+checksum = "a505499b38861edd82b5a688fa06ba4ba5875bb832adeeeba22b7b23fc4bc39a"
 dependencies = [
  "httpdate",
- "reqwest 0.12.15",
- "rustls 0.22.4",
+ "reqwest",
+ "rustls 0.23.27",
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
@@ -7532,37 +7349,38 @@ dependencies = [
  "sentry-tracing",
  "tokio",
  "ureq",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "sentry-actix"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e461c7d3a46d298b5ffc66127c1f16454dd11d3d89fcfb21023cd499d82b9a78"
+checksum = "39ad8bfdcfbc6e0d0dacaa5728555085ef459fa9226cfc2fe64eefa4b8038b7f"
 dependencies = [
+ "actix-http",
  "actix-web",
+ "bytes",
  "futures-util",
  "sentry-core",
 ]
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a"
+checksum = "8dace796060e4ad10e3d1405b122ae184a8b2e71dce05ae450e4f81b7686b0d9"
 dependencies = [
  "backtrace",
- "once_cell",
  "regex",
  "sentry-core",
 ]
 
 [[package]]
 name = "sentry-contexts"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910"
+checksum = "87bd9e6b51ffe2bc7188ebe36cb67557cb95749c08a3f81f33e8c9b135e0d1bc"
 dependencies = [
  "hostname",
  "libc",
@@ -7574,12 +7392,11 @@ dependencies = [
 
 [[package]]
 name = "sentry-core"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30"
+checksum = "7426d4beec270cfdbb50f85f0bb2ce176ea57eed0b11741182a163055a558187"
 dependencies = [
- "once_cell",
- "rand 0.8.5",
+ "rand 0.9.1",
  "sentry-types",
  "serde",
  "serde_json",
@@ -7587,20 +7404,19 @@ dependencies = [
 
 [[package]]
 name = "sentry-debug-images"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a"
+checksum = "9df15c066c04f34c4dfd496a8e76590106b93283f72ef1a47d8fb24d88493424"
 dependencies = [
  "findshlibs",
- "once_cell",
  "sentry-core",
 ]
 
 [[package]]
 name = "sentry-panic"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63"
+checksum = "c92beed69b776a162b6d269bef1eaa3e614090b6df45a88d9b239c4fdbffdfba"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -7608,9 +7424,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-tracing"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec"
+checksum = "55c323492795de90824f3198562e33dd74ae3bc852fbb13c0cabec54a1cf73cd"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -7620,19 +7436,19 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.34.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f"
+checksum = "04b6c9287202294685cb1f749b944dbbce8160b81a1061ecddc073025fed129f"
 dependencies = [
  "debugid",
  "hex",
- "rand 0.8.5",
+ "rand 0.9.1",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "time",
  "url",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -7657,9 +7473,9 @@ dependencies = [
 
 [[package]]
 name = "serde-xml-rs"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782"
+checksum = "176b7ff880ab6ead7a020e773e9c096467fe347615a3e22ac29300cbdef67a5d"
 dependencies = [
  "log",
  "serde",
@@ -7694,18 +7510,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7716,7 +7521,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7791,7 +7596,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7812,7 +7617,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7851,10 +7656,10 @@ version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
- "darling 0.20.11",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7889,15 +7694,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -7906,7 +7702,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -7917,26 +7713,13 @@ checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 
 [[package]]
 name = "sha2"
-version = "0.9.9"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -7956,9 +7739,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -7969,7 +7752,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "rand_core 0.6.4",
 ]
 
@@ -7979,6 +7762,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "simd_helpers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
+dependencies = [
+ "quote",
+]
+
 [[package]]
 name = "simdutf8"
 version = "0.1.5"
@@ -8048,9 +7840,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -8064,14 +7856,14 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
 dependencies = [
  "bytemuck",
  "cfg_aliases",
- "core-graphics 0.24.0",
+ "core-graphics",
  "foreign-types 0.5.0",
  "js-sys",
  "log",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
  "objc2-quartz-core 0.2.2",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "redox_syscall",
  "wasm-bindgen",
  "web-sys",
@@ -8113,12 +7905,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -8140,9 +7926,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -8153,9 +7939,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -8168,7 +7954,7 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
  "hashlink",
  "indexmap 2.9.0",
  "log",
@@ -8176,37 +7962,37 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "rust_decimal",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "smallvec",
  "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
  "tracing",
  "url",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
 dependencies = [
  "proc-macro2",
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
@@ -8217,31 +8003,30 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "sqlx-core",
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.100",
- "tempfile",
+ "syn 2.0.101",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "byteorder",
  "bytes",
  "chrono",
  "crc",
- "digest 0.10.7",
+ "digest",
  "dotenvy",
  "either",
  "futures-channel",
@@ -8251,7 +8036,7 @@ dependencies = [
  "generic-array",
  "hex",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
  "itoa 1.0.15",
  "log",
  "md-5",
@@ -8262,8 +8047,8 @@ dependencies = [
  "rsa",
  "rust_decimal",
  "serde",
- "sha1 0.10.6",
- "sha2 0.10.8",
+ "sha1",
+ "sha2",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -8274,13 +8059,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "byteorder",
  "chrono",
  "crc",
@@ -8291,7 +8076,7 @@ dependencies = [
  "futures-util",
  "hex",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
  "home",
  "itoa 1.0.15",
  "log",
@@ -8302,7 +8087,7 @@ dependencies = [
  "rust_decimal",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -8313,9 +8098,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "chrono",
@@ -8344,9 +8129,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601f9201feb9b09c00266478bf459952b9ef9a6b94edb2f21eba14ab681a60a9"
+checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
 dependencies = [
  "cc",
  "cfg-if",
@@ -8409,12 +8194,6 @@ dependencies = [
  "unicode-properties",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -8430,7 +8209,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8441,29 +8220,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8496,21 +8253,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -8522,23 +8273,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "sys-info"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c"
-dependencies = [
- "cc",
- "libc",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8552,28 +8293,16 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.30.13"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+checksum = "79251336d17c72d9762b8b54be4befe38d2db56fbbc0241396d70f173c39d47a"
 dependencies = [
- "cfg-if",
- "core-foundation-sys",
  "libc",
+ "memchr",
  "ntapi",
- "once_cell",
- "rayon",
- "windows 0.52.0",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "system-configuration-sys 0.5.0",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows",
 ]
 
 [[package]]
@@ -8582,19 +8311,9 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.9.4",
- "system-configuration-sys 0.6.0",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -8620,15 +8339,21 @@ dependencies = [
  "version-compare",
 ]
 
+[[package]]
+name = "tagptr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
+
 [[package]]
 name = "tao"
 version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e59c1f38e657351a2e822eadf40d6a2ad4627b9c25557bc1180ec1b3295ef82"
 dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
+ "core-graphics",
  "crossbeam-channel",
  "dispatch",
  "dlopen2",
@@ -8643,18 +8368,18 @@ dependencies = [
  "ndk",
  "ndk-context",
  "ndk-sys",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "once_cell",
  "parking_lot",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "scopeguard",
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows 0.61.1",
- "windows-core 0.61.0",
+ "windows",
+ "windows-core",
  "windows-version",
  "x11-dl",
 ]
@@ -8667,7 +8392,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8695,17 +8420,17 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be03adf68fba02f87c4653da7bd73f40b0ecf9c6b7c2c39830f6981d0651912f"
+checksum = "e7b0bc1aec81bda6bc455ea98fcaed26b3c98c1648c627ad6ff1c704e8bf8cbc"
 dependencies = [
  "anyhow",
  "bytes",
- "dirs 6.0.0",
+ "dirs",
  "dunce",
  "embed_plist",
  "futures-util",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "glob",
  "gtk",
  "heck 0.5.0",
@@ -8716,14 +8441,14 @@ dependencies = [
  "log",
  "mime",
  "muda",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "objc2-ui-kit",
  "percent-encoding",
  "plist",
- "raw-window-handle 0.6.2",
- "reqwest 0.12.15",
+ "raw-window-handle",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_repr",
@@ -8742,7 +8467,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows 0.61.1",
+ "windows",
 ]
 
 [[package]]
@@ -8753,7 +8478,7 @@ checksum = "d7a0350f0df1db385ca5c02888a83e0e66655c245b7443db8b78a70da7d7f8fc"
 dependencies = [
  "anyhow",
  "cargo_toml",
- "dirs 6.0.0",
+ "dirs",
  "glob",
  "heck 0.5.0",
  "json-patch 3.0.1",
@@ -8776,7 +8501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93f035551bf7b11b3f51ad9bc231ebbe5e085565527991c16cf326aa38cdf47"
 dependencies = [
  "base64 0.22.1",
- "brotli",
+ "brotli 7.0.0",
  "ico",
  "json-patch 3.0.1",
  "plist",
@@ -8786,13 +8511,13 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "sha2 0.10.8",
- "syn 2.0.100",
+ "sha2",
+ "syn 2.0.101",
  "tauri-utils",
  "thiserror 2.0.12",
  "time",
  "url",
- "uuid 1.16.0",
+ "uuid 1.17.0",
  "walkdir",
 ]
 
@@ -8805,7 +8530,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "tauri-codegen",
  "tauri-utils",
 ]
@@ -8829,12 +8554,12 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-deep-link"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba4412f30eaff6f5d210e20383c2d6835593977402092e95b72497a4f8632fa"
+checksum = "e4976ac728ebc0487515aa956cfdf200abcc52b784e441493fc544bc6ce369c8"
 dependencies = [
  "dunce",
- "rust-ini 0.21.1",
+ "rust-ini",
  "serde",
  "serde_json",
  "tauri",
@@ -8843,18 +8568,18 @@ dependencies = [
  "thiserror 2.0.12",
  "tracing",
  "url",
- "windows-registry 0.5.1",
+ "windows-registry 0.5.2",
  "windows-result",
 ]
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcaf6e5d6062423a0f711a23c2a573ccba222b6a16a9322d8499928f27e41376"
+checksum = "a33318fe222fc2a612961de8b0419e2982767f213f54a4d3a21b0d7b85c41df8"
 dependencies = [
  "log",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "rfd",
  "serde",
  "serde_json",
@@ -8867,9 +8592,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88371e340ad2f07409a3b68294abe73f20bc9c1bc1b631a31dc37a3d0161f682"
+checksum = "33ead0daec5d305adcefe05af9d970fc437bcc7996052d564e7393eb291252da"
 dependencies = [
  "anyhow",
  "dunce",
@@ -8885,19 +8610,18 @@ dependencies = [
  "thiserror 2.0.12",
  "toml",
  "url",
- "uuid 1.16.0",
 ]
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.2.6"
+version = "2.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fdc6cb608e04b7d2b6d1f21e9444ad49245f6d03465ba53323d692d1ceb1a30"
+checksum = "66644b71a31ec1a8a52c4a16575edd28cf763c87cf4a7da24c884122b5c77097"
 dependencies = [
  "dunce",
  "glob",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "open",
  "schemars",
  "serde",
@@ -8906,7 +8630,7 @@ dependencies = [
  "tauri-plugin",
  "thiserror 2.0.12",
  "url",
- "windows 0.60.0",
+ "windows",
  "zbus",
 ]
 
@@ -8930,9 +8654,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.2.3"
+version = "2.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1320af4d866a7fb5f5721d299d14d0dd9e4e6bc0359ff3e263124a2bf6814efa"
+checksum = "97d0e07b40fb2eb13778e30778f5979347a2bf30e1b9d47f78ff7fe92d2e4b3d"
 dependencies = [
  "serde",
  "serde_json",
@@ -8950,7 +8674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73f05c38afd77a4b8fd98e8fb6f1cdbb5fbb8a46ba181eb2758b05321e3c6209"
 dependencies = [
  "base64 0.22.1",
- "dirs 6.0.0",
+ "dirs",
  "flate2",
  "futures-util",
  "http 1.3.1",
@@ -8959,7 +8683,7 @@ dependencies = [
  "minisign-verify",
  "osakit",
  "percent-encoding",
- "reqwest 0.12.15",
+ "reqwest",
  "semver",
  "serde",
  "serde_json",
@@ -8972,7 +8696,7 @@ dependencies = [
  "tokio",
  "url",
  "windows-sys 0.59.0",
- "zip 2.6.1",
+ "zip 2.4.2",
 ]
 
 [[package]]
@@ -8981,7 +8705,7 @@ version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a27a3fe49de72adbe0d84aee33c89a0b059722cd0b42aaeab29eaaee7f7535cd"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "log",
  "serde",
  "serde_json",
@@ -9001,15 +8725,15 @@ dependencies = [
  "gtk",
  "http 1.3.1",
  "jni",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-ui-kit",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "serde",
  "serde_json",
  "tauri-utils",
  "thiserror 2.0.12",
  "url",
- "windows 0.61.1",
+ "windows",
 ]
 
 [[package]]
@@ -9022,12 +8746,12 @@ dependencies = [
  "http 1.3.1",
  "jni",
  "log",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "once_cell",
  "percent-encoding",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "softbuffer",
  "tao",
  "tauri-runtime",
@@ -9035,7 +8759,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.61.1",
+ "windows",
  "wry",
 ]
 
@@ -9046,7 +8770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2900399c239a471bcff7f15c4399eb1a8c4fe511ba2853e07c996d771a5e0a4"
 dependencies = [
  "anyhow",
- "brotli",
+ "brotli 7.0.0",
  "cargo_metadata",
  "ctor",
  "dunce",
@@ -9073,30 +8797,31 @@ dependencies = [
  "toml",
  "url",
  "urlpattern",
- "uuid 1.16.0",
+ "uuid 1.17.0",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-winres"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56eaa45f707bedf34d19312c26d350bc0f3c59a47e58e8adbeecdc850d2c13a0"
+checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4"
 dependencies = [
  "embed-resource",
+ "indexmap 2.9.0",
  "toml",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
  "fastrand 2.3.0",
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.5",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -9124,69 +8849,71 @@ dependencies = [
 
 [[package]]
 name = "theseus"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "ariadne",
+ "async-compression",
  "async-recursion",
  "async-tungstenite",
+ "async-walkdir",
  "async_zip",
  "base64 0.22.1",
- "byteorder",
  "bytes",
  "chrono",
  "daedalus",
- "dashmap 6.1.0",
- "dirs 5.0.1",
+ "dashmap",
+ "dirs",
  "discord-rich-presence",
  "dunce",
  "either",
+ "enumset",
  "flate2",
+ "fs4",
  "futures",
+ "hickory-resolver",
  "indicatif",
- "lazy_static",
  "notify",
  "notify-debouncer-mini",
  "p256",
  "paste",
+ "quartz_nbt",
+ "quick-xml 0.37.5",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.15",
+ "reqwest",
  "serde",
  "serde_ini",
  "serde_json",
  "sha1_smol",
- "sha2 0.10.8",
+ "sha2",
  "sqlx",
- "sys-info",
  "sysinfo",
  "tauri",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
+ "tokio-util",
  "tracing",
  "tracing-error",
  "tracing-subscriber",
  "url",
- "uuid 1.16.0",
+ "uuid 1.17.0",
  "whoami",
- "winreg 0.52.0",
- "zip 0.6.6",
+ "winreg 0.55.0",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "theseus_gui"
-version = "0.9.3"
+version = "0.9.5"
 dependencies = [
  "chrono",
- "cocoa",
  "daedalus",
- "dashmap 6.1.0",
+ "dashmap",
+ "either",
+ "enumset",
  "native-dialog",
- "objc",
- "opener",
- "os_info",
  "paste",
- "rand 0.8.5",
  "serde",
  "serde_json",
  "serde_with",
@@ -9200,23 +8927,22 @@ dependencies = [
  "tauri-plugin-updater",
  "tauri-plugin-window-state",
  "theseus",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
  "tracing",
  "tracing-error",
  "url",
- "uuid 1.16.0",
- "window-shadows",
+ "urlencoding",
+ "uuid 1.17.0",
 ]
 
 [[package]]
 name = "theseus_playground"
 version = "0.0.0"
 dependencies = [
+ "enumset",
  "theseus",
  "tokio",
- "tracing",
- "webbrowser",
 ]
 
 [[package]]
@@ -9251,7 +8977,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9262,7 +8988,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9359,9 +9085,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -9384,14 +9110,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio 1.0.3",
+ "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
@@ -9409,7 +9135,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9438,7 +9164,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "tokio",
 ]
 
@@ -9455,9 +9181,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -9469,21 +9195,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.20"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.24",
+ "toml_edit 0.22.26",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 dependencies = [
  "serde",
 ]
@@ -9512,17 +9238,24 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap 2.9.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.7.6",
+ "toml_write",
+ "winnow 0.7.10",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+
 [[package]]
 name = "tonic"
 version = "0.12.3"
@@ -9534,7 +9267,7 @@ dependencies = [
  "axum",
  "base64 0.22.1",
  "bytes",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
@@ -9560,11 +9293,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f124352108f58ef88299e909f6e9470f1cdc8d2a1397963901b4a6366206bf72"
 dependencies = [
  "base32",
- "constant_time_eq 0.3.1",
- "hmac 0.12.1",
+ "constant_time_eq",
+ "hmac",
  "rand 0.9.1",
- "sha1 0.10.6",
- "sha2 0.10.8",
+ "sha1",
+ "sha2",
 ]
 
 [[package]]
@@ -9596,7 +9329,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -9636,7 +9369,7 @@ dependencies = [
  "mutually_exclusive_features",
  "pin-project",
  "tracing",
- "uuid 1.16.0",
+ "uuid 1.17.0",
 ]
 
 [[package]]
@@ -9647,7 +9380,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9707,14 +9440,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7eee98ec5c90daf179d55c20a49d8c0d043054ce7c26336c09a24d31f14fa0"
 dependencies = [
  "crossbeam-channel",
- "dirs 6.0.0",
+ "dirs",
  "libappindicator",
  "muda",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "once_cell",
  "png",
  "serde",
@@ -9736,21 +9469,20 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.23.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
- "byteorder",
  "bytes",
  "data-encoding",
  "http 1.3.1",
  "httparse",
  "log",
- "rand 0.8.5",
- "rustls 0.23.26",
+ "rand 0.9.1",
+ "rustls 0.23.27",
  "rustls-pki-types",
- "sha1 0.10.6",
- "thiserror 1.0.69",
+ "sha1",
+ "thiserror 2.0.12",
  "utf-8",
 ]
 
@@ -9884,12 +9616,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -9905,10 +9631,10 @@ dependencies = [
  "base64 0.22.1",
  "log",
  "once_cell",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "rustls-pki-types",
  "url",
- "webpki-roots 0.26.8",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -9918,7 +9644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 1.0.3",
+ "idna",
  "percent-encoding",
  "serde",
 ]
@@ -9947,12 +9673,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -9971,22 +9691,33 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "js-sys",
  "rand 0.9.1",
  "serde",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "v_frame"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+dependencies = [
+ "aligned-vec",
+ "num-traits",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "v_htmlescape"
 version = "0.15.8"
@@ -9995,13 +9726,12 @@ checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
 
 [[package]]
 name = "validator"
-version = "0.16.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd"
+checksum = "43fb22e1a008ece370ce08a3e9e4447a910e92621bb49b85d6e48a45397e7cfa"
 dependencies = [
- "idna 0.4.0",
- "lazy_static",
- "phonenumber",
+ "idna",
+ "once_cell",
  "regex",
  "serde",
  "serde_derive",
@@ -10012,28 +9742,16 @@ dependencies = [
 
 [[package]]
 name = "validator_derive"
-version = "0.16.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af"
+checksum = "b7df16e474ef958526d1205f6dda359fdfab79d9aa6d54bafcb92dcd07673dca"
 dependencies = [
- "if_chain",
- "lazy_static",
- "proc-macro-error",
+ "darling",
+ "once_cell",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
- "regex",
- "syn 1.0.109",
- "validator_types",
-]
-
-[[package]]
-name = "validator_types"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3"
-dependencies = [
- "proc-macro2",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -10062,12 +9780,12 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "versions"
-version = "5.0.1"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd"
+checksum = "80a7e511ce1795821207a837b7b1c8d8aca0c648810966ad200446ae58f6667f"
 dependencies = [
- "itertools 0.11.0",
- "nom 7.1.3",
+ "itertools 0.14.0",
+ "nom 8.0.0",
 ]
 
 [[package]]
@@ -10170,7 +9888,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "wasm-bindgen-shared",
 ]
 
@@ -10205,7 +9923,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10252,23 +9970,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webbrowser"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
-dependencies = [
- "core-foundation 0.9.4",
- "home",
- "jni",
- "log",
- "ndk-context",
- "objc",
- "raw-window-handle 0.5.2",
- "url",
- "web-sys",
-]
-
 [[package]]
 name = "webkit2gtk"
 version = "2.0.1"
@@ -10319,40 +10020,23 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f53152f51fb5af0c08484c33d16cca96175881d1f3dec068c23b31a158c2d99"
 dependencies = [
- "image 0.25.6",
  "libwebp-sys",
 ]
 
 [[package]]
-name = "webpki"
-version = "0.22.4"
+name = "webpki-roots"
+version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "webpki-roots 1.0.0",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -10365,9 +10049,9 @@ checksum = "b542b5cfbd9618c46c2784e4d41ba218c336ac70d44c55e47b251033e7d85601"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.61.1",
- "windows-core 0.61.0",
- "windows-implement 0.60.0",
+ "windows",
+ "windows-core",
+ "windows-implement",
  "windows-interface",
 ]
 
@@ -10379,7 +10063,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -10389,15 +10073,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ae2d11c4a686e4409659d7891791254cf9286d3cfe0eef54df1523533d22295"
 dependencies = [
  "thiserror 2.0.12",
- "windows 0.61.1",
- "windows-core 0.61.0",
+ "windows",
+ "windows-core",
 ]
 
 [[package]]
 name = "weezl"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
 
 [[package]]
 name = "wfd"
@@ -10411,14 +10095,14 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.4.2"
+version = "7.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762"
 dependencies = [
  "either",
- "home",
- "once_cell",
- "rustix 0.38.44",
+ "env_home",
+ "rustix 1.0.7",
+ "winsafe",
 ]
 
 [[package]]
@@ -10432,6 +10116,12 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -10463,76 +10153,32 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "window-shadows"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08"
-dependencies = [
- "cocoa",
- "objc",
- "raw-window-handle 0.5.2",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "window-vibrancy"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
 dependencies = [
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
- "raw-window-handle 0.6.2",
+ "objc2-foundation 0.3.1",
+ "raw-window-handle",
  "windows-sys 0.59.0",
  "windows-version",
 ]
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529"
-dependencies = [
- "windows-collections 0.1.1",
- "windows-core 0.60.1",
- "windows-future 0.1.1",
- "windows-link",
- "windows-numerics 0.1.1",
-]
-
 [[package]]
 name = "windows"
 version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
 dependencies = [
- "windows-collections 0.2.0",
- "windows-core 0.61.0",
- "windows-future 0.2.0",
+ "windows-collections",
+ "windows-core",
+ "windows-future",
  "windows-link",
- "windows-numerics 0.2.0",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec"
-dependencies = [
- "windows-core 0.60.1",
+ "windows-numerics",
 ]
 
 [[package]]
@@ -10541,73 +10187,31 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core 0.61.0",
+ "windows-core",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.60.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247"
-dependencies = [
- "windows-implement 0.59.0",
+ "windows-implement",
  "windows-interface",
  "windows-link",
  "windows-result",
- "windows-strings 0.3.1",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
-dependencies = [
- "windows-implement 0.60.0",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings 0.4.0",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
 name = "windows-future"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "windows-core 0.60.1",
+ "windows-core",
  "windows-link",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
-dependencies = [
- "windows-core 0.61.0",
- "windows-link",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "windows-threading",
 ]
 
 [[package]]
@@ -10618,7 +10222,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -10629,7 +10233,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -10638,23 +10242,13 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
-[[package]]
-name = "windows-numerics"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed"
-dependencies = [
- "windows-core 0.60.1",
- "windows-link",
-]
-
 [[package]]
 name = "windows-numerics"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-core 0.61.0",
+ "windows-core",
  "windows-link",
 ]
 
@@ -10671,20 +10265,20 @@ dependencies = [
 
 [[package]]
 name = "windows-registry"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1da3e436dc7653dfdf3da67332e22bff09bb0e28b0239e1624499c7830842e"
+checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
 dependencies = [
  "windows-link",
  "windows-result",
- "windows-strings 0.4.0",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
  "windows-link",
 ]
@@ -10700,9 +10294,9 @@ dependencies = [
 
 [[package]]
 name = "windows-strings"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
  "windows-link",
 ]
@@ -10805,6 +10399,15 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.4"
@@ -11005,9 +10608,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.6"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -11032,13 +10635,29 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.55.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -11051,31 +10670,23 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "wry"
 version = "0.51.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886a0a9d2a94fd90cfa1d929629b79cfefb1546e2c7430c63a47f0664c0e4e2"
+source = "git+https://github.com/modrinth/wry?rev=cafdaa9#cafdaa95068221787dd43d14dbd95a6a50bd88b5"
 dependencies = [
  "base64 0.22.1",
- "block2 0.6.0",
+ "block2 0.6.1",
  "cookie 0.18.1",
  "crossbeam-channel",
  "dpi",
  "dunce",
- "gdkx11",
  "gtk",
  "html5ever",
  "http 1.3.1",
@@ -11084,16 +10695,16 @@ dependencies = [
  "kuchikiki",
  "libc",
  "ndk",
- "objc2 0.6.0",
+ "objc2 0.6.1",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.0",
+ "objc2-foundation 0.3.1",
  "objc2-ui-kit",
  "objc2-web-kit",
  "once_cell",
  "percent-encoding",
- "raw-window-handle 0.6.2",
- "sha2 0.10.8",
+ "raw-window-handle",
+ "sha2",
  "soup3",
  "tao-macros",
  "thiserror 2.0.12",
@@ -11101,10 +10712,9 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.61.1",
- "windows-core 0.61.0",
+ "windows",
+ "windows-core",
  "windows-version",
- "x11-dl",
 ]
 
 [[package]]
@@ -11144,17 +10754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "rustix 1.0.5",
-]
-
-[[package]]
-name = "xdg-home"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
+ "rustix 1.0.7",
 ]
 
 [[package]]
@@ -11171,6 +10771,7 @@ checksum = "8bfa0d2b420fd005aa9b6f99f9584ebd964e6865d7ca787304cc1a3366c39231"
 dependencies = [
  "log",
  "xml-rs",
+ "yaserde_derive",
 ]
 
 [[package]]
@@ -11185,7 +10786,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_tokenstream",
- "syn 2.0.100",
+ "syn 2.0.101",
  "xml-rs",
 ]
 
@@ -11202,9 +10803,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -11214,25 +10815,24 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "synstructure",
 ]
 
 [[package]]
 name = "zbus"
-version = "5.5.0"
+version = "5.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
+checksum = "d3a7c7cee313d044fca3f48fa782cb750c79e4ca76ba7bc7718cd4024cdf6f68"
 dependencies = [
  "async-broadcast",
  "async-executor",
- "async-fs",
  "async-io",
  "async-lock",
  "async-process",
@@ -11249,13 +10849,11 @@ dependencies = [
  "ordered-stream",
  "serde",
  "serde_repr",
- "static_assertions",
  "tokio",
  "tracing",
  "uds_windows",
  "windows-sys 0.59.0",
- "winnow 0.7.6",
- "xdg-home",
+ "winnow 0.7.10",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -11263,14 +10861,14 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.5.0"
+version = "5.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
+checksum = "a17e7e5eec1550f747e71a058df81a9a83813ba0f6a95f39c4e218bdc7ba366a"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -11284,48 +10882,28 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
 dependencies = [
  "serde",
  "static_assertions",
- "winnow 0.7.6",
+ "winnow 0.7.10",
  "zvariant",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
-dependencies = [
- "zerocopy-derive 0.8.24",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -11345,7 +10923,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "synstructure",
 ]
 
@@ -11356,10 +10934,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zerotrie"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -11368,55 +10957,63 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2 0.4.4",
- "constant_time_eq 0.1.5",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac 0.12.1",
- "pbkdf2",
- "sha1 0.10.6",
- "time",
- "zstd 0.11.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zip"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744"
+checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
 dependencies = [
  "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "indexmap 2.9.0",
  "memchr",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
+name = "zip"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308"
 dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
+ "arbitrary",
+ "bzip2",
+ "crc32fast",
+ "deflate64",
+ "flate2",
+ "indexmap 2.9.0",
+ "memchr",
+ "zopfli",
+ "zstd",
+]
+
+[[package]]
+name = "zlib-rs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+
+[[package]]
+name = "zopfli"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -11425,17 +11022,7 @@ version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
 dependencies = [
- "zstd-safe 7.2.4",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
+ "zstd-safe",
 ]
 
 [[package]]
@@ -11457,6 +11044,12 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"
@@ -11467,31 +11060,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "zvariant"
-version = "5.4.0"
+name = "zune-jpeg"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2df9ee044893fcffbdc25de30546edef3e32341466811ca18421e3cd6c5a3ac"
+checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
+dependencies = [
+ "zune-core",
+]
+
+[[package]]
+name = "zvariant"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "static_assertions",
  "url",
- "winnow 0.7.6",
+ "winnow 0.7.10",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.4.0"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74170caa85b8b84cc4935f2d56a57c7a15ea6185ccdd7eadb57e6edd90f94b2f"
+checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
 dependencies = [
  "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
  "zvariant_utils",
 ]
 
@@ -11505,27 +11106,23 @@ dependencies = [
  "quote",
  "serde",
  "static_assertions",
- "syn 2.0.100",
- "winnow 0.7.6",
+ "syn 2.0.101",
+ "winnow 0.7.10",
 ]
 
 [[package]]
 name = "zxcvbn"
-version = "2.2.2"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "103fa851fff70ea29af380e87c25c48ff7faac5c530c70bd0e65366d4e0c94e4"
+checksum = "ad76e35b00ad53688d6b90c431cabe3cbf51f7a4a154739e04b63004ab1c736c"
 dependencies = [
+ "chrono",
  "derive_builder",
  "fancy-regex",
- "itertools 0.10.5",
- "js-sys",
+ "itertools 0.13.0",
  "lazy_static",
- "quick-error",
  "regex",
  "time",
+ "wasm-bindgen",
+ "web-sys",
 ]
-
-[[patch.unused]]
-name = "wry"
-version = "0.47.2"
-source = "git+https://github.com/modrinth/wry?rev=51907c6#51907c61541f2e389856f07773a32bac04f9a843"
diff --git a/Cargo.toml b/Cargo.toml
index 97d69a24..d9087574 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,25 +1,183 @@
 [workspace]
-resolver = '2'
+resolver = "2"
 members = [
-  './packages/app-lib',
-	'./apps/app-playground',
-  './apps/app',
-  './apps/labrinth',
-    './apps/daedalus_client',
-    './packages/daedalus',
-    './packages/ariadne',
+  "apps/app",
+  "apps/app-playground",
+  "apps/daedalus_client",
+  "apps/labrinth",
+  "packages/app-lib",
+  "packages/ariadne",
+  "packages/daedalus",
 ]
 
+[workspace.dependencies]
+actix-cors = "0.7.1"
+actix-files = "0.6.6"
+actix-http = "3.11.0"
+actix-multipart = "0.7.2"
+actix-rt = "2.10.0"
+actix-web = "4.11.0"
+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-recursion = "1.1.1"
+async-stripe = { version = "0.41.0", default-features = false, features = [
+  "runtime-tokio-hyper-rustls",
+] }
+async-trait = "0.1.88"
+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"
+bytes = "1.10.1"
+censor = "0.3.0"
+chrono = "0.4.41"
+clap = "4.5.38"
+clickhouse = "0.13.2"
+color-thief = "0.2.2"
+console-subscriber = "0.4.1"
+daedalus = { path = "packages/daedalus" }
+dashmap = "6.1.0"
+deadpool-redis = "0.21.1"
+dirs = "6.0.0"
+discord-rich-presence = "0.2.5"
+dotenv-build = "0.1.1"
+dotenvy = "0.15.7"
+dunce = "1.0.5"
+either = "1.15.0"
+enumset = "1.1.6"
+flate2 = "1.1.1"
+fs4 = { version = "0.13.1", default-features = false }
+futures = { version = "0.3.31", default-features = false }
+futures-util = "0.3.31"
+hex = "0.4.3"
+hickory-resolver = "0.25.2"
+hmac = "0.12.1"
+hyper-tls = "0.6.0"
+hyper-util = "0.1.11"
+iana-time-zone = "0.1.63"
+image = { version = "0.25.6", default-features = false, features = ["rayon"] }
+indexmap = "2.9.0"
+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 = [
+  "builder",
+  "hostname",
+  "pool",
+  "ring",
+  "rustls",
+  "rustls-native-certs",
+  "smtp-transport",
+] }
+maxminddb = "0.26.0"
+meilisearch-sdk = { version = "0.28.0", default-features = false }
+murmur2 = "0.1.0"
+native-dialog = "0.9.0"
+notify = { version = "8.0.0", default-features = false }
+notify-debouncer-mini = { version = "0.6.0", default-features = false }
+p256 = "0.13.2"
+paste = "1.0.15"
+prometheus = "0.14.0"
+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"
+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",
+] }
+rust_decimal = { version = "1.37.1", features = [
+  "serde-with-float",
+  "serde-with-str",
+] }
+rust_iso3166 = "0.1.14"
+rusty-money = "0.4.1"
+sentry = { version = "0.38.1", default-features = false, features = [
+  "backtrace",
+  "contexts",
+  "debug-images",
+  "panic",
+  "reqwest",
+  "rustls",
+] }
+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"
+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 }
+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-os = "2.2.1"
+tauri-plugin-single-instance = "2.2.3"
+tauri-plugin-updater = { version = "2.7.1", default-features = false, features = [
+  "rustls-tls",
+  "zip",
+] }
+tauri-plugin-window-state = "2.2.2"
+tempfile = "3.20.0"
+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-stream = "0.1.17"
+tokio-util = "0.7.15"
+totp-rs = "5.7.0"
+tracing = "0.1.41"
+tracing-actix-web = "0.7.18"
+tracing-error = "0.2.1"
+tracing-subscriber = "0.3.19"
+url = "2.5.4"
+urlencoding = "2.1.3"
+uuid = "1.16.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 = [
+  "bzip2",
+  "deflate",
+  "deflate64",
+  "zstd",
+] }
+zxcvbn = "3.1.0"
+
+[patch.crates-io]
+wry = { git = "https://github.com/modrinth/wry", rev = "cafdaa9" }
+
 # Optimize for speed and reduce size on release builds
 [profile.release]
-panic = "abort" # Strip expensive panic clean-up logic
-codegen-units = 1 # Compile crates one after another so the compiler can optimize better
-lto = true # Enables link to optimizations
-opt-level = "s" # Optimize for binary size
-strip = true # Remove debug symbols
+opt-level = "s"  # Optimize for binary size
+strip = true  # Remove debug symbols
+lto = true  # Enables link to optimizations
+panic = "abort"  # Strip expensive panic clean-up logic
+codegen-units = 1  # Compile crates one after another so the compiler can optimize better
 
 [profile.dev.package.sqlx-macros]
 opt-level = 3
-
-[patch.crates-io]
-wry = { git = "https://github.com/modrinth/wry", rev = "51907c6" }
diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json
index fe9390f9..fa6d8f92 100644
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@modrinth/app-frontend",
   "private": true,
-  "version": "0.9.3",
+  "version": "0.9.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -16,12 +16,13 @@
     "@modrinth/ui": "workspace:*",
     "@modrinth/utils": "workspace:*",
     "@sentry/vue": "^8.27.0",
-    "@tauri-apps/api": "^2.1.1",
-    "@tauri-apps/plugin-dialog": "^2.2.0",
-    "@tauri-apps/plugin-os": "^2.2.0",
-    "@tauri-apps/plugin-opener": "^2.2.1",
-    "@tauri-apps/plugin-updater": "^2.3.0",
-    "@tauri-apps/plugin-window-state": "^2.2.0",
+    "@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-updater": "^2.7.1",
+    "@tauri-apps/plugin-window-state": "^2.2.2",
     "@vintl/vintl": "^4.4.1",
     "dayjs": "^1.11.10",
     "floating-vue": "^5.2.2",
@@ -50,7 +51,8 @@
     "tsconfig": "workspace:*",
     "typescript": "^5.5.4",
     "vite": "^5.4.6",
-    "vue-tsc": "^2.1.6"
+    "vue-tsc": "^2.1.6",
+    "@taijased/vue-render-tracker": "^1.0.7"
   },
   "packageManager": "pnpm@9.4.0",
   "web-types": "../../web-types.json"
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 23ac007a..ff848251 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -16,14 +16,22 @@ import {
   RestoreIcon,
   RightArrowIcon,
   SettingsIcon,
+  WorldIcon,
   XIcon,
 } from '@modrinth/assets'
-import { Avatar, Button, ButtonStyled, Notifications, OverflowMenu } from '@modrinth/ui'
+import {
+  Avatar,
+  Button,
+  ButtonStyled,
+  Notifications,
+  OverflowMenu,
+  useRelativeTime,
+} from '@modrinth/ui'
 import { useLoading, useTheming } from '@/store/state'
 // import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
-import { get, set } from '@/helpers/settings'
+import { get, set } from '@/helpers/settings.ts'
 import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
@@ -61,6 +69,8 @@ import FriendsList from '@/components/ui/friends/FriendsList.vue'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 
+const formatRelativeTime = useRelativeTime()
+
 const themeStore = useTheming()
 
 const news = ref([])
@@ -177,15 +187,21 @@ async function setupApp() {
     }),
   )
 
-  // useFetch(
-  //   `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
-  //   'criticalAnnouncements',
-  //   true,
-  // ).then((res) => {
-  //   if (res && res.header && res.body) {
-  //     criticalErrorMessage.value = res
-  //   }
-  // })
+  //useFetch(
+  //  `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
+  //  'criticalAnnouncements',
+  //  true,
+  //)
+  //  .then((res) => {
+  //    if (res && res.header && res.body) {
+  //      criticalErrorMessage.value = res
+  //    }
+  //  })
+  //  .catch(() => {
+  //    console.log(
+  //      `No critical announcement found at https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
+  //    )
+  //  })
 
   useFetch(`https://modrinth.com/blog/news.json`, 'news', true).then((res) => {
     if (res && res.articles) {
@@ -374,7 +390,7 @@ function handleAuxClick(e) {
 <template>
   <SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
   <div id="teleports"></div>
-  <div v-if="stateInitialized" class="app-grid-layout relative">
+  <div v-if="stateInitialized" class="app-grid-layout experimental-styles-within relative">
     <Suspense>
       <AppSettingsModal ref="settingsModal" />
     </Suspense>
@@ -387,6 +403,9 @@ function handleAuxClick(e) {
       <NavButton v-tooltip.right="'Home'" to="/">
         <HomeIcon />
       </NavButton>
+      <NavButton v-if="themeStore.featureFlags.worlds_tab" v-tooltip.right="'Worlds'" to="/worlds">
+        <WorldIcon />
+      </NavButton>
       <NavButton
         v-tooltip.right="'Discover content'"
         to="/browse/modpack"
@@ -488,7 +507,7 @@ function handleAuxClick(e) {
             <RunningAppBar />
           </Suspense>
         </div>
-        <section v-if="!nativeDecorations" class="window-controls">
+        <section v-if="!nativeDecorations" class="window-controls" data-tauri-drag-region-exclude>
           <Button class="titlebar-button" icon-only @click="() => getCurrentWindow().minimize()">
             <MinimizeIcon />
           </Button>
@@ -595,7 +614,7 @@ function handleAuxClick(e) {
                 </h4>
                 <p class="my-1 text-sm text-secondary leading-tight">{{ item.summary }}</p>
                 <p class="text-right text-sm text-secondary opacity-60 leading-tight m-0">
-                  {{ dayjs(item.date).fromNow() }}
+                  {{ formatRelativeTime(dayjs(item.date).toISOString()) }}
                 </p>
               </a>
               <hr
@@ -719,6 +738,14 @@ function handleAuxClick(e) {
   grid-area: status;
 }
 
+[data-tauri-drag-region] {
+  -webkit-app-region: drag;
+}
+
+[data-tauri-drag-region-exclude] {
+  -webkit-app-region: no-drag;
+}
+
 .app-contents {
   position: absolute;
   z-index: 1;
diff --git a/apps/app-frontend/src/assets/external/gdlauncher.png b/apps/app-frontend/src/assets/external/gdlauncher.png
index 06081082..4f02315e 100644
Binary files a/apps/app-frontend/src/assets/external/gdlauncher.png and b/apps/app-frontend/src/assets/external/gdlauncher.png differ
diff --git a/apps/app-frontend/src/assets/font/minecraft_font.ttf b/apps/app-frontend/src/assets/font/minecraft_font.ttf
new file mode 100644
index 00000000..ae6a9eb0
Binary files /dev/null and b/apps/app-frontend/src/assets/font/minecraft_font.ttf differ
diff --git a/apps/app-frontend/src/assets/loading/cube.png b/apps/app-frontend/src/assets/loading/cube.png
index 427dfaa9..04478106 100644
Binary files a/apps/app-frontend/src/assets/loading/cube.png and b/apps/app-frontend/src/assets/loading/cube.png differ
diff --git a/apps/app-frontend/src/assets/stylesheets/global.scss b/apps/app-frontend/src/assets/stylesheets/global.scss
index 29876cc2..7ab08fd5 100644
--- a/apps/app-frontend/src/assets/stylesheets/global.scss
+++ b/apps/app-frontend/src/assets/stylesheets/global.scss
@@ -2,8 +2,44 @@
 @tailwind components;
 @tailwind utilities;
 
+@font-face {
+  font-family: 'bundled-minecraft-font-mrapp';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/regular.otf') format('opentype');
+}
+
+@font-face {
+  font-family: 'bundled-minecraft-font-mrapp';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/italic.otf') format('opentype');
+}
+
+@font-face {
+  font-family: 'bundled-minecraft-font-mrapp';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 600;
+  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/bold.otf') format('opentype');
+}
+
+@font-face {
+  font-family: 'bundled-minecraft-font-mrapp';
+  font-style: italic;
+  font-display: swap;
+  font-weight: 600;
+  src: url('https://cdn-raw.modrinth.com/fonts/minecraft/bold-italic.otf') format('opentype');
+}
+
+.font-minecraft {
+  font-family: 'bundled-minecraft-font-mrapp', monospace;
+}
+
 :root {
-  font-family: var(--font-standard);
+  font-family: var(--font-standard, sans-serif), sans-serif;
   color-scheme: dark;
   --view-width: calc(100% - 5rem);
   --expanded-view-width: calc(100% - 13rem);
diff --git a/apps/app-frontend/src/components/RowDisplay.vue b/apps/app-frontend/src/components/RowDisplay.vue
index 080301de..d4054648 100644
--- a/apps/app-frontend/src/components/RowDisplay.vue
+++ b/apps/app-frontend/src/components/RowDisplay.vue
@@ -10,7 +10,6 @@ import {
   StopCircleIcon,
   ExternalIcon,
   EyeIcon,
-  ChevronRightIcon,
 } from '@modrinth/assets'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 import Instance from '@/components/ui/Instance.vue'
@@ -26,6 +25,7 @@ import { trackEvent } from '@/helpers/analytics'
 import { handleSevereError } from '@/store/error.js'
 import { install as installVersion } from '@/store/install.js'
 import { openUrl } from '@tauri-apps/plugin-opener'
+import { HeadingLink } from '@modrinth/ui'
 
 const router = useRouter()
 
@@ -44,7 +44,9 @@ const props = defineProps({
 })
 
 const actualInstances = computed(() =>
-  props.instances.filter((x) => x && x.instances && x.instances[0]),
+  props.instances.filter(
+    (x) => (x && x.instances && x.instances[0] && x.show === undefined) || x.show,
+  ),
 )
 
 const modsRow = ref(null)
@@ -181,6 +183,10 @@ const maxInstancesPerRow = ref(1)
 const maxProjectsPerRow = ref(1)
 
 const calculateCardsPerRow = () => {
+  if (rows.value.length === 0) {
+    return
+  }
+
   // Calculate how many cards fit in one row
   const containerWidth = rows.value[0].clientWidth
   // Convert container width from pixels to rem
@@ -204,16 +210,21 @@ const calculateCardsPerRow = () => {
 
 const rowContainer = ref(null)
 const resizeObserver = ref(null)
+
 onMounted(() => {
   calculateCardsPerRow()
   resizeObserver.value = new ResizeObserver(calculateCardsPerRow)
-  resizeObserver.value.observe(rowContainer.value)
+  if (rowContainer.value) {
+    resizeObserver.value.observe(rowContainer.value)
+  }
   window.addEventListener('resize', calculateCardsPerRow)
 })
 
 onUnmounted(() => {
   window.removeEventListener('resize', calculateCardsPerRow)
-  resizeObserver.value.unobserve(rowContainer.value)
+  if (rowContainer.value) {
+    resizeObserver.value.unobserve(rowContainer.value)
+  }
 })
 </script>
 
@@ -227,17 +238,10 @@ onUnmounted(() => {
     @proceed="deleteProfile"
   />
   <div ref="rowContainer" class="flex flex-col gap-4">
-    <div v-for="(row, rowIndex) in actualInstances" ref="rows" :key="row.label" class="row">
-      <router-link
-        class="flex mb-3 leading-none items-center gap-1 text-primary text-lg font-bold hover:underline group"
-        :class="{ 'mt-1': rowIndex > 0 }"
-        :to="row.route"
-      >
+    <div v-for="row in actualInstances" ref="rows" :key="row.label" class="row">
+      <HeadingLink class="mt-1" :to="row.route">
         {{ row.label }}
-        <ChevronRightIcon
-          class="h-5 w-5 stroke-[3px] group-hover:translate-x-1 transition-transform group-hover:text-brand"
-        />
-      </router-link>
+      </HeadingLink>
       <section
         v-if="row.instance"
         ref="modsRow"
diff --git a/apps/app-frontend/src/components/ui/Breadcrumbs.vue b/apps/app-frontend/src/components/ui/Breadcrumbs.vue
index b0dcfcd1..d87c502f 100644
--- a/apps/app-frontend/src/components/ui/Breadcrumbs.vue
+++ b/apps/app-frontend/src/components/ui/Breadcrumbs.vue
@@ -19,6 +19,7 @@
           path: breadcrumb.link.replace('{id}', encodeURIComponent($route.params.id)),
           query: breadcrumb.query,
         }"
+        class="text-primary"
         >{{
           breadcrumb.name.charAt(0) === '?'
             ? breadcrumbData.getName(breadcrumb.name.slice(1))
diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue
index c3beffa9..3daac536 100644
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -14,7 +14,7 @@ import { ref, computed } from 'vue'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
 import { handleError } from '@/store/notifications.js'
 import { handleSevereError } from '@/store/error.js'
-import { cancel_directory_change } from '@/helpers/settings.js'
+import { cancel_directory_change } from '@/helpers/settings.ts'
 import { install } from '@/helpers/profile.js'
 import { trackEvent } from '@/helpers/analytics'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
diff --git a/apps/app-frontend/src/components/ui/Instance.vue b/apps/app-frontend/src/components/ui/Instance.vue
index 2b954f2a..f28c05a1 100644
--- a/apps/app-frontend/src/components/ui/Instance.vue
+++ b/apps/app-frontend/src/components/ui/Instance.vue
@@ -9,7 +9,7 @@ import {
   StopCircleIcon,
   TimerIcon,
 } from '@modrinth/assets'
-import { Avatar, ButtonStyled } from '@modrinth/ui'
+import { Avatar, ButtonStyled, useRelativeTime } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { finish_install, kill, run } from '@/helpers/profile'
 import { get_by_profile_path } from '@/helpers/process'
@@ -19,10 +19,9 @@ import { showProfileInFolder } from '@/helpers/utils.js'
 import { handleSevereError } from '@/store/error.js'
 import { trackEvent } from '@/helpers/analytics'
 import dayjs from 'dayjs'
-import relativeTime from 'dayjs/plugin/relativeTime'
 import { formatCategory } from '@modrinth/utils'
 
-dayjs.extend(relativeTime)
+const formatRelativeTime = useRelativeTime()
 
 const props = defineProps({
   instance: {
@@ -173,7 +172,9 @@ onUnmounted(() => unlisten())
       </div>
       <div class="flex items-center col-span-3 gap-1 text-secondary font-semibold">
         <TimerIcon />
-        <span class="text-sm"> Played {{ dayjs(instance.last_played).fromNow() }} </span>
+        <span class="text-sm">
+          Played {{ formatRelativeTime(dayjs(instance.last_played).toISOString()) }}
+        </span>
       </div>
     </div>
   </template>
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index 9d0c9b75..c09255a7 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="modal" header="Create instance">
+  <ModalWrapper ref="modal" header="Creating an instance">
     <div class="modal-header">
       <Chips v-model="creationType" :items="['custom', 'from file', 'import from launcher']" />
     </div>
diff --git a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
index 39fc6848..a8141a4a 100644
--- a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
+++ b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
@@ -70,7 +70,7 @@ const onHide = () => {
               v-for="version in filteredVersions"
               :key="version.id"
               class="table-row with-columns selectable"
-              @click="$router.push(`/project/${$route.params.id}/version/${version.id}`)"
+              @click="$router.push(`/project/${version.project_id}/version/${version.id}`)"
             >
               <div class="table-cell table-text">
                 <Button
diff --git a/apps/app-frontend/src/components/ui/NavButton.vue b/apps/app-frontend/src/components/ui/NavButton.vue
index 3bdc00c7..b723f2d7 100644
--- a/apps/app-frontend/src/components/ui/NavButton.vue
+++ b/apps/app-frontend/src/components/ui/NavButton.vue
@@ -7,7 +7,7 @@
       'router-link-active': isPrimary && isPrimary(route),
       'subpage-active': isSubpage && isSubpage(route),
     }"
-    class="w-12 h-12 rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast"
+    class="w-12 h-12 text-primary rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast"
   >
     <slot />
   </RouterLink>
diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue
index dd5dfe7a..d5112309 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -14,7 +14,10 @@
     <div v-if="selectedProcess" class="status">
       <span class="circle running" />
       <div ref="profileButton" class="running-text">
-        <router-link :to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`">
+        <router-link
+          class="text-primary"
+          :to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`"
+        >
           {{ selectedProcess.profile.name }}
         </router-link>
         <div v-if="currentProcesses.length > 1" class="arrow button-base" :class="{ rotate: showProfiles }"
diff --git a/apps/app-frontend/src/components/ui/SearchCard.vue b/apps/app-frontend/src/components/ui/SearchCard.vue
index b5131695..80edc736 100644
--- a/apps/app-frontend/src/components/ui/SearchCard.vue
+++ b/apps/app-frontend/src/components/ui/SearchCard.vue
@@ -124,8 +124,11 @@ import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { ref, computed } from 'vue'
 import { install as installVersion } from '@/store/install.js'
+import { useRouter } from 'vue-router'
 dayjs.extend(relativeTime)
 
+const router = useRouter()
+
 const props = defineProps({
   backgroundImage: {
     type: String,
@@ -168,6 +171,9 @@ async function install() {
       installing.value = false
       emit('install', props.project.project_id ?? props.project.id)
     },
+    (profile) => {
+      router.push(`/instance/${profile}`)
+    },
   )
 }
 
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
index c936489b..095e4d1e 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Avatar, ButtonStyled, OverflowMenu } from '@modrinth/ui'
+import { Avatar, ButtonStyled, OverflowMenu, useRelativeTime } from '@modrinth/ui'
 import {
   UserPlusIcon,
   MoreVerticalIcon,
@@ -18,6 +18,8 @@ import type { Dayjs } from 'dayjs'
 import dayjs from 'dayjs'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
+const formatRelativeTime = useRelativeTime()
+
 const props = defineProps<{
   credentials: unknown | null
   signIn: () => void
@@ -205,7 +207,9 @@ onUnmounted(() => {
                 You sent <span class="font-bold">{{ friend.username }}</span> a friend request
               </template>
             </p>
-            <p class="m-0 text-sm text-secondary">{{ friend.created.fromNow() }}</p>
+            <p class="m-0 text-sm text-secondary">
+              {{ formatRelativeTime(friend.created.toISOString()) }}
+            </p>
           </div>
           <div class="flex gap-2">
             <template v-if="friend.id === userCredentials.user_id">
diff --git a/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue b/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
index 1bfbe435..6803c350 100644
--- a/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
@@ -13,15 +13,17 @@ const confirmModal = ref(null)
 const installing = ref(false)
 
 const onInstall = ref(() => {})
+const onCreateInstance = ref(() => {})
 
 defineExpose({
-  show: (projectVal, versionIdVal, callback) => {
+  show: (projectVal, versionIdVal, callback, createInstanceCallback) => {
     project.value = projectVal
     versionId.value = versionIdVal
     installing.value = false
     confirmModal.value.show()
 
     onInstall.value = callback
+    onCreateInstance.value = createInstanceCallback
 
     trackEvent('PackInstallStart')
   },
@@ -36,6 +38,7 @@ async function install() {
     versionId.value,
     project.value.title,
     project.value.icon_url,
+    onCreateInstance.value,
   ).catch(handleError)
   trackEvent('PackInstall', {
     id: project.value.id,
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 f31ebd20..13be55ce 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -3,7 +3,7 @@ import { Checkbox } from '@modrinth/ui'
 import { computed, ref, watch } from 'vue'
 import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get } from '@/helpers/settings'
+import { get } from '@/helpers/settings.ts'
 import { edit } from '@/helpers/profile'
 import type { InstanceSettingsTabProps, AppSettings, Hooks } from '../../../helpers/types'
 
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
index fe09bef6..7867791a 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -7,7 +7,7 @@ import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import { get_max_memory } from '@/helpers/jre'
-import { get } from '@/helpers/settings'
+import { get } from '@/helpers/settings.ts'
 import type { InstanceSettingsTabProps, AppSettings, MemorySettings } from '../../../helpers/types'
 
 const { formatMessage } = useVIntl()
diff --git a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
index 53820da6..3f2f8827 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
@@ -3,7 +3,7 @@ import { Checkbox, Toggle } from '@modrinth/ui'
 import { computed, ref, type Ref, watch } from 'vue'
 import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
-import { get } from '@/helpers/settings'
+import { get } from '@/helpers/settings.ts'
 import { edit } from '@/helpers/profile'
 import type { AppSettings, InstanceSettingsTabProps } from '../../../helpers/types'
 
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index 62535aac..7bf5bba3 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -22,7 +22,7 @@ import { version as getOsVersion, platform as getOsPlatform } from '@tauri-apps/
 import { useTheming } from '@/store/state'
 import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { get, set } from '@/helpers/settings'
+import { get, set } from '@/helpers/settings.ts'
 
 const themeStore = useTheming()
 
diff --git a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
index 39689538..99c8c70c 100644
--- a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
@@ -41,6 +41,10 @@ const props = defineProps({
   //   type: Boolean,
   //   default: true,
   // },
+  markdown: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emit = defineEmits(['proceed'])
@@ -79,6 +83,7 @@ function proceed() {
     :on-hide="onModalHide"
     :noblur="!themeStore.advancedRendering"
     :danger="danger"
+    :markdown="markdown"
     @proceed="proceed"
   />
 </template>
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue b/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue
new file mode 100644
index 00000000..c28213ca
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import { ChevronRightIcon } from '@modrinth/assets'
+import { Avatar } from '@modrinth/ui'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import type { GameInstance } from '@/helpers/types'
+
+defineProps<{
+  instance: GameInstance
+}>()
+</script>
+<template>
+  <span class="flex items-center gap-2 text-lg font-semibold text-primary">
+    <Avatar
+      :src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
+      size="24px"
+      :tint-by="instance.path"
+    />
+    {{ instance.name }} <ChevronRightIcon />
+  </span>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
index aee4bdd7..139a316d 100644
--- a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { TeleportDropdownMenu, ThemeSelector, Toggle } from '@modrinth/ui'
 import { useTheming } from '@/store/state'
-import { get, set } from '@/helpers/settings'
+import { get, set } from '@/helpers/settings.ts'
 import { ref, watch } from 'vue'
 import { getOS } from '@/helpers/utils'
+import type { ColorTheme } from '@/store/theme.ts'
 
 const themeStore = useTheming()
 
@@ -24,13 +25,13 @@ watch(
 
   <ThemeSelector
     :update-color-theme="
-      (theme) => {
+      (theme: ColorTheme) => {
         themeStore.setThemeState(theme)
         settings.theme = theme
       }
     "
     :current-theme="settings.theme"
-    :theme-options="themeStore.themeOptions"
+    :theme-options="themeStore.getThemeOptions()"
     system-theme-color="system"
   />
 
@@ -80,10 +81,28 @@ watch(
       id="opening-page"
       v-model="settings.default_page"
       name="Opening page dropdown"
+      class="w-40"
       :options="['Home', 'Library']"
     />
   </div>
 
+  <div class="mt-4 flex items-center justify-between">
+    <div>
+      <h2 class="m-0 text-lg font-extrabold text-contrast">Jump back into worlds</h2>
+      <p class="m-0 mt-1">Includes recent worlds in the "Jump back in" section on the Home page.</p>
+    </div>
+    <Toggle
+      :model-value="themeStore.getFeatureFlag('worlds_in_home')"
+      @update:model-value="
+        () => {
+          const newValue = !themeStore.getFeatureFlag('worlds_in_home')
+          themeStore.featureFlags['worlds_in_home'] = newValue
+          settings.feature_flags['worlds_in_home'] = newValue
+        }
+      "
+    />
+  </div>
+
   <div class="mt-4 flex items-center justify-between">
     <div>
       <h2 class="m-0 text-lg font-extrabold text-contrast">Toggle sidebar</h2>
diff --git a/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue b/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
index a6e2f8be..ac43fb48 100644
--- a/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { get, set } from '@/helpers/settings'
+import { get, set } from '@/helpers/settings.ts'
 import { ref, watch } from 'vue'
 import { get_max_memory } from '@/helpers/jre'
 import { handleError } from '@/store/notifications'
diff --git a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
index 24d27feb..45034c24 100644
--- a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
@@ -2,18 +2,15 @@
 import { Toggle } from '@modrinth/ui'
 import { useTheming } from '@/store/state'
 import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings'
+import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
+import { DEFAULT_FEATURE_FLAGS, type FeatureFlag } from '@/store/theme.ts'
 
 const themeStore = useTheming()
 
-const settings = ref(await get())
-const options = ref(['project_background', 'page_path'])
+const settings = ref(await getSettings())
+const options = ref<FeatureFlag[]>(Object.keys(DEFAULT_FEATURE_FLAGS))
 
-function getStoreValue(key: string) {
-  return themeStore.featureFlags[key] ?? false
-}
-
-function setStoreValue(key: string, value: boolean) {
+function setFeatureFlag(key: string, value: boolean) {
   themeStore.featureFlags[key] = value
   settings.value.feature_flags[key] = value
 }
@@ -21,7 +18,7 @@ function setStoreValue(key: string, value: boolean) {
 watch(
   settings,
   async () => {
-    await set(settings.value)
+    await setSettings(settings.value)
   },
   { deep: true },
 )
@@ -30,14 +27,14 @@ watch(
   <div v-for="option in options" :key="option" class="mt-4 flex items-center justify-between">
     <div>
       <h2 class="m-0 text-lg font-extrabold text-contrast capitalize">
-        {{ option }}
+        {{ option.replaceAll('_', ' ') }}
       </h2>
     </div>
 
     <Toggle
       id="advanced-rendering"
-      :model-value="getStoreValue(option)"
-      @update:model-value="() => setStoreValue(option, !themeStore.featureFlags[option])"
+      :model-value="themeStore.getFeatureFlag(option)"
+      @update:model-value="() => setFeatureFlag(option, !themeStore.getFeatureFlag(option))"
     />
   </div>
 </template>
diff --git a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
index b2f959d7..fffe8b02 100644
--- a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings'
+import { get, set } from '@/helpers/settings.ts'
 import { Toggle } from '@modrinth/ui'
 import { optInAnalytics, optOutAnalytics } from '@/helpers/analytics'
 
diff --git a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
index f6731344..328e329c 100644
--- a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { Button, Slider } from '@modrinth/ui'
 import { ref, watch } from 'vue'
-import { get, set } from '@/helpers/settings.js'
+import { get, set } from '@/helpers/settings.ts'
 import { purge_cache_types } from '@/helpers/cache.js'
 import { handleError } from '@/store/notifications.js'
 import { BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
diff --git a/apps/app-frontend/src/components/ui/world/InstanceItem.vue b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
new file mode 100644
index 00000000..9ad0bbdc
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import {
+  EyeIcon,
+  FolderOpenIcon,
+  MoreVerticalIcon,
+  PlayIcon,
+  SpinnerIcon,
+  StopCircleIcon,
+} from '@modrinth/assets'
+import {
+  Avatar,
+  ButtonStyled,
+  commonMessages,
+  OverflowMenu,
+  SmartClickable,
+  useRelativeTime,
+} from '@modrinth/ui'
+import { useVIntl } from '@vintl/vintl'
+import { computed, nextTick, ref, onMounted, onUnmounted } from 'vue'
+import { showProfileInFolder } from '@/helpers/utils'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { useRouter } from 'vue-router'
+import type { GameInstance } from '@/helpers/types'
+import { get_project } from '@/helpers/cache'
+import { capitalizeString } from '@modrinth/utils'
+import { kill, run } from '@/helpers/profile'
+import { handleSevereError } from '@/store/error'
+import { trackEvent } from '@/helpers/analytics'
+import { get_by_profile_path } from '@/helpers/process'
+import { handleError } from '@/store/notifications'
+import { process_listener } from '@/helpers/events'
+
+const { formatMessage } = useVIntl()
+const formatRelativeTime = useRelativeTime()
+
+const router = useRouter()
+
+const emit = defineEmits<{
+  (e: 'play' | 'stop'): void
+}>()
+
+const props = defineProps<{
+  instance: GameInstance
+}>()
+
+const loadingModpack = ref(!!props.instance.linked_data)
+
+const modpack = ref()
+
+if (props.instance.linked_data) {
+  nextTick().then(async () => {
+    modpack.value = await get_project(props.instance.linked_data?.project_id, 'must_revalidate')
+    loadingModpack.value = false
+  })
+}
+
+const instanceIcon = computed(() => props.instance.icon_path)
+
+const loader = computed(() => {
+  if (props.instance.loader === 'vanilla') {
+    return 'Minecraft'
+  } else if (props.instance.loader === 'neoforge') {
+    return 'NeoForge'
+  } else {
+    return capitalizeString(props.instance.loader)
+  }
+})
+
+const loading = ref(false)
+const playing = ref(false)
+
+const play = async (event: MouseEvent) => {
+  event?.stopPropagation()
+  loading.value = true
+  await run(props.instance.path)
+    .catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
+    .finally(() => {
+      trackEvent('InstancePlay', {
+        loader: props.instance.loader,
+        game_version: props.instance.game_version,
+        source: 'InstanceItem',
+      })
+    })
+  emit('play')
+  loading.value = false
+}
+
+const stop = async (event: MouseEvent) => {
+  event?.stopPropagation()
+  loading.value = true
+  await kill(props.instance.path).catch(handleError)
+  trackEvent('InstanceStop', {
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
+    source: 'InstanceItem',
+  })
+  emit('stop')
+  loading.value = false
+}
+
+const unlistenProcesses = await process_listener(async () => {
+  await checkProcess()
+})
+
+const checkProcess = async () => {
+  const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)
+
+  playing.value = runningProcesses.length > 0
+}
+
+onMounted(() => {
+  checkProcess()
+})
+
+onUnmounted(() => {
+  unlistenProcesses()
+})
+</script>
+<template>
+  <SmartClickable>
+    <template #clickable>
+      <router-link
+        class="no-click-animation"
+        :to="`/instance/${encodeURIComponent(instance.path)}`"
+      />
+    </template>
+    <div
+      class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised rounded-xl smart-clickable:highlight-on-hover"
+    >
+      <Avatar
+        :src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
+        :tint-by="instance.path"
+        size="48px"
+      />
+      <div class="flex flex-col col-span-2 justify-between h-full">
+        <div class="flex items-center gap-2">
+          <div class="text-lg text-contrast font-bold truncate smart-clickable:underline-on-hover">
+            {{ instance.name }}
+          </div>
+        </div>
+        <div class="flex items-center gap-2 text-sm text-secondary">
+          <div
+            v-tooltip="
+              instance.last_played
+                ? dayjs(instance.last_played).format('MMMM D, YYYY [at] h:mm A')
+                : null
+            "
+            class="w-fit shrink-0"
+            :class="{ 'cursor-help smart-clickable:allow-pointer-events': instance.last_played }"
+          >
+            <template v-if="instance.last_played">
+              {{
+                formatMessage(commonMessages.playedLabel, {
+                  time: formatRelativeTime(instance.last_played.toISOString()),
+                })
+              }}
+            </template>
+            <template v-else> Not played yet </template>
+          </div>
+          •
+          <span v-if="modpack" class="flex items-center gap-1 truncate text-secondary">
+            <router-link
+              class="inline-flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
+              :to="`/project/${modpack.id}`"
+            >
+              <Avatar :src="modpack.icon_url" size="16px" class="shrink-0" />
+              <span class="truncate">{{ modpack.title }}</span>
+            </router-link>
+            ({{ loader }} {{ instance.game_version }})
+          </span>
+          <span v-else-if="loadingModpack" class="flex items-center gap-1 truncate text-secondary">
+            <SpinnerIcon class="animate-spin shrink-0" />
+            <span class="truncate">Loading modpack...</span>
+          </span>
+          <span v-else class="flex items-center gap-1 truncate text-secondary">
+            {{ loader }}
+            {{ instance.game_version }}
+          </span>
+        </div>
+      </div>
+      <div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
+        <ButtonStyled v-if="playing && !loading" color="red">
+          <button @click="stop">
+            <StopCircleIcon aria-hidden="true" />
+            {{ formatMessage(commonMessages.stopButton) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled v-else>
+          <button
+            v-tooltip="playing ? 'Instance is already open' : null"
+            :disabled="playing || loading"
+            @click="play"
+          >
+            <SpinnerIcon v-if="loading" class="animate-spin" />
+            <PlayIcon v-else aria-hidden="true" />
+            {{ formatMessage(commonMessages.playButton) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled circular type="transparent">
+          <OverflowMenu
+            :options="[
+              {
+                id: 'open-instance',
+                shown: !!instance.path,
+                action: () => router.push(encodeURI(`/instance/${instance.path}`)),
+              },
+              {
+                id: 'open-folder',
+                action: () => showProfileInFolder(instance.path),
+              },
+            ]"
+          >
+            <MoreVerticalIcon aria-hidden="true" />
+            <template #open-instance>
+              <EyeIcon aria-hidden="true" />
+              View instance
+            </template>
+            <template #open-folder>
+              <FolderOpenIcon aria-hidden="true" />
+              {{ formatMessage(commonMessages.openFolderButton) }}
+            </template>
+          </OverflowMenu>
+        </ButtonStyled>
+      </div>
+    </div>
+  </SmartClickable>
+</template>
diff --git a/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
new file mode 100644
index 00000000..18b2bedd
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
@@ -0,0 +1,304 @@
+<script setup lang="ts">
+import {
+  type ServerWorld,
+  type ServerData,
+  type WorldWithProfile,
+  get_recent_worlds,
+  getWorldIdentifier,
+  get_profile_protocol_version,
+  refreshServerData,
+  start_join_server,
+  start_join_singleplayer_world,
+} from '@/helpers/worlds.ts'
+import { HeadingLink, GAME_MODES } from '@modrinth/ui'
+import WorldItem from '@/components/ui/world/WorldItem.vue'
+import InstanceItem from '@/components/ui/world/InstanceItem.vue'
+import { watch, onMounted, onUnmounted, ref, computed } from 'vue'
+import type { Dayjs } from 'dayjs'
+import dayjs from 'dayjs'
+import { useTheming } from '@/store/theme.ts'
+import { kill, run } from '@/helpers/profile'
+import { handleError } from '@/store/notifications'
+import { trackEvent } from '@/helpers/analytics'
+import { process_listener, profile_listener } from '@/helpers/events'
+import { get_all } from '@/helpers/process'
+import type { GameInstance } from '@/helpers/types'
+import { handleSevereError } from '@/store/error'
+
+const props = defineProps<{
+  recentInstances: GameInstance[]
+}>()
+
+const theme = useTheming()
+
+const jumpBackInItems = ref<JumpBackInItem[]>([])
+const serverData = ref<Record<string, ServerData>>({})
+const protocolVersions = ref<Record<string, number | null>>({})
+
+const MIN_JUMP_BACK_IN = 3
+const MAX_JUMP_BACK_IN = 6
+const TWO_WEEKS_AGO = dayjs().subtract(14, 'day')
+
+type BaseJumpBackInItem = {
+  last_played: Dayjs
+  instance: GameInstance
+}
+
+type InstanceJumpBackInItem = BaseJumpBackInItem & {
+  type: 'instance'
+}
+
+type WorldJumpBackInItem = BaseJumpBackInItem & {
+  type: 'world'
+  world: WorldWithProfile
+}
+
+type JumpBackInItem = InstanceJumpBackInItem | WorldJumpBackInItem
+
+const showWorlds = computed(() => theme.getFeatureFlag('worlds_in_home'))
+
+watch([() => props.recentInstances, () => showWorlds.value], async () => {
+  await populateJumpBackIn().catch(() => {
+    console.error('Failed to populate jump back in')
+  })
+})
+
+await populateJumpBackIn().catch(() => {
+  console.error('Failed to populate jump back in')
+})
+
+async function populateJumpBackIn() {
+  console.info('Repopulating jump back in...')
+
+  const worldItems: WorldJumpBackInItem[] = []
+
+  if (showWorlds.value) {
+    const worlds = await get_recent_worlds(MAX_JUMP_BACK_IN, ['normal', 'favorite'])
+
+    worlds.forEach((world) => {
+      const instance = props.recentInstances.find((instance) => instance.path === world.profile)
+
+      if (!instance || !world.last_played) {
+        return
+      }
+
+      worldItems.push({
+        type: 'world',
+        last_played: dayjs(world.last_played),
+        world: world,
+        instance: instance,
+      })
+    })
+
+    const servers: {
+      instancePath: string
+      address: string
+    }[] = worldItems
+      .filter((item) => item.world.type === 'server' && item.instance)
+      .map((item) => ({
+        instancePath: item.instance.path,
+        address: (item.world as ServerWorld).address,
+      }))
+
+    // fetch protocol versions for all unique MC versions with server worlds
+    const uniqueServerInstances = new Set<string>(servers.map((x) => x.instancePath))
+    await Promise.all(
+      [...uniqueServerInstances].map((path) =>
+        get_profile_protocol_version(path)
+          .then((protoVer) => (protocolVersions.value[path] = protoVer))
+          .catch(() => {
+            console.error(`Failed to get profile protocol for: ${path} `)
+          }),
+      ),
+    )
+
+    // initialize server data
+    servers.forEach(({ address }) => {
+      if (!serverData.value[address]) {
+        serverData.value[address] = {
+          refreshing: true,
+        }
+      }
+    })
+
+    // fetch each server's data
+    Promise.all(
+      servers.map(({ instancePath, address }) =>
+        refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address),
+      ),
+    )
+  }
+
+  const instanceItems: InstanceJumpBackInItem[] = []
+  for (const instance of props.recentInstances) {
+    const worldItem = worldItems.find((item) => item.instance.path === instance.path)
+    if ((worldItem && worldItem.last_played.isAfter(TWO_WEEKS_AGO)) || !instance.last_played) {
+      continue
+    }
+
+    instanceItems.push({
+      type: 'instance',
+      last_played: dayjs(instance.last_played),
+      instance: instance,
+    })
+  }
+
+  const items: JumpBackInItem[] = [...worldItems, ...instanceItems]
+  items.sort((a, b) => dayjs(b.last_played).diff(dayjs(a.last_played)))
+  jumpBackInItems.value = items
+    .filter((item, index) => index < MIN_JUMP_BACK_IN || item.last_played.isAfter(TWO_WEEKS_AGO))
+    .slice(0, MAX_JUMP_BACK_IN)
+}
+
+async function refreshServer(address: string, instancePath: string) {
+  await refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address)
+}
+
+async function joinWorld(world: WorldWithProfile) {
+  console.log(`Joining world ${getWorldIdentifier(world)}`)
+  if (world.type === 'server') {
+    await start_join_server(world.profile, world.address).catch(handleError)
+  } else if (world.type === 'singleplayer') {
+    await start_join_singleplayer_world(world.profile, world.path).catch(handleError)
+  }
+}
+
+async function playInstance(instance: GameInstance) {
+  await run(instance.path)
+    .catch((err) => handleSevereError(err, { profilePath: instance.path }))
+    .finally(() => {
+      trackEvent('InstancePlay', {
+        loader: instance.loader,
+        game_version: instance.game_version,
+        source: 'WorldItem',
+      })
+    })
+}
+
+async function stopInstance(path: string) {
+  await kill(path).catch(handleError)
+  trackEvent('InstanceStop', {
+    source: 'RecentWorldsList',
+  })
+}
+
+const currentProfile = ref<string>()
+const currentWorld = ref<string>()
+
+const unlistenProcesses = await process_listener(async () => {
+  await checkProcesses()
+})
+
+const unlistenProfiles = await profile_listener(async () => {
+  await populateJumpBackIn().catch(() => {
+    console.error('Failed to populate jump back in')
+  })
+})
+
+const runningInstances = ref<string[]>([])
+
+type ProcessMetadata = {
+  uuid: string
+  profile_path: string
+  start_time: string
+}
+
+const checkProcesses = async () => {
+  const runningProcesses: ProcessMetadata[] = await get_all().catch(handleError)
+
+  const runningPaths = runningProcesses.map((x) => x.profile_path)
+
+  const stoppedInstances = runningInstances.value.filter((x) => !runningPaths.includes(x))
+  if (currentProfile.value && stoppedInstances.includes(currentProfile.value)) {
+    currentProfile.value = undefined
+    currentWorld.value = undefined
+  }
+
+  runningInstances.value = runningPaths
+}
+
+onMounted(() => {
+  checkProcesses()
+})
+
+onUnmounted(() => {
+  unlistenProcesses()
+  unlistenProfiles()
+})
+</script>
+
+<template>
+  <div v-if="jumpBackInItems.length > 0" class="flex flex-col gap-2">
+    <HeadingLink v-if="theme.getFeatureFlag('worlds_tab')" to="/worlds" class="mt-1">
+      Jump back in
+    </HeadingLink>
+    <span
+      v-else
+      class="flex mt-1 mb-3 leading-none items-center gap-1 text-primary text-lg font-bold"
+    >
+      Jump back in
+    </span>
+    <div class="grid-when-huge flex flex-col w-full gap-2">
+      <template
+        v-for="item in jumpBackInItems"
+        :key="`${item.instance.path}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
+      >
+        <WorldItem
+          v-if="item.type === 'world'"
+          :world="item.world"
+          :playing-instance="runningInstances.includes(item.instance.path)"
+          :playing-world="
+            currentProfile === item.instance.path && currentWorld === getWorldIdentifier(item.world)
+          "
+          :refreshing="
+            item.world.type === 'server'
+              ? serverData[item.world.address].refreshing && !serverData[item.world.address].status
+              : undefined
+          "
+          supports-quick-play
+          :server-status="
+            item.world.type === 'server' ? serverData[item.world.address].status : undefined
+          "
+          :rendered-motd="
+            item.world.type === 'server' ? serverData[item.world.address].renderedMotd : undefined
+          "
+          :current-protocol="protocolVersions[item.instance.path]"
+          :game-mode="
+            item.world.type === 'singleplayer' ? GAME_MODES[item.world.game_mode] : undefined
+          "
+          :instance-path="item.instance.path"
+          :instance-name="item.instance.name"
+          :instance-icon="item.instance.icon_path"
+          @refresh="
+            () =>
+              item.world.type === 'server'
+                ? refreshServer(item.world.address, item.instance.path)
+                : {}
+          "
+          @update="() => populateJumpBackIn()"
+          @play="
+            () => {
+              currentProfile = item.instance.path
+              currentWorld = getWorldIdentifier(item.world)
+              joinWorld(item.world)
+            }
+          "
+          @play-instance="
+            () => {
+              currentProfile = item.instance.path
+              playInstance(item.instance)
+            }
+          "
+          @stop="() => stopInstance(item.instance.path)"
+        />
+        <InstanceItem v-else :instance="item.instance" />
+      </template>
+    </div>
+  </div>
+</template>
+<style scoped lang="scss">
+.grid-when-huge {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(670px, 1fr));
+}
+</style>
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
new file mode 100644
index 00000000..3516a3b1
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -0,0 +1,524 @@
+<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 {
+  useRelativeTime,
+  Avatar,
+  ButtonStyled,
+  commonMessages,
+  OverflowMenu,
+  SmartClickable,
+} from '@modrinth/ui'
+import {
+  IssuesIcon,
+  EyeIcon,
+  ClipboardCopyIcon,
+  EditIcon,
+  FolderOpenIcon,
+  MoreVerticalIcon,
+  NoSignalIcon,
+  PlayIcon,
+  SignalIcon,
+  SkullIcon,
+  SpinnerIcon,
+  StopCircleIcon,
+  TrashIcon,
+  UpdatedIcon,
+  UserIcon,
+  XIcon,
+} from '@modrinth/assets'
+import type { MessageDescriptor } from '@vintl/vintl'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import type { Component } from 'vue'
+import { computed } from 'vue'
+import { copyToClipboard } from '@/helpers/utils'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { useRouter } from 'vue-router'
+import { Tooltip } from 'floating-vue'
+
+const { formatMessage } = useVIntl()
+const formatRelativeTime = useRelativeTime()
+
+const router = useRouter()
+
+const emit = defineEmits<{
+  (e: 'play' | 'play-instance' | 'update' | 'stop' | 'refresh' | 'edit' | 'delete'): void
+}>()
+
+const props = withDefaults(
+  defineProps<{
+    world: World
+    playingInstance?: boolean
+    playingWorld?: boolean
+    startingInstance?: boolean
+    supportsQuickPlay?: boolean
+    currentProtocol?: number | null
+    highlighted?: boolean
+
+    // Server only
+    refreshing?: boolean
+    serverStatus?: ServerStatus
+    renderedMotd?: string
+
+    // Singleplayer only
+    gameMode?: {
+      icon: Component
+      message: MessageDescriptor
+    }
+
+    // Instance
+    instancePath?: string
+    instanceName?: string
+    instanceIcon?: string
+  }>(),
+  {
+    playingInstance: false,
+    playingWorld: false,
+    startingInstance: false,
+    supportsQuickPlay: false,
+    currentProtocol: null,
+
+    refreshing: false,
+    serverStatus: undefined,
+    renderedMotd: undefined,
+
+    gameMode: undefined,
+
+    instancePath: undefined,
+    instanceName: undefined,
+    instanceIcon: undefined,
+  },
+)
+
+const playingOtherWorld = computed(() => props.playingInstance && !props.playingWorld)
+const hasPlayersTooltip = computed(
+  () => !!props.serverStatus?.players?.sample && props.serverStatus.players?.sample?.length > 0,
+)
+const serverIncompatible = computed(
+  () =>
+    !!props.serverStatus &&
+    !!props.serverStatus.version?.protocol &&
+    !!props.currentProtocol &&
+    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({
+  hardcore: {
+    id: 'instance.worlds.hardcore',
+    defaultMessage: 'Hardcore mode',
+  },
+  cantConnect: {
+    id: 'instance.worlds.cant_connect',
+    defaultMessage: "Can't connect to server",
+  },
+  aMinecraftServer: {
+    id: 'instance.worlds.a_minecraft_server',
+    defaultMessage: 'A Minecraft Server',
+  },
+  noQuickPlay: {
+    id: 'instance.worlds.no_quick_play',
+    defaultMessage: 'You can only jump straight into worlds on Minecraft 1.20+',
+  },
+  gameAlreadyOpen: {
+    id: 'instance.worlds.game_already_open',
+    defaultMessage: 'Instance is already open',
+  },
+  copyAddress: {
+    id: 'instance.worlds.copy_address',
+    defaultMessage: 'Copy address',
+  },
+  viewInstance: {
+    id: 'instance.worlds.view_instance',
+    defaultMessage: 'View instance',
+  },
+  playAnyway: {
+    id: 'instance.worlds.play_anyway',
+    defaultMessage: 'Play anyway',
+  },
+  playInstance: {
+    id: 'instance.worlds.play_instance',
+    defaultMessage: 'Play instance',
+  },
+  worldInUse: {
+    id: 'instance.worlds.world_in_use',
+    defaultMessage: 'World is in use',
+  },
+  dontShowOnHome: {
+    id: 'instance.worlds.dont_show_on_home',
+    defaultMessage: `Don't show on Home`,
+  },
+})
+</script>
+<template>
+  <SmartClickable>
+    <template v-if="instancePath" #clickable>
+      <router-link
+        class="no-click-animation"
+        :to="`/instance/${encodeURIComponent(instancePath)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
+      />
+    </template>
+    <div
+      class="grid grid-cols-[auto_minmax(0,3fr)_minmax(0,4fr)_auto] items-center gap-2 p-3 bg-bg-raised smart-clickable:highlight-on-hover rounded-xl"
+      :class="{
+        'world-item-highlighted': highlighted,
+      }"
+    >
+      <Avatar
+        :src="
+          world.type === 'server' && serverStatus ? serverStatus.favicon ?? world.icon : world.icon
+        "
+        size="48px"
+      />
+      <div class="flex flex-col justify-between h-full">
+        <div class="flex items-center gap-2">
+          <div class="text-lg text-contrast font-bold truncate smart-clickable:underline-on-hover">
+            {{ world.name }}
+          </div>
+          <div
+            v-if="world.type === 'singleplayer'"
+            class="text-sm text-secondary flex items-center gap-1 font-semibold"
+          >
+            <UserIcon
+              aria-hidden="true"
+              class="h-4 w-4 text-secondary shrink-0"
+              stroke-width="3px"
+            />
+            {{ formatMessage(commonMessages.singleplayerLabel) }}
+          </div>
+          <div
+            v-else-if="world.type === 'server'"
+            class="text-sm text-secondary flex items-center gap-1 font-semibold flex-nowrap whitespace-nowrap"
+          >
+            <template v-if="refreshing">
+              <SpinnerIcon aria-hidden="true" class="animate-spin shrink-0" />
+              Loading...
+            </template>
+            <template v-else-if="serverStatus">
+              <template v-if="serverIncompatible">
+                <IssuesIcon class="shrink-0 text-orange" aria-hidden="true" />
+                <span class="text-orange">
+                  Incompatible version {{ serverStatus.version?.name }}
+                </span>
+              </template>
+              <template v-else>
+                <SignalIcon
+                  v-tooltip="serverStatus ? `${serverStatus.ping}ms` : null"
+                  aria-hidden="true"
+                  :style="`--_signal-${getPingLevel(serverStatus.ping || 0)}: var(--color-green)`"
+                  stroke-width="3px"
+                  class="shrink-0"
+                  :class="{
+                    'smart-clickable:allow-pointer-events': serverStatus,
+                  }"
+                />
+                <Tooltip :disabled="!hasPlayersTooltip">
+                  <span :class="{ 'cursor-help': hasPlayersTooltip }">
+                    {{ formatNumber(serverStatus.players?.online, false) }} online
+                  </span>
+                  <template #popper>
+                    <div class="flex flex-col gap-1">
+                      <span v-for="player in serverStatus.players?.sample" :key="player.name">
+                        {{ player.name }}
+                      </span>
+                    </div>
+                  </template>
+                </Tooltip>
+              </template>
+            </template>
+            <template v-else>
+              <NoSignalIcon aria-hidden="true" stroke-width="3px" class="shrink-0" /> Offline
+            </template>
+          </div>
+        </div>
+        <div class="flex items-center gap-2 text-sm text-secondary">
+          <div
+            v-tooltip="
+              world.last_played ? dayjs(world.last_played).format('MMMM D, YYYY [at] h:mm A') : null
+            "
+            class="w-fit shrink-0"
+            :class="{ 'cursor-help smart-clickable:allow-pointer-events': world.last_played }"
+          >
+            <template v-if="world.last_played">
+              {{
+                formatMessage(commonMessages.playedLabel, {
+                  time: formatRelativeTime(dayjs(world.last_played).toISOString()),
+                })
+              }}
+            </template>
+            <template v-else> Not played yet </template>
+          </div>
+          <template v-if="instancePath">
+            •
+            <router-link
+              class="flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
+              :to="`/instance/${instancePath}`"
+            >
+              <Avatar
+                :src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
+                size="16px"
+                :tint-by="instancePath"
+                class="shrink-0"
+              />
+              <span class="truncate">{{ instanceName }}</span>
+            </router-link>
+          </template>
+        </div>
+      </div>
+      <div
+        class="font-semibold flex items-center gap-1 justify-center text-center"
+        :class="world.type === 'singleplayer' && world.hardcore ? `text-red` : 'text-secondary'"
+      >
+        <template v-if="world.type === 'server'">
+          <template v-if="refreshing">
+            <SpinnerIcon aria-hidden="true" class="animate-spin" />
+            {{ formatMessage(commonMessages.loadingLabel) }}
+          </template>
+          <div
+            v-else-if="renderedMotd"
+            class="motd-renderer font-normal font-minecraft line-clamp-2 text-secondary leading-5"
+            v-html="renderedMotd"
+          />
+          <div v-else-if="!serverStatus" class="font-normal font-minecraft text-red leading-5">
+            {{ formatMessage(messages.cantConnect) }}
+          </div>
+          <div v-else class="font-normal font-minecraft text-secondary leading-5">
+            {{ formatMessage(messages.aMinecraftServer) }}
+          </div>
+        </template>
+        <template v-else-if="world.type === 'singleplayer' && gameMode">
+          <template v-if="world.hardcore">
+            <SkullIcon aria-hidden="true" class="h-4 w-4 shrink-0" />
+            {{ formatMessage(messages.hardcore) }}
+          </template>
+          <template v-else>
+            <component :is="gameMode.icon" aria-hidden="true" class="h-4 w-4 shrink-0" />
+            {{ formatMessage(gameMode.message) }}
+          </template>
+        </template>
+      </div>
+      <div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
+        <template v-if="world.type === 'singleplayer' || serverStatus">
+          <ButtonStyled
+            v-if="(playingWorld || (locked && playingInstance)) && !startingInstance"
+            color="red"
+          >
+            <button @click="emit('stop')">
+              <StopCircleIcon aria-hidden="true" />
+              {{ formatMessage(commonMessages.stopButton) }}
+            </button>
+          </ButtonStyled>
+          <ButtonStyled v-else>
+            <button
+              v-tooltip="
+                serverIncompatible
+                  ? 'Server is incompatible'
+                  : !supportsQuickPlay
+                    ? formatMessage(messages.noQuickPlay)
+                    : playingOtherWorld || locked
+                      ? formatMessage(messages.gameAlreadyOpen)
+                      : null
+              "
+              :disabled="!supportsQuickPlay || playingOtherWorld || startingInstance"
+              @click="emit('play')"
+            >
+              <SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
+              <PlayIcon v-else aria-hidden="true" />
+              {{ formatMessage(commonMessages.playButton) }}
+            </button>
+          </ButtonStyled>
+        </template>
+        <ButtonStyled v-else>
+          <button class="invisible">
+            <PlayIcon aria-hidden="true" />
+            {{ formatMessage(commonMessages.playButton) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled circular type="transparent">
+          <OverflowMenu
+            :options="[
+              {
+                id: 'play-instance',
+                shown: !!instancePath,
+                disabled: playingInstance,
+                action: () => emit('play-instance'),
+              },
+              {
+                id: 'play-anyway',
+                shown: serverIncompatible && !playingInstance && supportsQuickPlay,
+                action: () => emit('play'),
+              },
+              {
+                id: 'open-instance',
+                shown: !!instancePath,
+                action: () => router.push(encodeURI(`/instance/${instancePath}`)),
+              },
+              {
+                id: 'refresh',
+                shown: world.type === 'server',
+                action: () => emit('refresh'),
+              },
+              {
+                id: 'copy-address',
+                shown: world.type === 'server',
+                action: () => copyToClipboard((world as ServerWorld).address),
+              },
+              {
+                id: 'edit',
+                action: () => emit('edit'),
+                shown: !instancePath,
+                disabled: locked,
+                tooltip: locked ? formatMessage(messages.worldInUse) : undefined,
+              },
+              {
+                id: 'open-folder',
+                shown: world.type === 'singleplayer',
+                action: () =>
+                  world.type === 'singleplayer' ? showWorldInFolder(instancePath, world.path) : {},
+              },
+              {
+                divider: true,
+                shown: !!instancePath,
+              },
+              {
+                id: 'dont-show-on-home',
+                shown: !!instancePath,
+                action: () => {
+                  set_world_display_status(
+                    instancePath,
+                    world.type,
+                    getWorldIdentifier(world),
+                    'hidden',
+                  ).then(() => {
+                    emit('update')
+                  })
+                },
+              },
+              {
+                divider: true,
+                shown: !instancePath,
+              },
+              {
+                id: 'delete',
+                color: 'red',
+                hoverFilled: true,
+                action: () => emit('delete'),
+                shown: !instancePath,
+                disabled: locked,
+                tooltip: locked ? formatMessage(messages.worldInUse) : undefined,
+              },
+            ]"
+          >
+            <MoreVerticalIcon aria-hidden="true" />
+            <template #play-instance>
+              <PlayIcon aria-hidden="true" />
+              {{ formatMessage(messages.playInstance) }}
+            </template>
+            <template #play-anyway>
+              <PlayIcon aria-hidden="true" />
+              {{ formatMessage(messages.playAnyway) }}
+            </template>
+            <template #open-instance>
+              <EyeIcon aria-hidden="true" />
+              {{ formatMessage(messages.viewInstance) }}
+            </template>
+            <template #edit>
+              <EditIcon aria-hidden="true" /> {{ formatMessage(commonMessages.editButton) }}
+            </template>
+            <template #open-folder>
+              <FolderOpenIcon aria-hidden="true" />
+              {{ formatMessage(commonMessages.openFolderButton) }}
+            </template>
+            <template #copy-address>
+              <ClipboardCopyIcon aria-hidden="true" /> {{ formatMessage(messages.copyAddress) }}
+            </template>
+            <template #refresh>
+              <UpdatedIcon aria-hidden="true" /> {{ formatMessage(commonMessages.refreshButton) }}
+            </template>
+            <template #dont-show-on-home>
+              <XIcon aria-hidden="true" />
+              {{ formatMessage(messages.dontShowOnHome) }}
+            </template>
+            <template #delete>
+              <TrashIcon aria-hidden="true" />
+              {{
+                formatMessage(
+                  world.type === 'server'
+                    ? commonMessages.removeButton
+                    : commonMessages.deleteLabel,
+                )
+              }}
+            </template>
+          </OverflowMenu>
+        </ButtonStyled>
+      </div>
+    </div>
+  </SmartClickable>
+</template>
+<style scoped lang="scss">
+.world-item-highlighted {
+  position: relative;
+  animation: fade-highlight 4s ease-out;
+  filter: brightness(1);
+
+  &::before {
+    @apply rounded-xl inset-0 absolute;
+
+    animation: fade-opacity 4s ease-out;
+
+    content: '';
+    box-shadow: 0 0 8px 2px var(--color-brand);
+    border: 1.5px solid var(--color-brand);
+    opacity: 0;
+  }
+}
+
+@keyframes fade-highlight {
+  0% {
+    filter: brightness(1.25);
+  }
+  75% {
+    filter: brightness(1.25);
+  }
+  100% {
+    filter: brightness(1);
+  }
+}
+
+@keyframes fade-opacity {
+  0% {
+    opacity: 0.5;
+  }
+  75% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+.light-mode .motd-renderer {
+  filter: brightness(0.75);
+}
+</style>
diff --git a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
new file mode 100644
index 00000000..00fab96e
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import { PlayIcon, PlusIcon, XIcon } from '@modrinth/assets'
+import { ButtonStyled, commonMessages } from '@modrinth/ui'
+import { ref } from 'vue'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import type { GameInstance } from '@/helpers/types'
+import InstanceModalTitlePrefix from '@/components/ui/modal/InstanceModalTitlePrefix.vue'
+import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { handleError } from '@/store/notifications'
+import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
+
+const { formatMessage } = useVIntl()
+
+const emit = defineEmits<{
+  submit: [server: ServerWorld, play: boolean]
+}>()
+
+const props = defineProps<{
+  instance: GameInstance
+}>()
+
+const modal = ref()
+
+const name = ref()
+const address = ref()
+const resourcePack = ref<ServerPackStatus>('enabled')
+
+async function addServer(play: boolean) {
+  const serverName = name.value ? name.value : address.value
+  const resourcePackStatus = resourcePack.value
+  const index =
+    (await add_server_to_profile(
+      props.instance.path,
+      serverName,
+      address.value,
+      resourcePackStatus,
+    ).catch(handleError)) ?? 0
+  emit(
+    'submit',
+    {
+      name: serverName,
+      type: 'server',
+      index,
+      address: address.value,
+      pack_status: resourcePackStatus,
+    },
+    play,
+  )
+  hide()
+}
+
+function show() {
+  name.value = ''
+  address.value = ''
+  resourcePack.value = 'enabled'
+  modal.value.show()
+}
+
+function hide() {
+  modal.value.hide()
+}
+
+const messages = defineMessages({
+  title: {
+    id: 'instance.add-server.title',
+    defaultMessage: 'Add a server',
+  },
+  addServer: {
+    id: 'instance.add-server.add-server',
+    defaultMessage: 'Add server',
+  },
+  addAndPlay: {
+    id: 'instance.add-server.add-and-play',
+    defaultMessage: 'Add and play',
+  },
+})
+
+defineExpose({ show, hide })
+</script>
+<template>
+  <ModalWrapper ref="modal">
+    <template #title>
+      <span class="flex items-center gap-2 text-lg font-semibold text-primary">
+        <InstanceModalTitlePrefix :instance="instance" />
+        <span class="font-extrabold text-contrast">{{ formatMessage(messages.title) }}</span>
+      </span>
+    </template>
+    <ServerModalBody
+      v-model:name="name"
+      v-model:address="address"
+      v-model:resource-pack="resourcePack"
+    />
+    <div class="flex gap-2 mt-4">
+      <ButtonStyled color="brand">
+        <button :disabled="!address" @click="addServer(true)">
+          <PlayIcon />
+          {{ formatMessage(messages.addAndPlay) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button :disabled="!address" @click="addServer(false)">
+          <PlusIcon />
+          {{ formatMessage(messages.addServer) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button @click="hide()">
+          <XIcon />
+          {{ formatMessage(commonMessages.cancelButton) }}
+        </button>
+      </ButtonStyled>
+    </div>
+  </ModalWrapper>
+</template>
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
new file mode 100644
index 00000000..5e03bbb8
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
@@ -0,0 +1,118 @@
+<script setup lang="ts">
+import { SaveIcon, XIcon } from '@modrinth/assets'
+import { ButtonStyled, commonMessages } from '@modrinth/ui'
+import { computed, ref } from 'vue'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import type { GameInstance } from '@/helpers/types'
+import {
+  type ServerPackStatus,
+  edit_server_in_profile,
+  type ServerWorld,
+  set_world_display_status,
+  type DisplayStatus,
+} from '@/helpers/worlds.ts'
+import { defineMessage, useVIntl } from '@vintl/vintl'
+import { handleError } from '@/store/notifications'
+import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
+import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
+
+const { formatMessage } = useVIntl()
+
+const emit = defineEmits<{
+  submit: [server: ServerWorld]
+}>()
+
+const props = defineProps<{
+  instance: GameInstance
+}>()
+
+const modal = ref()
+
+const name = ref<string>('')
+const address = ref<string>('')
+const resourcePack = ref<ServerPackStatus>('enabled')
+const index = ref<number>(0)
+const displayStatus = ref<DisplayStatus>('normal')
+const hideFromHome = ref(false)
+
+const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))
+
+async function saveServer() {
+  const serverName = name.value ? name.value : address.value
+  const resourcePackStatus = resourcePack.value
+  await edit_server_in_profile(
+    props.instance.path,
+    index.value,
+    serverName,
+    address.value,
+    resourcePackStatus,
+  ).catch(handleError)
+
+  if (newDisplayStatus.value !== displayStatus.value) {
+    await set_world_display_status(
+      props.instance.path,
+      'server',
+      address.value,
+      newDisplayStatus.value,
+    ).catch(handleError)
+  }
+
+  emit('submit', {
+    name: serverName,
+    type: 'server',
+    index: index.value,
+    address: address.value,
+    pack_status: resourcePackStatus,
+    display_status: newDisplayStatus.value,
+  })
+  hide()
+}
+
+function show(server: ServerWorld) {
+  name.value = server.name
+  address.value = server.address
+  resourcePack.value = server.pack_status
+  index.value = server.index
+  displayStatus.value = server.display_status
+  hideFromHome.value = server.display_status === 'hidden'
+  modal.value.show()
+}
+
+function hide() {
+  modal.value.hide()
+}
+
+defineExpose({ show })
+
+const titleMessage = defineMessage({
+  id: 'instance.edit-server.title',
+  defaultMessage: 'Edit server',
+})
+</script>
+<template>
+  <ModalWrapper ref="modal">
+    <template #title>
+      <span class="font-extrabold text-lg text-contrast">{{ formatMessage(titleMessage) }}</span>
+    </template>
+    <ServerModalBody
+      v-model:name="name"
+      v-model:address="address"
+      v-model:resource-pack="resourcePack"
+    />
+    <HideFromHomeOption v-model="hideFromHome" class="mt-3" />
+    <div class="flex gap-2 mt-4">
+      <ButtonStyled color="brand">
+        <button :disabled="!address" @click="saveServer">
+          <SaveIcon />
+          {{ formatMessage(commonMessages.saveChangesButton) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button @click="hide()">
+          <XIcon />
+          {{ formatMessage(commonMessages.cancelButton) }}
+        </button>
+      </ButtonStyled>
+    </div>
+  </ModalWrapper>
+</template>
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
new file mode 100644
index 00000000..19f5ecb2
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import { ChevronRightIcon, SaveIcon, XIcon, UndoIcon } from '@modrinth/assets'
+import { Avatar, ButtonStyled, commonMessages } from '@modrinth/ui'
+import { computed, ref } from 'vue'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import type { GameInstance } from '@/helpers/types'
+import type { DisplayStatus, SingleplayerWorld } from '@/helpers/worlds.ts'
+import { set_world_display_status, rename_world, reset_world_icon } from '@/helpers/worlds.ts'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { handleError } from '@/store/notifications'
+import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
+
+const { formatMessage } = useVIntl()
+
+const emit = defineEmits<{
+  submit: [path: string, name: string, removeIcon: boolean, displayStatus: DisplayStatus]
+}>()
+
+const props = defineProps<{
+  instance: GameInstance
+}>()
+
+const modal = ref()
+
+const icon = ref()
+const name = ref()
+const path = ref()
+const removeIcon = ref(false)
+const displayStatus = ref<DisplayStatus>('normal')
+const hideFromHome = ref(false)
+
+const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))
+
+async function saveWorld() {
+  await rename_world(props.instance.path, path.value, name.value).catch(handleError)
+
+  if (removeIcon.value) {
+    await reset_world_icon(props.instance.path, path.value).catch(handleError)
+  }
+  if (newDisplayStatus.value !== displayStatus.value) {
+    await set_world_display_status(
+      props.instance.path,
+      'singleplayer',
+      path.value,
+      newDisplayStatus.value,
+    )
+  }
+
+  emit('submit', path.value, name.value, removeIcon.value, newDisplayStatus.value)
+  hide()
+}
+
+function show(world: SingleplayerWorld) {
+  name.value = world.name
+  path.value = world.path
+  icon.value = world.icon
+  displayStatus.value = world.display_status
+  hideFromHome.value = world.display_status === 'hidden'
+  modal.value.show()
+}
+
+function hide() {
+  modal.value.hide()
+}
+
+defineExpose({ show })
+
+const messages = defineMessages({
+  title: {
+    id: 'instance.edit-world.title',
+    defaultMessage: 'Edit world',
+  },
+  name: {
+    id: 'instance.edit-world.name',
+    defaultMessage: 'Name',
+  },
+  placeholderName: {
+    id: 'instance.edit-world.placeholder-name',
+    defaultMessage: 'Minecraft World',
+  },
+  resetIcon: {
+    id: 'instance.edit-world.reset-icon',
+    defaultMessage: 'Reset icon',
+  },
+})
+</script>
+<template>
+  <ModalWrapper ref="modal">
+    <template #title>
+      <Avatar :src="removeIcon || !icon ? undefined : icon" size="24px" />
+      {{ instance.name }} <ChevronRightIcon />
+      <span class="font-extrabold text-lg text-contrast">{{ formatMessage(messages.title) }}</span>
+    </template>
+    <div class="w-[450px]">
+      <h2 class="text-lg font-extrabold text-contrast mt-0 mb-1">
+        {{ formatMessage(messages.name) }}
+      </h2>
+      <input
+        v-model="name"
+        type="text"
+        :placeholder="formatMessage(messages.placeholderName)"
+        class="w-full"
+        autocomplete="off"
+      />
+      <HideFromHomeOption v-model="hideFromHome" class="mt-3" />
+    </div>
+    <div class="flex gap-2 mt-4">
+      <ButtonStyled color="brand">
+        <button @click="saveWorld">
+          <SaveIcon />
+          {{ formatMessage(commonMessages.saveChangesButton) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button :disabled="removeIcon || !icon" @click="removeIcon = true">
+          <UndoIcon />
+          {{ formatMessage(messages.resetIcon) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button @click="hide()">
+          <XIcon />
+          {{ formatMessage(commonMessages.cancelButton) }}
+        </button>
+      </ButtonStyled>
+    </div>
+  </ModalWrapper>
+</template>
diff --git a/apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue b/apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue
new file mode 100644
index 00000000..024072b5
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { defineMessage, useVIntl } from '@vintl/vintl'
+import { computed } from 'vue'
+import { Checkbox } from '@modrinth/ui'
+
+const { formatMessage } = useVIntl()
+const value = defineModel<boolean>({ required: true })
+
+const labelMessage = defineMessage({
+  id: 'instance.edit-world.hide-from-home',
+  defaultMessage: `Hide from the Home page`,
+})
+
+const label = computed(() => formatMessage(labelMessage))
+</script>
+<template>
+  <Checkbox v-model="value" :label="label" />
+</template>
diff --git a/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue b/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
new file mode 100644
index 00000000..64c82b27
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/ServerModalBody.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import { TeleportDropdownMenu } from '@modrinth/ui'
+import type { ServerPackStatus } from '@/helpers/worlds.ts'
+import { type MessageDescriptor, defineMessages, useVIntl } from '@vintl/vintl'
+
+const { formatMessage } = useVIntl()
+
+const name = defineModel<string>('name')
+const address = defineModel<string>('address')
+const resourcePack = defineModel<ServerPackStatus>('resourcePack')
+
+const resourcePackOptions: ServerPackStatus[] = ['enabled', 'prompt', 'disabled']
+
+const resourcePackOptionMessages: Record<ServerPackStatus, MessageDescriptor> = defineMessages({
+  enabled: {
+    id: 'instance.add-server.resource-pack.enabled',
+    defaultMessage: 'Enabled',
+  },
+  prompt: {
+    id: 'instance.add-server.resource-pack.prompt',
+    defaultMessage: 'Prompt',
+  },
+  disabled: {
+    id: 'instance.add-server.resource-pack.disabled',
+    defaultMessage: 'Disabled',
+  },
+})
+
+const messages = defineMessages({
+  name: {
+    id: 'instance.server-modal.name',
+    defaultMessage: 'Name',
+  },
+  address: {
+    id: 'instance.server-modal.address',
+    defaultMessage: 'Address',
+  },
+  resourcePack: {
+    id: 'instance.server-modal.resource-pack',
+    defaultMessage: 'Resource pack',
+  },
+  placeholderName: {
+    id: 'instance.server-modal.placeholder-name',
+    defaultMessage: 'Minecraft Server',
+  },
+})
+
+defineExpose({ resourcePackOptions })
+</script>
+<template>
+  <div class="w-[450px]">
+    <h2 class="text-lg font-extrabold text-contrast mt-0 mb-1">
+      {{ formatMessage(messages.name) }}
+    </h2>
+    <input
+      v-model="name"
+      type="text"
+      :placeholder="formatMessage(messages.placeholderName)"
+      class="w-full"
+      autocomplete="off"
+    />
+    <h2 class="text-lg font-extrabold text-contrast mt-3 mb-1">
+      {{ formatMessage(messages.address) }}
+    </h2>
+    <input
+      v-model="address"
+      type="text"
+      placeholder="example.modrinth.gg"
+      class="w-full"
+      autocomplete="off"
+    />
+    <h2 class="text-lg font-extrabold text-contrast mt-3 mb-1">
+      {{ formatMessage(messages.resourcePack) }}
+    </h2>
+    <div>
+      <TeleportDropdownMenu
+        v-model="resourcePack"
+        :options="resourcePackOptions"
+        name="Server resource pack"
+        :display-name="
+          (option: ServerPackStatus) => formatMessage(resourcePackOptionMessages[option])
+        "
+      />
+    </div>
+  </div>
+</template>
diff --git a/apps/app-frontend/src/helpers/analytics.js b/apps/app-frontend/src/helpers/analytics.js
index 90d2c8ae..6fa5ea3a 100644
--- a/apps/app-frontend/src/helpers/analytics.js
+++ b/apps/app-frontend/src/helpers/analytics.js
@@ -1,8 +1,9 @@
 import { posthog } from 'posthog-js'
 
 export const initAnalytics = () => {
-  posthog.init('phc_hm2ihMpTAoE86xIm7XzsCB8RPiTRKivViK5biiHedm', {
+  posthog.init('phc_9Iqi6lFs9sr5BSqh9RRNRSJ0mATS9PSgirDiX3iOYJ', {
     persistence: 'localStorage',
+    api_host: 'https://posthog.modrinth.com',
   })
 }
 
diff --git a/apps/app-frontend/src/helpers/events.js b/apps/app-frontend/src/helpers/events.js
index 0ed28836..81a849b9 100644
--- a/apps/app-frontend/src/helpers/events.js
+++ b/apps/app-frontend/src/helpers/events.js
@@ -62,7 +62,7 @@ export async function process_listener(callback) {
     ProfilePayload {
         uuid: unique identification of the process in the state (currently identified by path, but that will change)
         name: name of the profile
-        profile_path: relative path to profile (used for path identification)
+        profile_path: relative path toprofile_listener profile (used for path identification)
         path: path to profile (used for opening the profile in the OS file explorer)
         event: event type ("Created", "Added", "Edited", "Removed")
     }
diff --git a/apps/app-frontend/src/helpers/pack.js b/apps/app-frontend/src/helpers/pack.js
index c175f903..2026ec12 100644
--- a/apps/app-frontend/src/helpers/pack.js
+++ b/apps/app-frontend/src/helpers/pack.js
@@ -7,7 +7,13 @@ import { invoke } from '@tauri-apps/api/core'
 import { create } from './profile'
 
 // Installs pack from a version ID
-export async function create_profile_and_install(projectId, versionId, packTitle, iconUrl) {
+export async function create_profile_and_install(
+  projectId,
+  versionId,
+  packTitle,
+  iconUrl,
+  createInstanceCallback = () => {},
+) {
   const location = {
     type: 'fromVersionId',
     project_id: projectId,
@@ -24,6 +30,7 @@ export async function create_profile_and_install(projectId, versionId, packTitle
     null,
     true,
   )
+  createInstanceCallback(profile)
 
   return await invoke('plugin:pack|pack_install', { location, profile })
 }
diff --git a/apps/app-frontend/src/helpers/settings.js b/apps/app-frontend/src/helpers/settings.js
deleted file mode 100644
index b27bfe90..00000000
--- a/apps/app-frontend/src/helpers/settings.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- *  and deserialized into a usable JS object.
- */
-import { invoke } from '@tauri-apps/api/core'
-
-// Settings object
-/*
-
-Settings {
-    "memory": MemorySettings,
-    "game_resolution": [int int],
-    "custom_java_args": [String ...],
-    "custom_env_args" : [(string, string) ... ]>,
-    "java_globals": Hash of (string, Path),
-    "default_user": Uuid string (can be null),
-    "hooks": Hooks,
-    "max_concurrent_downloads": uint,
-    "version": u32,
-    "collapsed_navigation": bool,
-}
-
-Memorysettings {
-    "min": u32, can be null,
-    "max": u32,
-}
-
-*/
-
-// Get full settings object
-export async function get() {
-  return await invoke('plugin:settings|settings_get')
-}
-
-// Set full settings object
-export async function set(settings) {
-  return await invoke('plugin:settings|settings_set', { settings })
-}
-
-export async function cancel_directory_change() {
-  return await invoke('plugin:settings|cancel_directory_change')
-}
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
new file mode 100644
index 00000000..2988d34d
--- /dev/null
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -0,0 +1,78 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ *  and deserialized into a usable JS object.
+ */
+import { invoke } from '@tauri-apps/api/core'
+import type { ColorTheme, FeatureFlag } from '@/store/theme.ts'
+import type { Hooks, MemorySettings, WindowSize } from '@/helpers/types'
+
+// Settings object
+/*
+
+Settings {
+    "memory": MemorySettings,
+    "game_resolution": [int int],
+    "custom_java_args": [String ...],
+    "custom_env_args" : [(string, string) ... ]>,
+    "java_globals": Hash of (string, Path),
+    "default_user": Uuid string (can be null),
+    "hooks": Hooks,
+    "max_concurrent_downloads": uint,
+    "version": u32,
+    "collapsed_navigation": bool,
+}
+
+Memorysettings {
+    "min": u32, can be null,
+    "max": u32,
+}
+
+*/
+
+export type AppSettings = {
+  max_concurrent_downloads: number
+  max_concurrent_writes: number
+
+  theme: ColorTheme
+  default_page: 'home' | 'library'
+  collapsed_navigation: boolean
+  advanced_rendering: boolean
+  native_decorations: boolean
+  toggle_sidebar: boolean
+
+  telemetry: boolean
+  discord_rpc: boolean
+  personalized_ads: boolean
+
+  onboarded: boolean
+
+  extra_launch_args: string[]
+  custom_env_vars: [string, string][]
+  memory: MemorySettings
+  force_fullscreen: boolean
+  game_resolution: WindowSize
+  hide_on_process_start: boolean
+  hooks: Hooks
+
+  custom_dir?: string | null
+  prev_custom_dir?: string | null
+  migrated: boolean
+
+  developer_mode: boolean
+  feature_flags: Record<FeatureFlag, boolean>
+}
+
+// Get full settings object
+export async function get() {
+  return (await invoke('plugin:settings|settings_get')) as AppSettings
+}
+
+// Set full settings object
+export async function set(settings: AppSettings) {
+  return await invoke('plugin:settings|settings_set', { settings })
+}
+
+export async function cancel_directory_change(): Promise<void> {
+  return await invoke('plugin:settings|cancel_directory_change')
+}
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 1007744d..aa60ec2f 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -48,6 +48,32 @@ type LinkedData = {
 
 type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
 
+type ContentFile = {
+  hash: string
+  file_name: string
+  size: number
+  metadata?: FileMetadata
+  update_version_id?: string
+  project_type: ContentFileProjectType
+}
+
+type FileMetadata = {
+  project_id: string
+  version_id: string
+}
+
+type ContentFileProjectType = 'mod' | 'datapack' | 'resourcepack' | 'shaderpack'
+
+type CacheBehaviour =
+  // Serve expired data. If fetch fails / launcher is offline, errors are ignored
+  | 'stale_while_revalidate_skip_offline'
+  // Serve expired data, revalidate in background
+  | 'stale_while_revalidate'
+  // Must revalidate if data is expired
+  | 'must_revalidate'
+  // Ignore cache- always fetch updated data from origin
+  | 'bypass'
+
 type MemorySettings = {
   maximum: number
 }
@@ -88,6 +114,7 @@ type AppSettings = {
   collapsed_navigation: boolean
   advanced_rendering: boolean
   native_decorations: boolean
+  worlds_in_home: boolean
 
   telemetry: boolean
   discord_rpc: boolean
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 53256838..a6353504 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -42,6 +42,13 @@ export async function restartApp() {
   return await invoke('restart_app')
 }
 
+/**
+ * @deprecated This method is no longer needed, and just returns its parameter
+ */
+export function sanitizePotentialFileUrl(url) {
+  return url
+}
+
 export const releaseColor = (releaseType) => {
   switch (releaseType) {
     case 'release':
@@ -54,3 +61,7 @@ export const releaseColor = (releaseType) => {
       return ''
   }
 }
+
+export async function copyToClipboard(text) {
+  await navigator.clipboard.writeText(text)
+}
diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
new file mode 100644
index 00000000..89f98d7d
--- /dev/null
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -0,0 +1,327 @@
+import { invoke } from '@tauri-apps/api/core'
+import { get_full_path } from '@/helpers/profile'
+import { openPath } from '@/helpers/utils'
+import { autoToHTML } from '@geometrically/minecraft-motd-parser'
+import dayjs from 'dayjs'
+import type { GameVersion } from '@modrinth/ui'
+
+type BaseWorld = {
+  name: string
+  last_played?: string
+  icon?: string
+  display_status: DisplayStatus
+  type: WorldType
+}
+
+export type WorldType = 'singleplayer' | 'server'
+export type DisplayStatus = 'normal' | 'hidden' | 'favorite'
+
+export type SingleplayerWorld = BaseWorld & {
+  type: 'singleplayer'
+  path: string
+  game_mode: SingleplayerGameMode
+  hardcore: boolean
+  locked: boolean
+}
+
+export type ServerWorld = BaseWorld & {
+  type: 'server'
+  index: number
+  address: string
+  pack_status: ServerPackStatus
+}
+
+export type World = SingleplayerWorld | ServerWorld
+
+export type WorldWithProfile = {
+  profile: string
+} & World
+
+export type SingleplayerGameMode = 'survival' | 'creative' | 'adventure' | 'spectator'
+export type ServerPackStatus = 'enabled' | 'disabled' | 'prompt'
+
+export type ServerStatus = {
+  // https://minecraft.wiki/w/Text_component_format
+  description?: string | Chat
+  players?: {
+    max: number
+    online: number
+    sample: { name: string; id: string }[]
+  }
+  version?: {
+    name: string
+    protocol: number
+  }
+  favicon?: string
+  enforces_secure_chat: boolean
+  ping?: number
+}
+
+export interface Chat {
+  text: string
+  bold: boolean
+  italic: boolean
+  underlined: boolean
+  strikethrough: boolean
+  obfuscated: boolean
+  color?: string
+  extra: Chat[]
+}
+
+export type ServerData = {
+  refreshing: boolean
+  status?: ServerStatus
+  rawMotd?: string | Chat
+  renderedMotd?: string
+}
+
+export async function get_recent_worlds(
+  limit: number,
+  displayStatuses?: DisplayStatus[],
+): Promise<WorldWithProfile[]> {
+  return await invoke('plugin:worlds|get_recent_worlds', { limit, displayStatuses })
+}
+
+export async function get_profile_worlds(path: string): Promise<World[]> {
+  return await invoke('plugin:worlds|get_profile_worlds', { path })
+}
+
+export async function get_singleplayer_world(
+  instance: string,
+  world: string,
+): Promise<SingleplayerWorld> {
+  return await invoke('plugin:worlds|get_singleplayer_world', { instance, world })
+}
+
+export async function set_world_display_status(
+  instance: string,
+  worldType: WorldType,
+  worldId: string,
+  displayStatus: DisplayStatus,
+): Promise<void> {
+  return await invoke('plugin:worlds|set_world_display_status', {
+    instance,
+    worldType,
+    worldId,
+    displayStatus,
+  })
+}
+
+export async function rename_world(
+  instance: string,
+  world: string,
+  newName: string,
+): Promise<void> {
+  return await invoke('plugin:worlds|rename_world', { instance, world, newName })
+}
+
+export async function reset_world_icon(instance: string, world: string): Promise<void> {
+  return await invoke('plugin:worlds|reset_world_icon', { instance, world })
+}
+
+export async function backup_world(instance: string, world: string): Promise<number> {
+  return await invoke('plugin:worlds|backup_world', { instance, world })
+}
+
+export async function delete_world(instance: string, world: string): Promise<void> {
+  return await invoke('plugin:worlds|delete_world', { instance, world })
+}
+
+export async function add_server_to_profile(
+  path: string,
+  name: string,
+  address: string,
+  packStatus: ServerPackStatus,
+): Promise<number> {
+  return await invoke('plugin:worlds|add_server_to_profile', { path, name, address, packStatus })
+}
+
+export async function edit_server_in_profile(
+  path: string,
+  index: number,
+  name: string,
+  address: string,
+  packStatus: ServerPackStatus,
+): Promise<void> {
+  return await invoke('plugin:worlds|edit_server_in_profile', {
+    path,
+    index,
+    name,
+    address,
+    packStatus,
+  })
+}
+
+export async function remove_server_from_profile(path: string, index: number): Promise<void> {
+  return await invoke('plugin:worlds|remove_server_from_profile', { path, index })
+}
+
+export async function get_profile_protocol_version(path: string): Promise<number | null> {
+  return await invoke('plugin:worlds|get_profile_protocol_version', { path })
+}
+
+export async function get_server_status(
+  address: string,
+  protocolVersion: number | null = null,
+): Promise<ServerStatus> {
+  return await invoke('plugin:worlds|get_server_status', { address, protocolVersion })
+}
+
+export async function start_join_singleplayer_world(path: string, world: string): Promise<unknown> {
+  return await invoke('plugin:worlds|start_join_singleplayer_world', { path, world })
+}
+
+export async function start_join_server(path: string, address: string): Promise<unknown> {
+  return await invoke('plugin:worlds|start_join_server', { path, address })
+}
+
+export async function showWorldInFolder(instancePath: string, worldPath: string) {
+  const fullPath = await get_full_path(instancePath)
+  return await openPath(fullPath + '/saves/' + worldPath)
+}
+
+export function getWorldIdentifier(world: World) {
+  return world.type === 'singleplayer' ? world.path : world.address
+}
+
+export function sortWorlds(worlds: World[]) {
+  worlds.sort((a, b) => {
+    if (!a.last_played) {
+      return 1
+    }
+    if (!b.last_played) {
+      return -1
+    }
+    return dayjs(b.last_played).diff(dayjs(a.last_played))
+  })
+}
+
+export function isSingleplayerWorld(world: World): world is SingleplayerWorld {
+  return world.type === 'singleplayer'
+}
+
+export function isServerWorld(world: World): world is ServerWorld {
+  return world.type === 'server'
+}
+
+export async function refreshServerData(
+  serverData: ServerData,
+  protocolVersion: number | null,
+  address: string,
+): Promise<void> {
+  serverData.refreshing = true
+  await get_server_status(address, protocolVersion)
+    .then((status) => {
+      serverData.status = status
+      if (status.description) {
+        serverData.rawMotd = status.description
+        serverData.renderedMotd = autoToHTML(status.description)
+      }
+    })
+    .catch((err) => {
+      console.error(`Refreshing addr: ${address}`, err)
+    })
+    .finally(() => {
+      serverData.refreshing = false
+    })
+}
+
+export async function refreshServers(
+  worlds: World[],
+  serverData: Record<string, ServerData>,
+  protocolVersion: number | null,
+) {
+  const servers = worlds.filter(isServerWorld)
+  servers.forEach((server) => {
+    if (!serverData[server.address]) {
+      serverData[server.address] = {
+        refreshing: true,
+      }
+    } else {
+      serverData[server.address].refreshing = true
+    }
+  })
+
+  // noinspection ES6MissingAwait - handled with .then by refreshServerData already
+  Promise.all(
+    Object.keys(serverData).map((address) =>
+      refreshServerData(serverData[address], protocolVersion, address),
+    ),
+  )
+}
+
+export async function refreshWorld(worlds: World[], instancePath: string, worldPath: string) {
+  const index = worlds.findIndex((w) => w.type === 'singleplayer' && w.path === worldPath)
+  const newWorld = await get_singleplayer_world(instancePath, worldPath)
+  if (index !== -1) {
+    worlds[index] = newWorld
+  } else {
+    console.info(`Adding new world at path: ${worldPath}.`)
+    worlds.push(newWorld)
+  }
+  sortWorlds(worlds)
+}
+
+export async function handleDefaultProfileUpdateEvent(
+  worlds: World[],
+  instancePath: string,
+  e: ProfileEvent,
+) {
+  if (e.event === 'world_updated') {
+    await refreshWorld(worlds, instancePath, e.world)
+  }
+
+  if (e.event === 'server_joined') {
+    const world = worlds.find(
+      (w) =>
+        w.type === 'server' &&
+        (w.address === `${e.host}:${e.port}` || (e.port == 25565 && w.address == e.host)),
+    )
+    if (world) {
+      world.last_played = e.timestamp
+      sortWorlds(worlds)
+    } else {
+      console.error(`Could not find world for server join event: ${e.host}:${e.port}`)
+    }
+  }
+}
+
+export async function refreshWorlds(instancePath: string): Promise<World[]> {
+  const worlds = await get_profile_worlds(instancePath).catch((err) => {
+    console.error(`Error refreshing worlds for instance: ${instancePath}`, err)
+  })
+  if (worlds) {
+    sortWorlds(worlds)
+  }
+
+  return worlds ?? []
+}
+
+const FIRST_QUICK_PLAY_VERSION = '23w14a'
+
+export function hasQuickPlaySupport(gameVersions: GameVersion[], currentVersion: string) {
+  if (!gameVersions.length) {
+    return false
+  }
+
+  const versionIndex = gameVersions.findIndex((v) => v.version === currentVersion)
+  const targetIndex = gameVersions.findIndex((v) => v.version === FIRST_QUICK_PLAY_VERSION)
+
+  return versionIndex !== -1 && targetIndex !== -1 && versionIndex <= targetIndex
+}
+
+export type ProfileEvent = { profile_path_id: string } & (
+  | {
+      event: 'servers_updated'
+    }
+  | {
+      event: 'world_updated'
+      world: string
+    }
+  | {
+      event: 'server_joined'
+      host: string
+      port: number
+      timestamp: string
+    }
+)
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 515e4e71..fa2563da 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -20,12 +20,60 @@
   "app.settings.tabs.resource-management": {
     "message": "Resource management"
   },
+  "instance.add-server.add-and-play": {
+    "message": "Add and play"
+  },
+  "instance.add-server.add-server": {
+    "message": "Add server"
+  },
+  "instance.add-server.resource-pack.disabled": {
+    "message": "Disabled"
+  },
+  "instance.add-server.resource-pack.enabled": {
+    "message": "Enabled"
+  },
+  "instance.add-server.resource-pack.prompt": {
+    "message": "Prompt"
+  },
+  "instance.add-server.title": {
+    "message": "Add a server"
+  },
+  "instance.edit-server.title": {
+    "message": "Edit server"
+  },
+  "instance.edit-world.hide-from-home": {
+    "message": "Hide from the Home page"
+  },
+  "instance.edit-world.name": {
+    "message": "Name"
+  },
+  "instance.edit-world.placeholder-name": {
+    "message": "Minecraft World"
+  },
+  "instance.edit-world.reset-icon": {
+    "message": "Reset icon"
+  },
+  "instance.edit-world.title": {
+    "message": "Edit world"
+  },
   "instance.filter.disabled": {
     "message": "Disabled projects"
   },
   "instance.filter.updates-available": {
     "message": "Updates available"
   },
+  "instance.server-modal.address": {
+    "message": "Address"
+  },
+  "instance.server-modal.name": {
+    "message": "Name"
+  },
+  "instance.server-modal.placeholder-name": {
+    "message": "Minecraft Server"
+  },
+  "instance.server-modal.resource-pack": {
+    "message": "Resource pack"
+  },
   "instance.settings.tabs.general": {
     "message": "General"
   },
@@ -308,6 +356,48 @@
   "instance.settings.title": {
     "message": "Settings"
   },
+  "instance.worlds.a_minecraft_server": {
+    "message": "A Minecraft Server"
+  },
+  "instance.worlds.cant_connect": {
+    "message": "Can't connect to server"
+  },
+  "instance.worlds.copy_address": {
+    "message": "Copy address"
+  },
+  "instance.worlds.dont_show_on_home": {
+    "message": "Don't show on Home"
+  },
+  "instance.worlds.filter.available": {
+    "message": "Available"
+  },
+  "instance.worlds.game_already_open": {
+    "message": "Instance is already open"
+  },
+  "instance.worlds.hardcore": {
+    "message": "Hardcore mode"
+  },
+  "instance.worlds.no_quick_play": {
+    "message": "You can only jump straight into worlds on Minecraft 1.20+"
+  },
+  "instance.worlds.play_anyway": {
+    "message": "Play anyway"
+  },
+  "instance.worlds.play_instance": {
+    "message": "Play instance"
+  },
+  "instance.worlds.type.server": {
+    "message": "Server"
+  },
+  "instance.worlds.type.singleplayer": {
+    "message": "Singleplayer"
+  },
+  "instance.worlds.view_instance": {
+    "message": "View instance"
+  },
+  "instance.worlds.world_in_use": {
+    "message": "World is in use"
+  },
   "search.filter.locked.instance": {
     "message": "Provided by the instance"
   },
diff --git a/apps/app-frontend/src/main.js b/apps/app-frontend/src/main.js
index ba6d3f49..a37a7018 100644
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -6,6 +6,7 @@ import FloatingVue from 'floating-vue'
 import 'floating-vue/dist/style.css'
 import { createPlugin } from '@vintl/vintl/plugin'
 import * as Sentry from '@sentry/vue'
+import { VueScanPlugin } from '@taijased/vue-render-tracker'
 
 const VIntlPlugin = createPlugin({
   controllerOpts: {
@@ -24,6 +25,13 @@ const VIntlPlugin = createPlugin({
   injectInto: [],
 })
 
+const vueScan = new VueScanPlugin({
+  enabled: false, // Enable or disable the tracker
+  showOverlay: true, // Show overlay to visualize renders
+  log: false, // Log render events to the console
+  playSound: false, // Play sound on each render
+})
+
 const pinia = createPinia()
 
 let app = createApp(App)
@@ -35,6 +43,7 @@ Sentry.init({
   tracesSampleRate: 0.1,
 })
 
+app.use(vueScan)
 app.use(router)
 app.use(pinia)
 app.use(FloatingVue, {
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index fcf8607c..92dafd41 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { ref, onUnmounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import RowDisplay from '@/components/RowDisplay.vue'
@@ -8,19 +8,32 @@ import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { handleError } from '@/store/notifications.js'
 import dayjs from 'dayjs'
 import { get_search_results } from '@/helpers/cache.js'
-
-const featuredModpacks = ref({})
-const featuredMods = ref({})
-const filter = ref('')
+import type { SearchResult } from '@modrinth/utils'
+import RecentWorldsList from '@/components/ui/world/RecentWorldsList.vue'
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
 
 breadcrumbs.setRootContext({ name: 'Home', link: route.path })
 
-const recentInstances = ref([])
+const instances = ref<GameInstance[]>([])
 
-const offline = ref(!navigator.onLine)
+const featuredModpacks = ref<SearchResult[]>([])
+const featuredMods = ref<SearchResult[]>([])
+const installedModpacksFilter = ref('')
+
+const recentInstances = computed(() =>
+  instances.value
+    .filter((x) => x.last_played)
+    .slice()
+    .sort((a, b) => dayjs(b.last_played).diff(dayjs(a.last_played))),
+)
+
+const hasFeaturedProjects = computed(
+  () => (featuredModpacks.value?.length ?? 0) + (featuredMods.value?.length ?? 0) > 0,
+)
+
+const offline = ref<boolean>(!navigator.onLine)
 window.addEventListener('offline', () => {
   offline.value = true
 })
@@ -28,34 +41,21 @@ window.addEventListener('online', () => {
   offline.value = false
 })
 
-const getInstances = async () => {
-  const profiles = await list().catch(handleError)
-
-  recentInstances.value = profiles
-    .filter((x) => x.last_played)
-    .sort((a, b) => {
-      const dateA = dayjs(a.last_played)
-      const dateB = dayjs(b.last_played)
-
-      if (dateA.isSame(dateB)) {
-        return a.name.localeCompare(b.name)
-      }
-
-      return dateB - dateA
-    })
+async function fetchInstances() {
+  instances.value = await list().catch(handleError)
 
   const filters = []
-  for (const instance of profiles) {
+  for (const instance of instances.value) {
     if (instance.linked_data && instance.linked_data.project_id) {
       filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)
     }
   }
-  filter.value = filters.join(' AND ')
+  installedModpacksFilter.value = filters.join(' AND ')
 }
 
-const getFeaturedModpacks = async () => {
+async function fetchFeaturedModpacks() {
   const response = await get_search_results(
-    `?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${filter.value}`,
+    `?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${installedModpacksFilter.value}`,
   )
 
   if (response) {
@@ -64,7 +64,8 @@ const getFeaturedModpacks = async () => {
     featuredModpacks.value = []
   }
 }
-const getFeaturedMods = async () => {
+
+async function fetchFeaturedMods() {
   const response = await get_search_results('?facets=[["project_type:mod"]]&limit=10&index=follows')
 
   if (response) {
@@ -74,27 +75,21 @@ const getFeaturedMods = async () => {
   }
 }
 
-await getInstances()
+async function refreshFeaturedProjects() {
+  await Promise.all([fetchFeaturedModpacks(), fetchFeaturedMods()])
+}
 
-await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
+await fetchInstances()
+await refreshFeaturedProjects()
 
 const unlistenProfile = await profile_listener(async (e) => {
-  await getInstances()
+  await fetchInstances()
 
   if (e.event === 'added' || e.event === 'created' || e.event === 'removed') {
-    await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
+    await refreshFeaturedProjects()
   }
 })
 
-// computed sums of recentInstances, featuredModpacks, featuredMods, treating them as arrays if they are not
-const total = computed(() => {
-  return (
-    (recentInstances.value?.length ?? 0) +
-    (featuredModpacks.value?.length ?? 0) +
-    (featuredMods.value?.length ?? 0)
-  )
-})
-
 onUnmounted(() => {
   unlistenProfile()
 })
@@ -104,17 +99,10 @@ onUnmounted(() => {
   <div class="p-6 flex flex-col gap-2">
     <h1 v-if="recentInstances" class="m-0 text-2xl">Welcome back!</h1>
     <h1 v-else class="m-0 text-2xl">Welcome to AstralRinth App!</h1>
+    <RecentWorldsList :recent-instances="recentInstances" />
     <RowDisplay
-      v-if="total > 0"
+      v-if="hasFeaturedProjects"
       :instances="[
-        {
-          label: 'Recently played',
-          route: '/library',
-          instances: recentInstances,
-          instance: true,
-          downloaded: true,
-          compact: true,
-        },
         {
           label: 'Discover a modpack',
           route: '/browse/modpack',
diff --git a/apps/app-frontend/src/pages/Worlds.vue b/apps/app-frontend/src/pages/Worlds.vue
new file mode 100644
index 00000000..8c1f57bf
--- /dev/null
+++ b/apps/app-frontend/src/pages/Worlds.vue
@@ -0,0 +1,4 @@
+<script setup lang="ts"></script>
+<template>
+  <div class="p-6 flex flex-col gap-2">Worlds</div>
+</template>
diff --git a/apps/app-frontend/src/pages/index.js b/apps/app-frontend/src/pages/index.js
index 6c4866b4..82b0b3ec 100644
--- a/apps/app-frontend/src/pages/index.js
+++ b/apps/app-frontend/src/pages/index.js
@@ -1,4 +1,5 @@
 import Index from './Index.vue'
 import Browse from './Browse.vue'
+import Worlds from './Worlds.vue'
 
-export { Index, Browse }
+export { Index, Browse, Worlds }
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index d2f3d52e..65bfbf68 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -1,152 +1,156 @@
 <template>
-  <div
-    class="p-6 pr-2 pb-4"
-    @contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
-  >
-    <ExportModal ref="exportModal" :instance="instance" />
-    <InstanceSettingsModal ref="settingsModal" :instance="instance" :offline="offline" />
-    <ContentPageHeader>
-      <template #icon>
-        <Avatar :src="icon" :alt="instance.name" size="96px" :tint-by="instance.path" />
-      </template>
-      <template #title>
-        {{ instance.name }}
-      </template>
-      <template #summary> </template>
-      <template #stats>
-        <div
-          class="flex items-center gap-2 font-semibold transform capitalize border-0 border-solid border-divider pr-4 md:border-r"
-        >
-          <GameIcon class="h-6 w-6 text-secondary" />
-          {{ instance.loader }} {{ instance.game_version }}
-        </div>
-        <div class="flex items-center gap-2 font-semibold">
-          <TimerIcon class="h-6 w-6 text-secondary" />
-          <template v-if="timePlayed > 0">
-            {{ timePlayedHumanized }}
-          </template>
-          <template v-else> Never played </template>
-        </div>
-      </template>
-      <template #actions>
-        <div class="flex gap-2">
-          <ButtonStyled
-            v-if="instance.install_stage.includes('installing')"
-            color="brand"
-            size="large"
-          >
-            <button disabled>Installing...</button>
-          </ButtonStyled>
-          <ButtonStyled
-            v-else-if="instance.install_stage !== 'installed'"
-            color="brand"
-            size="large"
-          >
-            <button @click="repairInstance()">
-              <DownloadIcon />
-              Repair
-            </button>
-          </ButtonStyled>
-          <ButtonStyled v-else-if="playing === true" color="red" size="large">
-            <button @click="stopInstance('InstancePage')">
-              <StopCircleIcon />
-              Stop
-            </button>
-          </ButtonStyled>
-          <ButtonStyled
-            v-else-if="playing === false && loading === false"
-            color="brand"
-            size="large"
-          >
-            <button @click="startInstance('InstancePage')">
-              <PlayIcon />
-              Play
-            </button>
-          </ButtonStyled>
-          <ButtonStyled
-            v-else-if="loading === true && playing === false"
-            color="brand"
-            size="large"
-          >
-            <button disabled>Loading...</button>
-          </ButtonStyled>
-          <ButtonStyled size="large" circular>
-            <button v-tooltip="'Instance settings'" @click="settingsModal.show()">
-              <SettingsIcon />
-            </button>
-          </ButtonStyled>
-          <ButtonStyled size="large" type="transparent" circular>
-            <OverflowMenu
-              :options="[
-                {
-                  id: 'open-folder',
-                  action: () => showProfileInFolder(instance.path),
-                },
-                {
-                  id: 'export-mrpack',
-                  action: () => $refs.exportModal.show(),
-                },
-              ]"
-            >
-              <MoreVerticalIcon />
-              <template #share-instance> <UserPlusIcon /> Share instance </template>
-              <template #host-a-server> <ServerIcon /> Create a server </template>
-              <template #open-folder> <FolderOpenIcon /> Open folder </template>
-              <template #export-mrpack> <PackageIcon /> Export modpack </template>
-            </OverflowMenu>
-          </ButtonStyled>
-        </div>
-      </template>
-    </ContentPageHeader>
-  </div>
-  <div class="px-6">
-    <NavTabs :links="tabs" />
-  </div>
-  <div class="p-6 pt-4">
-    <RouterView v-slot="{ Component }" :key="instance.path">
-      <template v-if="Component">
-        <Suspense
-          :key="instance.path"
-          @pending="loadingBar.startLoading()"
-          @resolve="loadingBar.stopLoading()"
-        >
-          <component
-            :is="Component"
-            :instance="instance"
-            :options="options"
-            :offline="offline"
-            :playing="playing"
-            :versions="modrinthVersions"
-            :installed="instance.install_stage !== 'installed'"
-          ></component>
-          <template #fallback>
-            <LoadingIndicator />
-          </template>
-        </Suspense>
-      </template>
-    </RouterView>
-  </div>
-  <ContextMenu ref="options" @option-clicked="handleOptionsClick">
-    <template #play> <PlayIcon /> Play </template>
-    <template #stop> <StopCircleIcon /> Stop </template>
-    <template #add_content> <PlusIcon /> Add content </template>
-    <template #edit> <EditIcon /> Edit </template>
-    <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
-    <template #open_folder> <ClipboardCopyIcon /> Open folder </template>
-    <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
-    <template #open_link> <ClipboardCopyIcon /> Open in Modrinth <ExternalIcon /> </template>
-    <template #copy_names><EditIcon />Copy names</template>
-    <template #copy_slugs><HashIcon />Copy slugs</template>
-    <template #copy_links><GlobeIcon />Copy links</template>
-    <template #toggle><EditIcon />Toggle selected</template>
-    <template #disable><XIcon />Disable selected</template>
-    <template #enable><CheckCircleIcon />Enable selected</template>
-    <template #hide_show><EyeIcon />Show/Hide unselected</template>
-    <template #update_all
-      ><UpdatedIcon />Update {{ selected.length > 0 ? 'selected' : 'all' }}</template
+  <div>
+    <div
+      class="p-6 pr-2 pb-4"
+      @contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
     >
-    <template #filter_update><UpdatedIcon />Select Updatable</template>
-  </ContextMenu>
+      <ExportModal ref="exportModal" :instance="instance" />
+      <InstanceSettingsModal ref="settingsModal" :instance="instance" :offline="offline" />
+      <ContentPageHeader>
+        <template #icon>
+          <Avatar :src="icon" :alt="instance.name" size="96px" :tint-by="instance.path" />
+        </template>
+        <template #title>
+          {{ instance.name }}
+        </template>
+        <template #summary> </template>
+        <template #stats>
+          <div
+            class="flex items-center gap-2 font-semibold transform capitalize border-0 border-solid border-divider pr-4 md:border-r"
+          >
+            <GameIcon class="h-6 w-6 text-secondary" />
+            {{ instance.loader }} {{ instance.game_version }}
+          </div>
+          <div class="flex items-center gap-2 font-semibold">
+            <TimerIcon class="h-6 w-6 text-secondary" />
+            <template v-if="timePlayed > 0">
+              {{ timePlayedHumanized }}
+            </template>
+            <template v-else> Never played </template>
+          </div>
+        </template>
+        <template #actions>
+          <div class="flex gap-2">
+            <ButtonStyled
+              v-if="instance.install_stage.includes('installing')"
+              color="brand"
+              size="large"
+            >
+              <button disabled>Installing...</button>
+            </ButtonStyled>
+            <ButtonStyled
+              v-else-if="instance.install_stage !== 'installed'"
+              color="brand"
+              size="large"
+            >
+              <button @click="repairInstance()">
+                <DownloadIcon />
+                Repair
+              </button>
+            </ButtonStyled>
+            <ButtonStyled v-else-if="playing === true" color="red" size="large">
+              <button @click="stopInstance('InstancePage')">
+                <StopCircleIcon />
+                Stop
+              </button>
+            </ButtonStyled>
+            <ButtonStyled
+              v-else-if="playing === false && loading === false"
+              color="brand"
+              size="large"
+            >
+              <button @click="startInstance('InstancePage')">
+                <PlayIcon />
+                Play
+              </button>
+            </ButtonStyled>
+            <ButtonStyled
+              v-else-if="loading === true && playing === false"
+              color="brand"
+              size="large"
+            >
+              <button disabled>Loading...</button>
+            </ButtonStyled>
+            <ButtonStyled size="large" circular>
+              <button v-tooltip="'Instance settings'" @click="settingsModal.show()">
+                <SettingsIcon />
+              </button>
+            </ButtonStyled>
+            <ButtonStyled size="large" type="transparent" circular>
+              <OverflowMenu
+                :options="[
+                  {
+                    id: 'open-folder',
+                    action: () => showProfileInFolder(instance.path),
+                  },
+                  {
+                    id: 'export-mrpack',
+                    action: () => $refs.exportModal.show(),
+                  },
+                ]"
+              >
+                <MoreVerticalIcon />
+                <template #share-instance> <UserPlusIcon /> Share instance </template>
+                <template #host-a-server> <ServerIcon /> Create a server </template>
+                <template #open-folder> <FolderOpenIcon /> Open folder </template>
+                <template #export-mrpack> <PackageIcon /> Export modpack </template>
+              </OverflowMenu>
+            </ButtonStyled>
+          </div>
+        </template>
+      </ContentPageHeader>
+    </div>
+    <div class="px-6">
+      <NavTabs :links="tabs" />
+    </div>
+    <div v-if="!!instance" class="p-6 pt-4">
+      <RouterView v-slot="{ Component }" :key="instance.path">
+        <template v-if="Component">
+          <Suspense
+            :key="instance.path"
+            @pending="loadingBar.startLoading()"
+            @resolve="loadingBar.stopLoading()"
+          >
+            <component
+              :is="Component"
+              :instance="instance"
+              :options="options"
+              :offline="offline"
+              :playing="playing"
+              :versions="modrinthVersions"
+              :installed="instance.install_stage !== 'installed'"
+              @play="updatePlayState"
+              @stop="() => stopInstance('InstanceSubpage')"
+            ></component>
+            <template #fallback>
+              <LoadingIndicator />
+            </template>
+          </Suspense>
+        </template>
+      </RouterView>
+    </div>
+    <ContextMenu ref="options" @option-clicked="handleOptionsClick">
+      <template #play> <PlayIcon /> Play </template>
+      <template #stop> <StopCircleIcon /> Stop </template>
+      <template #add_content> <PlusIcon /> Add content </template>
+      <template #edit> <EditIcon /> Edit </template>
+      <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
+      <template #open_folder> <ClipboardCopyIcon /> Open folder </template>
+      <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
+      <template #open_link> <ClipboardCopyIcon /> Open in Modrinth <ExternalIcon /> </template>
+      <template #copy_names><EditIcon />Copy names</template>
+      <template #copy_slugs><HashIcon />Copy slugs</template>
+      <template #copy_links><GlobeIcon />Copy links</template>
+      <template #toggle><EditIcon />Toggle selected</template>
+      <template #disable><XIcon />Disable selected</template>
+      <template #enable><CheckCircleIcon />Enable selected</template>
+      <template #hide_show><EyeIcon />Show/Hide unselected</template>
+      <template #update_all
+        ><UpdatedIcon />Update {{ selected.length > 0 ? 'selected' : 'all' }}</template
+      >
+      <template #filter_update><UpdatedIcon />Select Updatable</template>
+    </ContextMenu>
+  </div>
 </template>
 <script setup>
 import {
@@ -238,6 +242,10 @@ async function fetchInstance() {
       })
   }
 
+  await updatePlayState()
+}
+
+async function updatePlayState() {
   const runningProcesses = await get_by_profile_path(route.params.id).catch(handleError)
 
   playing.value = runningProcesses.length > 0
@@ -253,14 +261,20 @@ watch(
   },
 )
 
+const basePath = computed(() => `/instance/${encodeURIComponent(route.params.id)}`)
+
 const tabs = computed(() => [
   {
     label: 'Content',
-    href: `/instance/${encodeURIComponent(route.params.id)}`,
+    href: `${basePath.value}`,
+  },
+  {
+    label: 'Worlds',
+    href: `${basePath.value}/worlds`,
   },
   {
     label: 'Logs',
-    href: `/instance/${encodeURIComponent(route.params.id)}/logs`,
+    href: `${basePath.value}/logs`,
   },
 ])
 
diff --git a/apps/app-frontend/src/pages/instance/Logs.vue b/apps/app-frontend/src/pages/instance/Logs.vue
index f7a9d042..e8750c62 100644
--- a/apps/app-frontend/src/pages/instance/Logs.vue
+++ b/apps/app-frontend/src/pages/instance/Logs.vue
@@ -117,15 +117,37 @@ const route = useRoute()
 const props = defineProps({
   instance: {
     type: Object,
-    required: true,
+    default() {
+      return {}
+    },
+  },
+  options: {
+    type: Object,
+    default() {
+      return {}
+    },
   },
   offline: {
     type: Boolean,
-    default: false,
+    default() {
+      return false
+    },
   },
   playing: {
     type: Boolean,
-    default: false,
+    default() {
+      return false
+    },
+  },
+  versions: {
+    type: Array,
+    required: true,
+  },
+  installed: {
+    type: Boolean,
+    default() {
+      return false
+    },
   },
 })
 
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index b70f0139..d14da99f 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -1,251 +1,252 @@
 <template>
-  <template v-if="projects?.length > 0">
-    <div class="flex items-center gap-2 mb-4">
-      <div class="iconified-input flex-grow">
-        <SearchIcon />
-        <input
-          v-model="searchFilter"
-          type="text"
-          :placeholder="`Search ${filteredProjects.length} project${filteredProjects.length === 1 ? '' : 's'}...`"
-          class="text-input search-input"
-          autocomplete="off"
+  <div>
+    <template v-if="projects?.length > 0">
+      <div class="flex items-center gap-2 mb-4">
+        <div class="iconified-input flex-grow">
+          <SearchIcon />
+          <input
+            v-model="searchFilter"
+            type="text"
+            :placeholder="`Search ${filteredProjects.length} project${filteredProjects.length === 1 ? '' : 's'}...`"
+            class="text-input search-input"
+            autocomplete="off"
+          />
+          <Button class="r-btn" @click="() => (searchFilter = '')">
+            <XIcon />
+          </Button>
+        </div>
+        <AddContentButton :instance="instance" />
+      </div>
+      <div class="flex items-center justify-between">
+        <div v-if="filterOptions.length > 1" class="flex flex-wrap gap-1 items-center pb-4">
+          <FilterIcon class="text-secondary h-5 w-5 mr-1" />
+          <button
+            v-for="filter in filterOptions"
+            :key="`content-filter-${filter.id}`"
+            :class="`px-2 py-1 rounded-full font-semibold leading-none border-none cursor-pointer active:scale-[0.97] duration-100 transition-all ${selectedFilters.includes(filter.id) ? 'bg-brand-highlight text-brand' : 'bg-bg-raised text-secondary'}`"
+            @click="toggleArray(selectedFilters, filter.id)"
+          >
+            {{ filter.formattedName }}
+          </button>
+        </div>
+        <Pagination
+          v-if="search.length > 0"
+          :page="currentPage"
+          :count="Math.ceil(search.length / 20)"
+          :link-function="(page) => `?page=${page}`"
+          @switch-page="(page) => (currentPage = page)"
         />
-        <Button class="r-btn" @click="() => (searchFilter = '')">
-          <XIcon />
-        </Button>
       </div>
-      <AddContentButton :instance="instance" />
-    </div>
-    <div class="flex items-center justify-between">
-      <div v-if="filterOptions.length > 1" class="flex flex-wrap gap-1 items-center pb-4">
-        <FilterIcon class="text-secondary h-5 w-5 mr-1" />
-        <button
-          v-for="filter in filterOptions"
-          :key="filter"
-          :class="`px-2 py-1 rounded-full font-semibold leading-none border-none cursor-pointer active:scale-[0.97] duration-100 transition-all ${selectedFilters.includes(filter.id) ? 'bg-brand-highlight text-brand' : 'bg-bg-raised text-secondary'}`"
-          @click="toggleArray(selectedFilters, filter.id)"
-        >
-          {{ filter.formattedName }}
-        </button>
-      </div>
-      <Pagination
-        v-if="search.length > 0"
-        :page="currentPage"
-        :count="Math.ceil(search.length / 20)"
-        :link-function="(page) => `?page=${page}`"
-        @switch-page="(page) => (currentPage = page)"
-      />
-    </div>
 
-    <ContentListPanel
-      v-model="selectedFiles"
-      :locked="isPackLocked"
-      :items="
-        search.map((x) => {
-          const item: ContentItem<any> = {
-            path: x.path,
-            disabled: x.disabled,
-            filename: x.file_name,
-            icon: x.icon,
-            title: x.name,
-            data: x,
-          }
-
-          if (x.version) {
-            item.version = x.version
-            item.versionId = x.version
-          }
-
-          if (x.id) {
-            item.project = {
-              id: x.id,
-              link: { path: `/project/${x.id}`, query: { i: props.instance.path } },
-              linkProps: {},
+      <ContentListPanel
+        v-model="selectedFiles"
+        :locked="isPackLocked"
+        :items="
+          search.map((x) => {
+            const item: ContentItem<any> = {
+              path: x.path,
+              disabled: x.disabled,
+              filename: x.file_name,
+              icon: x.icon ?? undefined,
+              title: x.name,
+              data: x,
             }
-          }
 
-          if (x.author) {
-            item.creator = {
-              name: x.author.name,
-              type: x.author.type,
-              id: x.author.slug,
-              link: `https://modrinth.com/${x.author.type}/${x.author.slug}`,
-              linkProps: { target: '_blank' },
+            if (x.version) {
+              item.version = x.version
+              item.versionId = x.version
             }
-          }
 
-          return item
-        })
-      "
-      :sort-column="sortColumn"
-      :sort-ascending="ascending"
-      :update-sort="sortProjects"
-      :current-page="currentPage"
-    >
-      <template v-if="selectedProjects.length > 0" #headers>
-        <div class="flex gap-2">
+            if (x.id) {
+              item.project = {
+                id: x.id,
+                link: { path: `/project/${x.id}`, query: { i: props.instance.path } },
+                linkProps: {},
+              }
+            }
+
+            if (x.author) {
+              item.creator = {
+                name: x.author.name,
+                type: x.author.type,
+                id: x.author.slug,
+                link: `https://modrinth.com/${x.author.type}/${x.author.slug}`,
+                linkProps: { target: '_blank' },
+              }
+            }
+
+            return item
+          })
+        "
+        :sort-column="sortColumn"
+        :sort-ascending="ascending"
+        :update-sort="sortProjects"
+        :current-page="currentPage"
+      >
+        <template v-if="selectedProjects.length > 0" #headers>
+          <div class="flex gap-2">
+            <ButtonStyled
+              v-if="!isPackLocked && selectedProjects.some((m) => m.outdated)"
+              color="brand"
+              color-fill="text"
+              hover-color-fill="text"
+            >
+              <button @click="updateSelected()"><DownloadIcon /> Update</button>
+            </ButtonStyled>
+            <ButtonStyled>
+              <OverflowMenu
+                :options="[
+                  {
+                    id: 'share-names',
+                    action: () => shareNames(),
+                  },
+                  {
+                    id: 'share-file-names',
+                    action: () => shareFileNames(),
+                  },
+                  {
+                    id: 'share-urls',
+                    action: () => shareUrls(),
+                  },
+                  {
+                    id: 'share-markdown',
+                    action: () => shareMarkdown(),
+                  },
+                ]"
+              >
+                <ShareIcon /> Share <DropdownIcon />
+                <template #share-names> <TextInputIcon /> Project names </template>
+                <template #share-file-names> <FileIcon /> File names </template>
+                <template #share-urls> <LinkIcon /> Project links </template>
+                <template #share-markdown> <CodeIcon /> Markdown links </template>
+              </OverflowMenu>
+            </ButtonStyled>
+            <ButtonStyled v-if="selectedProjects.some((m) => m.disabled)">
+              <button @click="enableAll()"><CheckCircleIcon /> Enable</button>
+            </ButtonStyled>
+            <ButtonStyled v-if="selectedProjects.some((m) => !m.disabled)">
+              <button @click="disableAll()"><SlashIcon /> Disable</button>
+            </ButtonStyled>
+            <ButtonStyled color="red">
+              <button @click="deleteSelected()"><TrashIcon /> Remove</button>
+            </ButtonStyled>
+          </div>
+        </template>
+        <template #header-actions>
+          <ButtonStyled type="transparent" color-fill="text" hover-color-fill="text">
+            <button :disabled="refreshingProjects" class="w-max" @click="refreshProjects">
+              <UpdatedIcon />
+              Refresh
+            </button>
+          </ButtonStyled>
           <ButtonStyled
-            v-if="!isPackLocked && selectedProjects.some((m) => m.outdated)"
+            v-if="!isPackLocked && projects.some((m) => (m as any).outdated)"
+            type="transparent"
+            color="brand"
+            color-fill="text"
+            hover-color-fill="text"
+            @click="updateAll"
+          >
+            <button class="w-max"><DownloadIcon /> Update all</button>
+          </ButtonStyled>
+          <ButtonStyled
+            v-if="canUpdatePack"
+            type="transparent"
             color="brand"
             color-fill="text"
             hover-color-fill="text"
           >
-            <button @click="updateSelected()"><DownloadIcon /> Update</button>
+            <button class="w-max" :disabled="installing" @click="modpackVersionModal?.show()">
+              <DownloadIcon /> Update pack
+            </button>
           </ButtonStyled>
-          <ButtonStyled>
+        </template>
+        <template #actions="{ item }">
+          <ButtonStyled
+            v-if="!isPackLocked && (item.data as any).outdated"
+            type="transparent"
+            color="brand"
+            circular
+          >
+            <button
+              v-tooltip="`Update`"
+              :disabled="(item.data as ProjectListEntry).updating"
+              @click="updateProject(item.data)"
+            >
+              <DownloadIcon />
+            </button>
+          </ButtonStyled>
+          <div v-else class="w-[36px]"></div>
+          <Toggle
+            class="!mx-2"
+            :model-value="!item.data.disabled"
+            @update:model-value="toggleDisableMod(item.data)"
+          />
+          <ButtonStyled type="transparent" circular>
+            <button v-tooltip="'Remove'" @click="removeMod(item)">
+              <TrashIcon />
+            </button>
+          </ButtonStyled>
+
+          <ButtonStyled type="transparent" circular>
             <OverflowMenu
               :options="[
                 {
-                  id: 'share-names',
-                  action: () => shareNames(),
+                  id: 'show-file',
+                  action: () => highlightModInProfile(instance.path, item.path),
                 },
                 {
-                  id: 'share-file-names',
-                  action: () => shareFileNames(),
-                },
-                {
-                  id: 'share-urls',
-                  action: () => shareUrls(),
-                },
-                {
-                  id: 'share-markdown',
-                  action: () => shareMarkdown(),
+                  id: 'copy-link',
+                  shown: item.data !== undefined && item.data.slug !== undefined,
+                  action: () => copyModLink(item),
                 },
               ]"
+              direction="left"
             >
-              <ShareIcon /> Share <DropdownIcon />
-              <template #share-names> <TextInputIcon /> Project names </template>
-              <template #share-file-names> <FileIcon /> File names </template>
-              <template #share-urls> <LinkIcon /> Project links </template>
-              <template #share-markdown> <CodeIcon /> Markdown links </template>
+              <MoreVerticalIcon />
+              <template #show-file> <ExternalIcon /> Show file </template>
+              <template #copy-link> <ClipboardCopyIcon /> Copy link </template>
             </OverflowMenu>
           </ButtonStyled>
-          <ButtonStyled v-if="selectedProjects.some((m) => m.disabled)">
-            <button @click="enableAll()"><CheckCircleIcon /> Enable</button>
-          </ButtonStyled>
-          <ButtonStyled v-if="selectedProjects.some((m) => !m.disabled)">
-            <button @click="disableAll()"><SlashIcon /> Disable</button>
-          </ButtonStyled>
-          <ButtonStyled color="red">
-            <button @click="deleteSelected()"><TrashIcon /> Remove</button>
-          </ButtonStyled>
-        </div>
-      </template>
-      <template #header-actions>
-        <ButtonStyled type="transparent" color-fill="text" hover-color-fill="text">
-          <button :disabled="refreshingProjects" class="w-max" @click="refreshProjects">
-            <UpdatedIcon />
-            Refresh
-          </button>
-        </ButtonStyled>
-        <ButtonStyled
-          v-if="!isPackLocked && projects.some((m) => (m as any).outdated)"
-          type="transparent"
-          color="brand"
-          color-fill="text"
-          hover-color-fill="text"
-          @click="updateAll"
-        >
-          <button class="w-max"><DownloadIcon /> Update all</button>
-        </ButtonStyled>
-        <ButtonStyled
-          v-if="canUpdatePack"
-          type="transparent"
-          color="brand"
-          color-fill="text"
-          hover-color-fill="text"
-        >
-          <button class="w-max" :disabled="installing" @click="modpackVersionModal.show()">
-            <DownloadIcon /> Update pack
-          </button>
-        </ButtonStyled>
-      </template>
-      <template #actions="{ item }">
-        <ButtonStyled
-          v-if="!isPackLocked && (item.data as any).outdated"
-          type="transparent"
-          color="brand"
-          circular
-        >
-          <button
-            v-tooltip="`Update`"
-            :disabled="(item.data as any).updating"
-            @click="updateProject(item.data)"
-          >
-            <DownloadIcon />
-          </button>
-        </ButtonStyled>
-        <div v-else class="w-[36px]"></div>
-        <Toggle
-          class="!mx-2"
-          :model-value="!item.data.disabled"
-          @update:model-value="toggleDisableMod(item.data)"
+        </template>
+      </ContentListPanel>
+      <div class="flex justify-end mt-4">
+        <Pagination
+          v-if="search.length > 0"
+          :page="currentPage"
+          :count="Math.ceil(search.length / 20)"
+          :link-function="(page) => `?page=${page}`"
+          @switch-page="(page) => (currentPage = page)"
         />
-        <ButtonStyled type="transparent" circular>
-          <button v-tooltip="'Remove'" @click="removeMod(item)">
-            <TrashIcon />
-          </button>
-        </ButtonStyled>
-
-        <ButtonStyled type="transparent" circular>
-          <OverflowMenu
-            :options="[
-              {
-                id: 'show-file',
-                action: () => highlightModInProfile(instance.path, item.path),
-              },
-              {
-                id: 'copy-link',
-                shown: item.data !== undefined && item.data.slug !== undefined,
-                action: () => copyModLink(item),
-              },
-            ]"
-            direction="left"
+      </div>
+    </template>
+    <div v-else class="w-full max-w-[48rem] mx-auto flex flex-col mt-6">
+      <RadialHeader class="">
+        <div class="flex items-center gap-6 w-[32rem] mx-auto">
+          <img src="@/assets/sad-modrinth-bot.webp" class="h-24" />
+          <span class="text-contrast font-bold text-xl"
+            >You haven't added any content to this instance yet.</span
           >
-            <MoreVerticalIcon />
-            <template #show-file> <ExternalIcon /> Show file </template>
-            <template #copy-link> <ClipboardCopyIcon /> Copy link </template>
-          </OverflowMenu>
-        </ButtonStyled>
-      </template>
-    </ContentListPanel>
-    <div class="flex justify-end mt-4">
-      <Pagination
-        v-if="search.length > 0"
-        :page="currentPage"
-        :count="Math.ceil(search.length / 20)"
-        :link-function="(page) => `?page=${page}`"
-        @switch-page="(page) => (currentPage = page)"
-      />
-    </div>
-  </template>
-  <div v-else class="w-full flex flex-col items-center justify-center mt-6 max-w-[48rem] mx-auto">
-    <div class="top-box w-full">
-      <div class="flex items-center gap-6 w-[32rem] mx-auto">
-        <img src="@/assets/sad-modrinth-bot.webp" class="h-24" />
-        <span class="text-contrast font-bold text-xl"
-          >You haven't added any content to this instance yet.</span
-        >
+        </div>
+      </RadialHeader>
+      <div class="flex mt-4 mx-auto">
+        <AddContentButton :instance="instance" />
       </div>
     </div>
-    <div class="top-box-divider"></div>
-    <div class="flex items-center gap-6 py-4">
-      <AddContentButton :instance="instance" />
-    </div>
+    <ShareModalWrapper
+      ref="shareModal"
+      share-title="Sharing modpack content"
+      share-text="Check out the projects I'm using in my modpack!"
+      :open-in-new-tab="false"
+    />
+    <ExportModal v-if="projects.length > 0" ref="exportModal" :instance="instance" />
+    <ModpackVersionModal
+      v-if="instance.linked_data"
+      ref="modpackVersionModal"
+      :instance="instance"
+      :versions="props.versions"
+    />
   </div>
-  <ShareModalWrapper
-    ref="shareModal"
-    share-title="Sharing modpack content"
-    share-text="Check out the projects I'm using in my modpack!"
-    :open-in-new-tab="false"
-  />
-  <ExportModal v-if="projects.length > 0" ref="exportModal" :instance="instance" />
-  <ModpackVersionModal
-    v-if="instance.linked_data"
-    ref="modpackVersionModal"
-    :instance="instance"
-    :versions="props.versions"
-  />
 </template>
 <script setup lang="ts">
 import {
@@ -272,8 +273,10 @@ import {
   ContentListPanel,
   OverflowMenu,
   Pagination,
+  RadialHeader,
   Toggle,
 } from '@modrinth/ui'
+import type { Organization, Project, TeamMember, Version } from '@modrinth/utils'
 import { formatProjectType } from '@modrinth/utils'
 import type { ComputedRef } from 'vue'
 import { computed, onUnmounted, ref, watch } from 'vue'
@@ -303,31 +306,18 @@ import { profile_listener } from '@/helpers/events.js'
 import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
 import { getCurrentWebview } from '@tauri-apps/api/webview'
 import dayjs from 'dayjs'
+import type { CacheBehaviour, ContentFile, GameInstance } from '@/helpers/types'
+import type ContextMenu from '@/components/ui/ContextMenu.vue'
+import type { ContentItem } from '@modrinth/ui/src/components/content/ContentListItem.vue'
 
-const props = defineProps({
-  instance: {
-    type: Object,
-    default() {
-      return {}
-    },
-  },
-  options: {
-    type: Object,
-    default() {
-      return {}
-    },
-  },
-  offline: {
-    type: Boolean,
-    default() {
-      return false
-    },
-  },
-  versions: {
-    type: Array,
-    required: true,
-  },
-})
+const props = defineProps<{
+  instance: GameInstance
+  options: InstanceType<typeof ContextMenu>
+  offline: boolean
+  playing: boolean
+  versions: Version[]
+  installed: boolean
+}>()
 
 type ProjectListEntryAuthor = {
   name: string
@@ -342,13 +332,15 @@ type ProjectListEntry = {
   author: ProjectListEntryAuthor | null
   version: string | null
   file_name: string
-  icon: string | null
+  icon: string | undefined
   disabled: boolean
   updateVersion?: string
   outdated: boolean
   updated: dayjs.Dayjs
   project_type: string
   id?: string
+  updating?: boolean
+  selected?: boolean
 }
 
 const isPackLocked = computed(() => {
@@ -361,17 +353,20 @@ const canUpdatePack = computed(() => {
 const exportModal = ref(null)
 
 const projects = ref<ProjectListEntry[]>([])
-const selectedFiles = ref([])
+const selectedFiles = ref<string[]>([])
 const selectedProjects = computed(() =>
   projects.value.filter((x) => selectedFiles.value.includes(x.file_name)),
 )
 
 const selectionMap = ref(new Map())
 
-const initProjects = async (cacheBehaviour?) => {
+const initProjects = async (cacheBehaviour?: CacheBehaviour) => {
   const newProjects: ProjectListEntry[] = []
 
-  const profileProjects = await get_projects(props.instance.path, cacheBehaviour)
+  const profileProjects = (await get_projects(props.instance.path, cacheBehaviour)) as Record<
+    string,
+    ContentFile
+  >
   const fetchProjects = []
   const fetchVersions = []
 
@@ -383,21 +378,21 @@ const initProjects = async (cacheBehaviour?) => {
   }
 
   const [modrinthProjects, modrinthVersions] = await Promise.all([
-    await get_project_many(fetchProjects).catch(handleError),
-    await get_version_many(fetchVersions).catch(handleError),
+    (await get_project_many(fetchProjects).catch(handleError)) as Project[],
+    (await get_version_many(fetchVersions).catch(handleError)) as Version[],
   ])
 
   const [modrinthTeams, modrinthOrganizations] = await Promise.all([
-    await get_team_many(modrinthProjects.map((x) => x.team)).catch(handleError),
-    await get_organization_many(
+    (await get_team_many(modrinthProjects.map((x) => x.team)).catch(handleError)) as TeamMember[][],
+    (await get_organization_many(
       modrinthProjects.map((x) => x.organization).filter((x) => !!x),
-    ).catch(handleError),
+    ).catch(handleError)) as Organization[],
   ])
 
   for (const [path, file] of Object.entries(profileProjects)) {
     if (file.metadata) {
-      const project = modrinthProjects.find((x) => file.metadata.project_id === x.id)
-      const version = modrinthVersions.find((x) => file.metadata.version_id === x.id)
+      const project = modrinthProjects.find((x) => file.metadata?.project_id === x.id)
+      const version = modrinthVersions.find((x) => file.metadata?.version_id === x.id)
 
       if (project && version) {
         const org = project.organization
@@ -406,7 +401,7 @@ const initProjects = async (cacheBehaviour?) => {
 
         const team = modrinthTeams.find((x) => x[0].team_id === project.team)
 
-        let author: ProjectListEntryAuthor | null
+        let author: ProjectListEntryAuthor | null = null
         if (org) {
           author = {
             name: org.name,
@@ -415,13 +410,13 @@ const initProjects = async (cacheBehaviour?) => {
           }
         } else if (team) {
           const teamMember = team.find((x) => x.is_owner)
-          author = {
-            name: teamMember.user.username,
-            slug: teamMember.user.username,
-            type: 'user',
+          if (teamMember) {
+            author = {
+              name: teamMember.user.username,
+              slug: teamMember.user.username,
+              type: 'user',
+            }
           }
-        } else {
-          author = null
         }
 
         newProjects.push({
@@ -450,7 +445,7 @@ const initProjects = async (cacheBehaviour?) => {
       author: null,
       version: null,
       file_name: file.file_name,
-      icon: null,
+      icon: undefined,
       disabled: file.file_name.endsWith('.disabled'),
       outdated: false,
       updated: dayjs(0),
@@ -458,7 +453,7 @@ const initProjects = async (cacheBehaviour?) => {
     })
   }
 
-  projects.value = newProjects
+  projects.value = newProjects ?? []
 
   const newSelectionMap = new Map()
   for (const project of projects.value) {
@@ -474,7 +469,7 @@ const initProjects = async (cacheBehaviour?) => {
 }
 await initProjects()
 
-const modpackVersionModal = ref(null)
+const modpackVersionModal = ref<InstanceType<typeof ModpackVersionModal> | null>()
 const installing = computed(() => props.instance.install_stage !== 'installed')
 
 const vintl = useVIntl()
@@ -499,7 +494,7 @@ const messages = defineMessages({
 const filterOptions: ComputedRef<FilterOption[]> = computed(() => {
   const options: FilterOption[] = []
 
-  const frequency = projects.value.reduce((map, item) => {
+  const frequency = projects.value.reduce((map: Record<string, number>, item) => {
     map[item.project_type] = (map[item.project_type] || 0) + 1
     return map
   }, {})
@@ -530,7 +525,7 @@ const filterOptions: ComputedRef<FilterOption[]> = computed(() => {
   return options
 })
 
-const selectedFilters = ref([])
+const selectedFilters = ref<string[]>([])
 const filteredProjects = computed(() => {
   const updatesFilter = selectedFilters.value.includes('updates')
   const disabledFilter = selectedFilters.value.includes('disabled')
@@ -557,7 +552,7 @@ watch(filterOptions, () => {
   }
 })
 
-function toggleArray(array, value) {
+function toggleArray<T>(array: T[], value: T) {
   if (array.includes(value)) {
     array.splice(array.indexOf(value), 1)
   } else {
@@ -567,7 +562,7 @@ function toggleArray(array, value) {
 
 const searchFilter = ref('')
 const selectAll = ref(false)
-const shareModal = ref(null)
+const shareModal = ref<InstanceType<typeof ShareModalWrapper> | null>()
 const ascending = ref(true)
 const sortColumn = ref('Name')
 const currentPage = ref(1)
@@ -608,7 +603,7 @@ const search = computed(() => {
 
 watch([sortColumn, ascending, selectedFilters.value, searchFilter], () => (currentPage.value = 1))
 
-const sortProjects = (filter) => {
+const sortProjects = (filter: string) => {
   if (sortColumn.value === filter) {
     ascending.value = !ascending.value
   } else {
@@ -626,7 +621,7 @@ const updateAll = async () => {
     }
   }
 
-  const paths = await update_all(props.instance.path).catch(handleError)
+  const paths = (await update_all(props.instance.path).catch(handleError)) as Record<string, string>
 
   for (const [oldVal, newVal] of Object.entries(paths)) {
     const index = projects.value.findIndex((x) => x.path === oldVal)
@@ -635,7 +630,7 @@ const updateAll = async () => {
 
     if (projects.value[index].updateVersion) {
       projects.value[index].version = projects.value[index].updateVersion.version_number
-      projects.value[index].updateVersion = null
+      projects.value[index].updateVersion = undefined
     }
   }
   for (const project of setProjects) {
@@ -650,15 +645,15 @@ const updateAll = async () => {
   })
 }
 
-const updateProject = async (mod) => {
+const updateProject = async (mod: ProjectListEntry) => {
   mod.updating = true
   await new Promise((resolve) => setTimeout(resolve, 0))
   mod.path = await update_project(props.instance.path, mod.path).catch(handleError)
   mod.updating = false
 
   mod.outdated = false
-  mod.version = mod.updateVersion.version_number
-  mod.updateVersion = null
+  mod.version = mod.updateVersion?.version_number
+  mod.updateVersion = undefined
 
   trackEvent('InstanceProjectUpdate', {
     loader: props.instance.loader,
@@ -669,15 +664,15 @@ const updateProject = async (mod) => {
   })
 }
 
-const locks = {}
+const locks: Record<string, string | null> = {}
 
-const toggleDisableMod = async (mod) => {
+const toggleDisableMod = async (mod: ProjectListEntry) => {
   // Use mod's id as the key for the lock. If mod doesn't have a unique id, replace `mod.id` with some unique property.
   const lock = locks[mod.file_name]
 
   while (lock) {
     await new Promise((resolve) => {
-      setTimeout((_) => resolve(), 100)
+      setTimeout((value: unknown) => resolve(value), 100)
     })
   }
 
@@ -702,20 +697,20 @@ const toggleDisableMod = async (mod) => {
   locks[mod.file_name] = null
 }
 
-const removeMod = async (mod) => {
+const removeMod = async (mod: ContentItem<ProjectListEntry>) => {
   await remove_project(props.instance.path, mod.path).catch(handleError)
   projects.value = projects.value.filter((x) => mod.path !== x.path)
 
   trackEvent('InstanceProjectRemove', {
     loader: props.instance.loader,
     game_version: props.instance.game_version,
-    id: mod.id,
-    name: mod.name,
-    project_type: mod.project_type,
+    id: mod.data.id,
+    name: mod.data.name,
+    project_type: mod.data.project_type,
   })
 }
 
-const copyModLink = async (mod) => {
+const copyModLink = async (mod: ContentItem<ProjectListEntry>) => {
   await navigator.clipboard.writeText(
     `https://modrinth.com/${mod.data.project_type}/${mod.data.slug}`,
   )
@@ -730,15 +725,15 @@ const deleteSelected = async () => {
 }
 
 const shareNames = async () => {
-  await shareModal.value.show(functionValues.value.map((x) => x.name).join('\n'))
+  await shareModal.value?.show(functionValues.value.map((x) => x.name).join('\n'))
 }
 
 const shareFileNames = async () => {
-  await shareModal.value.show(functionValues.value.map((x) => x.file_name).join('\n'))
+  await shareModal.value?.show(functionValues.value.map((x) => x.file_name).join('\n'))
 }
 
 const shareUrls = async () => {
-  await shareModal.value.show(
+  await shareModal.value?.show(
     functionValues.value
       .filter((x) => x.slug)
       .map((x) => `https://modrinth.com/${x.project_type}/${x.slug}`)
@@ -747,7 +742,7 @@ const shareUrls = async () => {
 }
 
 const shareMarkdown = async () => {
-  await shareModal.value.show(
+  await shareModal.value?.show(
     functionValues.value
       .map((x) => {
         if (x.slug) {
@@ -812,15 +807,17 @@ const unlisten = await getCurrentWebview().onDragDropEvent(async (event) => {
   await initProjects()
 })
 
-const unlistenProfiles = await profile_listener(async (event) => {
-  if (
-    event.profile_path_id === props.instance.path &&
-    event.event === 'synced' &&
-    props.instance.install_stage !== 'pack_installing'
-  ) {
-    await initProjects()
-  }
-})
+const unlistenProfiles = await profile_listener(
+  async (event: { event: string; profile_path_id: string }) => {
+    if (
+      event.profile_path_id === props.instance.path &&
+      event.event === 'synced' &&
+      props.instance.install_stage !== 'pack_installing'
+    ) {
+      await initProjects()
+    }
+  },
+)
 
 onUnmounted(() => {
   unlisten()
diff --git a/apps/app-frontend/src/pages/instance/Overview.vue b/apps/app-frontend/src/pages/instance/Overview.vue
new file mode 100644
index 00000000..37df1f92
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/Overview.vue
@@ -0,0 +1,15 @@
+<template>{{ instance.name }} overview</template>
+<script setup lang="ts">
+import type { GameInstance } from '@/helpers/types'
+import type ContextMenu from '@/components/ui/ContextMenu.vue'
+import type { Version } from '@modrinth/utils'
+
+defineProps<{
+  instance: GameInstance
+  options: InstanceType<typeof ContextMenu>
+  offline: boolean
+  playing: boolean
+  versions: Version[]
+  installed: boolean
+}>()
+</script>
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue
new file mode 100644
index 00000000..500efe13
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/Worlds.vue
@@ -0,0 +1,463 @@
+<template>
+  <AddServerModal
+    ref="addServerModal"
+    :instance="instance"
+    @submit="
+      (server, start) => {
+        addServer(server)
+        if (start) {
+          joinWorld(server)
+        }
+      }
+    "
+  />
+  <EditServerModal ref="editServerModal" :instance="instance" @submit="editServer" />
+  <EditWorldModal ref="editWorldModal" :instance="instance" @submit="editWorld" />
+  <ConfirmModalWrapper
+    ref="removeServerModal"
+    :title="`Are you sure you want to remove ${serverToRemove?.name ?? 'this server'}?`"
+    :description="`'${serverToRemove?.name}'${serverToRemove?.address === serverToRemove?.name ? ' ' : ` (${serverToRemove?.address})`} will be removed from your list, including in-game, and there will be no way to recover it.`"
+    :markdown="false"
+    @proceed="proceedRemoveServer"
+  />
+  <ConfirmModalWrapper
+    ref="deleteWorldModal"
+    :title="`Are you sure you want to permanently delete this world?`"
+    :description="`'${worldToDelete?.name}' will be **permanently deleted**, and there will be no way to recover it.`"
+    @proceed="proceedDeleteWorld"
+  />
+  <div v-if="worlds.length > 0" class="flex flex-col gap-4">
+    <div class="flex flex-wrap gap-2 items-center">
+      <div class="iconified-input flex-grow">
+        <SearchIcon />
+        <input
+          v-model="searchFilter"
+          type="text"
+          :placeholder="`Search worlds...`"
+          class="text-input search-input"
+          autocomplete="off"
+        />
+        <Button v-if="searchFilter" class="r-btn" @click="() => (searchFilter = '')">
+          <XIcon />
+        </Button>
+      </div>
+      <ButtonStyled>
+        <button :disabled="refreshingAll" @click="refreshAllWorlds">
+          <template v-if="refreshingAll">
+            <SpinnerIcon class="animate-spin" />
+            Refreshing...
+          </template>
+          <template v-else>
+            <UpdatedIcon />
+            Refresh
+          </template>
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button @click="addServerModal?.show()">
+          <PlusIcon />
+          Add a server
+        </button>
+      </ButtonStyled>
+    </div>
+    <FilterBar v-model="filters" :options="filterOptions" show-all-options />
+    <div class="flex flex-col w-full gap-2">
+      <WorldItem
+        v-for="world in filteredWorlds"
+        :key="`world-${world.type}-${world.type == 'singleplayer' ? world.path : `${world.address}-${world.index}`}`"
+        :world="world"
+        :highlighted="highlightedWorld === getWorldIdentifier(world)"
+        :supports-quick-play="supportsQuickPlay"
+        :current-protocol="protocolVersion"
+        :playing-instance="playing"
+        :playing-world="worldsMatch(world, worldPlaying)"
+        :starting-instance="startingInstance"
+        :refreshing="world.type === 'server' ? serverData[world.address]?.refreshing : undefined"
+        :server-status="world.type === 'server' ? serverData[world.address]?.status : undefined"
+        :rendered-motd="
+          world.type === 'server' ? serverData[world.address]?.renderedMotd : undefined
+        "
+        :game-mode="world.type === 'singleplayer' ? GAME_MODES[world.game_mode] : undefined"
+        @play="() => joinWorld(world)"
+        @stop="() => emit('stop')"
+        @refresh="() => refreshServer((world as ServerWorld).address)"
+        @edit="
+          () =>
+            world.type === 'server' ? editServerModal?.show(world) : editWorldModal?.show(world)
+        "
+        @delete="() => promptToRemoveWorld(world)"
+      />
+    </div>
+  </div>
+  <div v-else class="w-full max-w-[48rem] mx-auto flex flex-col mt-6">
+    <RadialHeader class="">
+      <div class="flex items-center gap-6 w-[32rem] mx-auto">
+        <img src="@/assets/sad-modrinth-bot.webp" alt="" aria-hidden="true" class="h-24" />
+        <span class="text-contrast font-bold text-xl"> You don't have any worlds yet. </span>
+      </div>
+    </RadialHeader>
+    <div class="flex gap-2 mt-4 mx-auto">
+      <ButtonStyled>
+        <button @click="addServerModal?.show()">
+          <PlusIcon aria-hidden="true" />
+          Add a server
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button :disabled="refreshingAll" @click="refreshAllWorlds">
+          <template v-if="refreshingAll">
+            <SpinnerIcon aria-hidden="true" class="animate-spin" />
+            Refreshing...
+          </template>
+          <template v-else>
+            <UpdatedIcon aria-hidden="true" />
+            Refresh
+          </template>
+        </button>
+      </ButtonStyled>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { ref, computed, onUnmounted, watch } from 'vue'
+import { useRoute } from 'vue-router'
+import type { GameInstance } from '@/helpers/types'
+import {
+  Button,
+  ButtonStyled,
+  RadialHeader,
+  FilterBar,
+  type FilterBarOption,
+  type GameVersion,
+  GAME_MODES,
+} from '@modrinth/ui'
+import { PlusIcon, SpinnerIcon, UpdatedIcon, SearchIcon, XIcon } from '@modrinth/assets'
+import {
+  type SingleplayerWorld,
+  type World,
+  type ServerWorld,
+  type ServerData,
+  type ProfileEvent,
+  get_profile_protocol_version,
+  remove_server_from_profile,
+  delete_world,
+  start_join_server,
+  start_join_singleplayer_world,
+  getWorldIdentifier,
+  refreshServerData,
+  refreshWorld,
+  sortWorlds,
+  refreshServers,
+  hasQuickPlaySupport,
+  refreshWorlds,
+  handleDefaultProfileUpdateEvent,
+} from '@/helpers/worlds.ts'
+import AddServerModal from '@/components/ui/world/modal/AddServerModal.vue'
+import EditServerModal from '@/components/ui/world/modal/EditServerModal.vue'
+import EditWorldModal from '@/components/ui/world/modal/EditSingleplayerWorldModal.vue'
+import WorldItem from '@/components/ui/world/WorldItem.vue'
+
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import { handleError } from '@/store/notifications'
+import type ContextMenu from '@/components/ui/ContextMenu.vue'
+import type { Version } from '@modrinth/utils'
+import { profile_listener } from '@/helpers/events'
+import { get_game_versions } from '@/helpers/tags'
+import { defineMessages } from '@vintl/vintl'
+
+const route = useRoute()
+
+const addServerModal = ref<InstanceType<typeof AddServerModal>>()
+const editServerModal = ref<InstanceType<typeof EditServerModal>>()
+const editWorldModal = ref<InstanceType<typeof EditWorldModal>>()
+const removeServerModal = ref<InstanceType<typeof ConfirmModalWrapper>>()
+const deleteWorldModal = ref<InstanceType<typeof ConfirmModalWrapper>>()
+
+const serverToRemove = ref<ServerWorld>()
+const worldToDelete = ref<SingleplayerWorld>()
+
+const emit = defineEmits<{
+  (event: 'play', world: World): void
+  (event: 'stop'): void
+}>()
+
+const props = defineProps<{
+  instance: GameInstance
+  options: InstanceType<typeof ContextMenu> | null
+  offline: boolean
+  playing: boolean
+  versions: Version[]
+  installed: boolean
+}>()
+
+const instance = computed(() => props.instance)
+const playing = computed(() => props.playing)
+
+function play(world: World) {
+  emit('play', world)
+}
+
+const filters = ref<string[]>([])
+const searchFilter = ref('')
+
+const refreshingAll = ref(false)
+const hadNoWorlds = ref(true)
+const startingInstance = ref(false)
+const worldPlaying = ref<World>()
+
+const worlds = ref<World[]>([])
+const serverData = ref<Record<string, ServerData>>({})
+
+const protocolVersion = ref<number | null>(await get_profile_protocol_version(instance.value.path))
+
+const unlistenProfile = await profile_listener(async (e: ProfileEvent) => {
+  if (e.profile_path_id !== instance.value.path) return
+
+  console.info(`Handling profile event '${e.event}' for profile: ${e.profile_path_id}`)
+
+  if (e.event === 'servers_updated') {
+    await refreshAllWorlds()
+  }
+
+  await handleDefaultProfileUpdateEvent(worlds.value, instance.value.path, e)
+})
+
+await refreshAllWorlds()
+
+async function refreshServer(address: string) {
+  if (!serverData.value[address]) {
+    serverData.value[address] = {
+      refreshing: true,
+    }
+  }
+  await refreshServerData(serverData.value[address], protocolVersion.value, address)
+}
+
+async function refreshAllWorlds() {
+  if (refreshingAll.value) {
+    console.log(`Already refreshing, cancelling refresh.`)
+    return
+  }
+
+  refreshingAll.value = true
+
+  worlds.value = await refreshWorlds(instance.value.path).finally(
+    () => (refreshingAll.value = false),
+  )
+  await refreshServers(worlds.value, serverData.value, protocolVersion.value)
+
+  const hasNoWorlds = worlds.value.length === 0
+
+  if (hadNoWorlds.value && hasNoWorlds) {
+    setTimeout(() => {
+      refreshingAll.value = false
+    }, 1000)
+  } else {
+    refreshingAll.value = false
+  }
+
+  hadNoWorlds.value = hasNoWorlds
+}
+
+async function addServer(server: ServerWorld) {
+  worlds.value.push(server)
+  sortWorlds(worlds.value)
+  await refreshServer(server.address)
+}
+
+async function editServer(server: ServerWorld) {
+  const index = worlds.value.findIndex((w) => w.type === 'server' && w.index === server.index)
+  if (index !== -1) {
+    const oldServer = worlds.value[index] as ServerWorld
+    worlds.value[index] = server
+    sortWorlds(worlds.value)
+    if (oldServer.address !== server.address) {
+      await refreshServer(server.address)
+    }
+  } else {
+    handleError(`Error refreshing server, refreshing all worlds`)
+    await refreshAllWorlds()
+  }
+}
+
+async function removeServer(server: ServerWorld) {
+  await remove_server_from_profile(instance.value.path, server.index).catch(handleError)
+  worlds.value = worlds.value.filter((w) => w.type !== 'server' || w.index !== server.index)
+}
+
+async function editWorld(path: string, name: string, removeIcon: boolean) {
+  const world = worlds.value.find((world) => world.type === 'singleplayer' && world.path === path)
+  if (world) {
+    world.name = name
+    if (removeIcon) {
+      world.icon = undefined
+    }
+    sortWorlds(worlds.value)
+  } else {
+    handleError(`Error finding world in list, refreshing all worlds`)
+    await refreshAllWorlds()
+  }
+}
+
+async function deleteWorld(world: SingleplayerWorld) {
+  await delete_world(instance.value.path, world.path).catch(handleError)
+  worlds.value = worlds.value.filter((w) => w.type !== 'singleplayer' || w.path !== world.path)
+}
+
+function handleJoinError(err: unknown) {
+  handleError(err)
+  startingInstance.value = false
+  worldPlaying.value = undefined
+}
+
+async function joinWorld(world: World) {
+  console.log(`Joining world ${getWorldIdentifier(world)}`)
+  startingInstance.value = true
+  worldPlaying.value = world
+  if (world.type === 'server') {
+    await start_join_server(instance.value.path, world.address).catch(handleJoinError)
+  } else if (world.type === 'singleplayer') {
+    await start_join_singleplayer_world(instance.value.path, world.path).catch(handleJoinError)
+  }
+  play(world)
+  startingInstance.value = false
+}
+
+watch(
+  () => playing.value,
+  (playing) => {
+    if (!playing) {
+      worldPlaying.value = undefined
+
+      setTimeout(async () => {
+        for (const world of worlds.value) {
+          if (world.type === 'singleplayer' && world.locked) {
+            await refreshWorld(worlds.value, instance.value.path, world.path)
+          }
+        }
+      }, 1000)
+    }
+  },
+)
+
+function worldsMatch(world: World, other: World | undefined) {
+  if (world.type === 'server' && other?.type === 'server') {
+    return world.address === other.address
+  } else if (world.type === 'singleplayer' && other?.type === 'singleplayer') {
+    return world.path === other.path
+  }
+  return false
+}
+
+const gameVersions = ref<GameVersion[]>(await get_game_versions().catch(() => []))
+const supportsQuickPlay = computed(() =>
+  hasQuickPlaySupport(gameVersions.value, instance.value.game_version),
+)
+
+const filterOptions = computed(() => {
+  const options: FilterBarOption[] = []
+
+  const hasServer = worlds.value.some((x) => x.type === 'server')
+
+  if (worlds.value.some((x) => x.type === 'singleplayer') && hasServer) {
+    options.push({
+      id: 'singleplayer',
+      message: messages.singleplayer,
+    })
+    options.push({
+      id: 'server',
+      message: messages.server,
+    })
+  }
+
+  if (hasServer) {
+    // add available filter if there's any offline ("unavailable") servers AND there's any singleplayer worlds or available servers
+    if (
+      worlds.value.some(
+        (x) =>
+          x.type === 'server' &&
+          !serverData.value[x.address]?.status &&
+          !serverData.value[x.address]?.refreshing,
+      ) &&
+      worlds.value.some(
+        (x) =>
+          x.type === 'singleplayer' ||
+          (x.type === 'server' &&
+            serverData.value[x.address]?.status &&
+            !serverData.value[x.address]?.refreshing),
+      )
+    ) {
+      options.push({
+        id: 'available',
+        message: messages.available,
+      })
+    }
+  }
+
+  return options
+})
+
+const filteredWorlds = computed(() =>
+  worlds.value.filter((x) => {
+    const availableFilter = filters.value.includes('available')
+    const typeFilter = filters.value.includes('server') || filters.value.includes('singleplayer')
+
+    return (
+      (!typeFilter || filters.value.includes(x.type)) &&
+      (!availableFilter || x.type !== 'server' || serverData.value[x.address]?.status) &&
+      (!searchFilter.value || x.name.toLowerCase().includes(searchFilter.value.toLowerCase()))
+    )
+  }),
+)
+
+const highlightedWorld = ref(route.query.highlight)
+
+function promptToRemoveWorld(world: World): boolean {
+  if (world.type === 'server') {
+    serverToRemove.value = world
+    removeServerModal.value?.show()
+    return !!removeServerModal.value
+  } else {
+    worldToDelete.value = world
+    deleteWorldModal.value?.show()
+    return !!deleteWorldModal.value
+  }
+}
+
+async function proceedRemoveServer() {
+  if (!serverToRemove.value) {
+    handleError(`Error removing server, no server marked for removal.`)
+    return
+  }
+  await removeServer(serverToRemove.value)
+  serverToRemove.value = undefined
+}
+
+async function proceedDeleteWorld() {
+  if (!worldToDelete.value) {
+    handleError(`Error deleting world, no world marked for removal.`)
+    return
+  }
+  await deleteWorld(worldToDelete.value)
+  worldToDelete.value = undefined
+}
+
+onUnmounted(() => {
+  unlistenProfile()
+})
+
+const messages = defineMessages({
+  singleplayer: {
+    id: 'instance.worlds.type.singleplayer',
+    defaultMessage: 'Singleplayer',
+  },
+  server: {
+    id: 'instance.worlds.type.server',
+    defaultMessage: 'Server',
+  },
+  available: {
+    id: 'instance.worlds.filter.available',
+    defaultMessage: 'Available',
+  },
+})
+</script>
diff --git a/apps/app-frontend/src/pages/instance/index.js b/apps/app-frontend/src/pages/instance/index.js
index e433570e..fa77df52 100644
--- a/apps/app-frontend/src/pages/instance/index.js
+++ b/apps/app-frontend/src/pages/instance/index.js
@@ -1,5 +1,7 @@
 import Index from './Index.vue'
+import Overview from './Overview.vue'
+import Worlds from './Worlds.vue'
 import Mods from './Mods.vue'
 import Logs from './Logs.vue'
 
-export { Index, Mods, Logs }
+export { Index, Overview, Worlds, Mods, Logs }
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 1f5082b1..941ab0d0 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -155,7 +155,7 @@ import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
 import { get as getInstance, get_projects as getInstanceProjects } from '@/helpers/profile'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { ref, shallowRef, watch } from 'vue'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { handleError } from '@/store/notifications.js'
@@ -170,6 +170,7 @@ import { openUrl } from '@tauri-apps/plugin-opener'
 dayjs.extend(relativeTime)
 
 const route = useRoute()
+const router = useRouter()
 const breadcrumbs = useBreadcrumbs()
 const themeStore = useTheming()
 
@@ -192,6 +193,11 @@ const [allLoaders, allGameVersions] = await Promise.all([
 async function fetchProjectData() {
   const project = await get_project(route.params.id, 'must_revalidate').catch(handleError)
 
+  if (!project) {
+    handleError('Error loading project')
+    return
+  }
+
   data.value = project
   ;[versions.value, members.value, categories.value, instance.value, instanceProjects.value] =
     await Promise.all([
@@ -242,6 +248,9 @@ async function install(version) {
         installedVersion.value = version
       }
     },
+    (profile) => {
+      router.push(`/instance/${profile}`)
+    },
   )
 }
 
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 49eae846..6d5e4e37 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -18,6 +18,14 @@ export default new createRouter({
         breadcrumb: [{ name: 'Home' }],
       },
     },
+    {
+      path: '/worlds',
+      name: 'Worlds',
+      component: Pages.Worlds,
+      meta: {
+        breadcrumb: [{ name: 'Worlds' }],
+      },
+    },
     {
       path: '/browse/:projectType',
       name: 'Discover content',
@@ -106,13 +114,31 @@ export default new createRouter({
       component: Instance.Index,
       props: true,
       children: [
+        // {
+        //   path: '',
+        //   name: 'Overview',
+        //   component: Instance.Overview,
+        //   meta: {
+        //     useRootContext: true,
+        //     breadcrumb: [{ name: '?Instance' }],
+        //   },
+        // },
+        {
+          path: 'worlds',
+          name: 'InstanceWorlds',
+          component: Instance.Worlds,
+          meta: {
+            useRootContext: true,
+            breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Worlds' }],
+          },
+        },
         {
           path: '',
           name: 'Mods',
           component: Instance.Mods,
           meta: {
             useRootContext: true,
-            breadcrumb: [{ name: '?Instance' }],
+            breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
           },
         },
         {
@@ -121,7 +147,7 @@ export default new createRouter({
           component: Instance.Mods,
           meta: {
             useRootContext: true,
-            breadcrumb: [{ name: '?Instance' }],
+            breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
           },
         },
         {
diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
index 90ca66cd..4746b907 100644
--- a/apps/app-frontend/src/store/install.js
+++ b/apps/app-frontend/src/store/install.js
@@ -23,8 +23,8 @@ export const useInstall = defineStore('installStore', {
     setInstallConfirmModal(ref) {
       this.installConfirmModal = ref
     },
-    showInstallConfirmModal(project, version_id, onInstall) {
-      this.installConfirmModal.show(project, version_id, onInstall)
+    showInstallConfirmModal(project, version_id, onInstall, createInstanceCallback) {
+      this.installConfirmModal.show(project, version_id, onInstall, createInstanceCallback)
     },
     setIncompatibilityWarningModal(ref) {
       this.incompatibilityWarningModal = ref
@@ -41,7 +41,14 @@ export const useInstall = defineStore('installStore', {
   },
 })
 
-export const install = async (projectId, versionId, instancePath, source, callback = () => {}) => {
+export const install = async (
+  projectId,
+  versionId,
+  instancePath,
+  source,
+  callback = () => {},
+  createInstanceCallback = () => {},
+) => {
   const project = await get_project(projectId, 'must_revalidate').catch(handleError)
 
   if (project.project_type === 'modpack') {
@@ -49,7 +56,13 @@ export const install = async (projectId, versionId, instancePath, source, callba
     const packs = await list().catch(handleError)
 
     if (packs.length === 0 || !packs.find((pack) => pack.linked_data?.project_id === project.id)) {
-      await packInstall(project.id, version, project.title, project.icon_url).catch(handleError)
+      await packInstall(
+        project.id,
+        version,
+        project.title,
+        project.icon_url,
+        createInstanceCallback,
+      ).catch(handleError)
 
       trackEvent('PackInstall', {
         id: project.id,
@@ -61,7 +74,7 @@ export const install = async (projectId, versionId, instancePath, source, callba
       callback(version)
     } else {
       const install = useInstall()
-      install.showInstallConfirmModal(project, version, callback)
+      install.showInstallConfirmModal(project, version, callback, createInstanceCallback)
     }
   } else {
     if (instancePath) {
diff --git a/apps/app-frontend/src/store/state.js b/apps/app-frontend/src/store/state.js
index dd68a6ee..e9811e62 100644
--- a/apps/app-frontend/src/store/state.js
+++ b/apps/app-frontend/src/store/state.js
@@ -1,4 +1,4 @@
-import { useTheming } from './theme'
+import { useTheming } from './theme.ts'
 import { useBreadcrumbs } from './breadcrumbs'
 import { useLoading } from './loading'
 import { useNotifications, handleError } from './notifications'
diff --git a/apps/app-frontend/src/store/theme.js b/apps/app-frontend/src/store/theme.js
deleted file mode 100644
index d9111f50..00000000
--- a/apps/app-frontend/src/store/theme.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { defineStore } from 'pinia'
-
-export const useTheming = defineStore('themeStore', {
-  state: () => ({
-    themeOptions: ['dark', 'light', 'oled', 'system'],
-    advancedRendering: true,
-    selectedTheme: 'dark',
-    toggleSidebar: false,
-
-    devMode: false,
-    featureFlags: {},
-  }),
-  actions: {
-    setThemeState(newTheme) {
-      if (this.themeOptions.includes(newTheme)) this.selectedTheme = newTheme
-      else console.warn('Selected theme is not present. Check themeOptions.')
-
-      this.setThemeClass()
-    },
-    setThemeClass() {
-      for (const theme of this.themeOptions) {
-        document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
-      }
-
-      let theme = this.selectedTheme
-      if (this.selectedTheme === 'system') {
-        const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)')
-        if (darkThemeMq.matches) {
-          theme = 'dark'
-        } else {
-          theme = 'light'
-        }
-      }
-
-      document.getElementsByTagName('html')[0].classList.add(`${theme}-mode`)
-    },
-  },
-})
diff --git a/apps/app-frontend/src/store/theme.ts b/apps/app-frontend/src/store/theme.ts
new file mode 100644
index 00000000..a7909416
--- /dev/null
+++ b/apps/app-frontend/src/store/theme.ts
@@ -0,0 +1,70 @@
+import { defineStore } from 'pinia'
+
+export const DEFAULT_FEATURE_FLAGS = {
+  project_background: false,
+  page_path: false,
+  worlds_tab: false,
+  worlds_in_home: true,
+}
+
+export const THEME_OPTIONS = ['dark', 'light', 'oled', 'system'] as const
+
+export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
+export type FeatureFlags = Record<FeatureFlag, boolean>
+export type ColorTheme = (typeof THEME_OPTIONS)[number]
+
+export type ThemeStore = {
+  selectedTheme: ColorTheme
+  advancedRendering: boolean
+  toggleSidebar: boolean
+
+  devMode: boolean
+  featureFlags: FeatureFlags
+}
+
+export const DEFAULT_THEME_STORE: ThemeStore = {
+  selectedTheme: 'dark',
+  advancedRendering: true,
+  toggleSidebar: false,
+
+  devMode: false,
+  featureFlags: DEFAULT_FEATURE_FLAGS,
+}
+
+export const useTheming = defineStore('themeStore', {
+  state: () => DEFAULT_THEME_STORE,
+  actions: {
+    setThemeState(newTheme: ColorTheme) {
+      if (THEME_OPTIONS.includes(newTheme)) {
+        this.selectedTheme = newTheme
+      } else {
+        console.warn('Selected theme is not present. Check themeOptions.')
+      }
+
+      this.setThemeClass()
+    },
+    setThemeClass() {
+      for (const theme of THEME_OPTIONS) {
+        document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
+      }
+
+      let theme = this.selectedTheme
+      if (this.selectedTheme === 'system') {
+        const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)')
+        if (darkThemeMq.matches) {
+          theme = 'dark'
+        } else {
+          theme = 'light'
+        }
+      }
+
+      document.getElementsByTagName('html')[0].classList.add(`${theme}-mode`)
+    },
+    getFeatureFlag(key: FeatureFlag) {
+      return this.featureFlags[key] ?? DEFAULT_FEATURE_FLAGS[key]
+    },
+    getThemeOptions() {
+      return THEME_OPTIONS
+    },
+  },
+})
diff --git a/apps/app-playground/Cargo.toml b/apps/app-playground/Cargo.toml
index a90c40e7..7f2e4288 100644
--- a/apps/app-playground/Cargo.toml
+++ b/apps/app-playground/Cargo.toml
@@ -1,13 +1,11 @@
 [package]
 name = "theseus_playground"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-theseus = { path = "../../packages/app-lib", features = ["cli"] }
-tokio = { version = "1", features = ["full"] }
-webbrowser = "0.8.13"
-
-tracing = "0.1.37"
+theseus = { workspace = true, features = ["cli"] }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
+enumset.workspace = true
diff --git a/apps/app-playground/src/main.rs b/apps/app-playground/src/main.rs
index f8d94393..24019b12 100644
--- a/apps/app-playground/src/main.rs
+++ b/apps/app-playground/src/main.rs
@@ -3,9 +3,9 @@
     windows_subsystem = "windows"
 )]
 
-use std::time::Duration;
+use enumset::EnumSet;
 use theseus::prelude::*;
-use tokio::signal::ctrl_c;
+use theseus::worlds::get_recent_worlds;
 
 // A simple Rust implementation of the authentication run
 // 1) call the authenticate_begin_flow() function to get the URL to open (like you would in the frontend)
@@ -15,8 +15,7 @@ pub async fn authenticate_run() -> theseus::Result<Credentials> {
     println!("A browser window will now open, follow the login flow there.");
     let login = minecraft_auth::begin_login().await?;
 
-    println!("URL {}", login.redirect_uri.as_str());
-    webbrowser::open(login.redirect_uri.as_str())?;
+    println!("Open URL {} in a browser", login.redirect_uri.as_str());
 
     println!("Please enter URL code: ");
     let mut input = String::new();
@@ -41,21 +40,16 @@ async fn main() -> theseus::Result<()> {
     // Initialize state
     State::init().await?;
 
-    loop {
-        if State::get().await?.friends_socket.is_connected().await {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(500)).await;
+    let worlds = get_recent_worlds(4, EnumSet::all()).await?;
+    for world in worlds {
+        println!(
+            "World: {:?}/{:?} played at {:?}: {:#?}",
+            world.profile,
+            world.world.name,
+            world.world.last_played,
+            world.world.details
+        );
     }
 
-    tracing::info!("Starting host");
-
-    let socket = State::get().await?.friends_socket.open_port(25565).await?;
-    tracing::info!("Running host on socket {}", socket.socket_id());
-
-    ctrl_c().await?;
-    tracing::info!("Stopping host");
-    socket.shutdown().await?;
-
     Ok(())
 }
diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
index 06f38432..d05c3f30 100644
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -1,60 +1,52 @@
 [package]
 name = "theseus_gui"
-version = "0.9.3"
+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 = "2021"
+edition = "2024"
 build = "build.rs"
 
 [build-dependencies]
-tauri-build = { version = "2.0.3", features = ["codegen"] }
+tauri-build = { workspace = true, features = ["codegen"] }
 
 [dependencies]
-theseus = { path = "../../packages/app-lib", features = ["tauri"] }
+theseus = { workspace = true, features = ["tauri"] }
 
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_with = "3.0.0"
+serde_json.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_with.workspace = true
 
-tauri = { version = "2.1.1",  features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
-tauri-plugin-window-state = "2.2.0"
-tauri-plugin-deep-link = "2.2.0"
-tauri-plugin-os = "2.2.0"
-tauri-plugin-opener = "2.2.1"
-tauri-plugin-dialog = "2.2.0"
-tauri-plugin-updater = { version = "2.3.0" }
-tauri-plugin-single-instance = { version = "2.2.0" }
+tauri = { workspace = true, features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
+tauri-plugin-window-state.workspace = true
+tauri-plugin-deep-link.workspace = true
+tauri-plugin-os.workspace = true
+tauri-plugin-opener.workspace = true
+tauri-plugin-dialog.workspace = true
+tauri-plugin-updater.workspace = true
+tauri-plugin-single-instance.workspace = true
 
-tokio = { version = "1", features = ["full"] }
-thiserror = "1.0"
-daedalus = { path = "../../packages/daedalus" }
-chrono = "0.4.26"
+tokio = { workspace = true, features = ["time"] }
+thiserror.workspace = true
+daedalus.workspace = true
+chrono.workspace = true
+either.workspace = true
 
-url = "2.2"
-uuid = { version = "1.1", features = ["serde", "v4"] }
-os_info = "3.7.0"
+url.workspace = true
+urlencoding.workspace = true
+uuid = { workspace = true, features = ["serde", "v4"] }
 
-tracing = "0.1.37"
-tracing-error = "0.2.0"
+tracing.workspace = true
+tracing-error.workspace = true
 
-dashmap = "6.0.1"
-paste = "1.0.15"
+dashmap.workspace = true
+paste.workspace = true
+enumset = { workspace = true, features = ["serde"] }
 
-opener = { version = "0.7.2", features = ["reveal", "dbus-vendored"] }
-
-native-dialog = "0.7.0"
-
-[target.'cfg(not(target_os = "linux"))'.dependencies]
-window-shadows = "0.2.1"
-
-[target.'cfg(target_os = "macos")'.dependencies]
-cocoa = "0.25.0"
-objc = "0.2.7"
-rand = "0.8.5"
+native-dialog.workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
-tauri-plugin-updater = { version = "2.3.0", optional = true, features = ["native-tls-vendored", "zip"], default-features = false }
+tauri-plugin-updater = { workspace = true, optional = true }
 
 [features]
 # by default Tauri runs in production mode
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 3c00b6d8..3d7e38a4 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -226,6 +226,30 @@ fn main() {
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),
+            )
+            .plugin(
+                "worlds",
+                InlinedPlugin::new()
+                    .commands(&[
+                        "get_recent_worlds",
+                        "get_profile_worlds",
+                        "get_singleplayer_world",
+                        "set_world_display_status",
+                        "rename_world",
+                        "reset_world_icon",
+                        "backup_world",
+                        "delete_world",
+                        "add_server_to_profile",
+                        "edit_server_in_profile",
+                        "remove_server_from_profile",
+                        "get_profile_protocol_version",
+                        "get_server_status",
+                        "start_join_singleplayer_world",
+                        "start_join_server",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             ),
     )
     .expect("Failed to run tauri-build");
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 6c53b8e3..67ae0611 100644
--- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json
@@ -34,6 +34,7 @@
     "settings:default",
     "tags:default",
     "utils:default",
-    "friends:default"
+    "friends:default",
+    "worlds:default"
   ]
 }
diff --git a/apps/app/package.json b/apps/app/package.json
index 168ac345..794bf7e0 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -9,7 +9,7 @@
     "fix": "cargo fmt && cargo clippy --fix"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.1.0"
+    "@tauri-apps/cli": "2.5.0"
   },
   "dependencies": {
     "@modrinth/app-frontend": "workspace:*",
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index 264b07e8..f36b7206 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -18,6 +18,7 @@ pub mod utils;
 
 pub mod cache;
 pub mod friends;
+pub mod worlds;
 
 pub type Result<T> = std::result::Result<T, TheseusSerializableError>;
 
diff --git a/apps/app/src/api/profile.rs b/apps/app/src/api/profile.rs
index 18e3831d..db979be3 100644
--- a/apps/app/src/api/profile.rs
+++ b/apps/app/src/api/profile.rs
@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use theseus::prelude::*;
+use theseus::profile::QuickPlayType;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("profile")
@@ -250,7 +251,7 @@ pub async fn profile_get_pack_export_candidates(
 // invoke('plugin:profile|profile_run', path)
 #[tauri::command]
 pub async fn profile_run(path: &str) -> Result<ProcessMetadata> {
-    let process = profile::run(path).await?;
+    let process = profile::run(path, &QuickPlayType::None).await?;
 
     Ok(process)
 }
@@ -264,7 +265,9 @@ pub async fn profile_run_credentials(
     path: &str,
     credentials: Credentials,
 ) -> Result<ProcessMetadata> {
-    let process = profile::run_credentials(path, &credentials).await?;
+    let process =
+        profile::run_credentials(path, &credentials, &QuickPlayType::None)
+            .await?;
 
     Ok(process)
 }
@@ -347,6 +350,9 @@ pub async fn profile_edit(path: &str, edit_profile: EditProfile) -> Result<()> {
             prof.name = name;
         }
         if let Some(game_version) = edit_profile.game_version.clone() {
+            if game_version != prof.game_version {
+                prof.protocol_version = None;
+            }
             prof.game_version = game_version;
         }
         if let Some(loader) = edit_profile.loader {
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
index 063c2937..7a3a9897 100644
--- a/apps/app/src/api/utils.rs
+++ b/apps/app/src/api/utils.rs
@@ -1,12 +1,16 @@
 use serde::{Deserialize, Serialize};
+use tauri::Runtime;
+use tauri_plugin_opener::OpenerExt;
 use theseus::{
     handler,
     prelude::{CommandPayload, DirectoryInfo},
 };
 
-use crate::api::Result;
+use crate::api::{Result, TheseusSerializableError};
 use dashmap::DashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+use theseus::prelude::canonicalize;
+use url::Url;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("utils")
@@ -52,57 +56,56 @@ pub enum OS {
 // Create a new HashMap with the same keys
 // Values provided should not be used directly, as they are not guaranteed to be up-to-date
 #[tauri::command]
-pub async fn progress_bars_list(
-) -> Result<DashMap<uuid::Uuid, theseus::LoadingBar>> {
+pub async fn progress_bars_list()
+-> Result<DashMap<uuid::Uuid, theseus::LoadingBar>> {
     let res = theseus::EventState::list_progress_bars().await?;
     Ok(res)
 }
 
-// cfg only on mac os
 // disables mouseover and fixes a random crash error only fixed by recent versions of macos
-#[cfg(target_os = "macos")]
 #[tauri::command]
 pub async fn should_disable_mouseover() -> bool {
-    // We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety
-    let os = os_info::get();
-    if let os_info::Version::Semantic(major, minor, _) = os.version() {
-        if *major >= 12 && *minor >= 3 {
-            // Mac os version is 12.3 or higher, we allow mouseover
-            return false;
+    if cfg!(target_os = "macos") {
+        // We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety
+        if let tauri_plugin_os::Version::Semantic(major, minor, _) =
+            tauri_plugin_os::version()
+        {
+            if major >= 12 && minor >= 3 {
+                // Mac os version is 12.3 or higher, we allow mouseover
+                return false;
+            }
         }
+        true
+    } else {
+        // Not macos, we allow mouseover
+        false
     }
-    true
-}
-#[cfg(not(target_os = "macos"))]
-#[tauri::command]
-pub async fn should_disable_mouseover() -> bool {
-    false
 }
 
 #[tauri::command]
-pub fn highlight_in_folder(path: PathBuf) {
-    let res = opener::reveal(path);
-
-    if let Err(e) = res {
+pub fn highlight_in_folder<R: Runtime>(
+    app: tauri::AppHandle<R>,
+    path: PathBuf,
+) {
+    if let Err(e) = app.opener().reveal_item_in_dir(path) {
         tracing::error!("Failed to highlight file in folder: {}", e);
     }
 }
 
 #[tauri::command]
-pub fn open_path(path: PathBuf) {
-    let res = opener::open(path);
-
-    if let Err(e) = res {
+pub fn open_path<R: Runtime>(app: tauri::AppHandle<R>, path: PathBuf) {
+    if let Err(e) = app.opener().open_path(path.to_string_lossy(), None::<&str>)
+    {
         tracing::error!("Failed to open path: {}", e);
     }
 }
 
 #[tauri::command]
-pub fn show_launcher_logs_folder() {
+pub fn show_launcher_logs_folder<R: Runtime>(app: tauri::AppHandle<R>) {
     let path = DirectoryInfo::launcher_logs_dir().unwrap_or_default();
     // failure to get folder just opens filesystem
     // (ie: if in debug mode only and launcher_logs never created)
-    open_path(path);
+    open_path(app, path);
 }
 
 // Get opening command
@@ -147,3 +150,28 @@ pub async fn handle_command(command: String) -> Result<()> {
     tracing::info!("handle command: {command}");
     Ok(theseus::handler::parse_and_emit_command(&command).await?)
 }
+
+// Remove when (and if) https://github.com/tauri-apps/tauri/issues/12022 is implemented
+pub(crate) fn tauri_convert_file_src(path: &Path) -> Result<Url> {
+    #[cfg(any(windows, target_os = "android"))]
+    const BASE: &str = "http://asset.localhost/";
+    #[cfg(not(any(windows, target_os = "android")))]
+    const BASE: &str = "asset://localhost/";
+
+    macro_rules! theseus_try {
+        ($test:expr) => {
+            match $test {
+                Ok(val) => val,
+                Err(e) => {
+                    return Err(TheseusSerializableError::Theseus(e.into()))
+                }
+            }
+        };
+    }
+
+    let path = theseus_try!(canonicalize(path));
+    let path = path.to_string_lossy();
+    let encoded = urlencoding::encode(&path);
+
+    Ok(theseus_try!(Url::parse(&format!("{BASE}{encoded}"))))
+}
diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs
new file mode 100644
index 00000000..f72f738b
--- /dev/null
+++ b/apps/app/src/api/worlds.rs
@@ -0,0 +1,218 @@
+use crate::api::Result;
+use either::Either;
+use enumset::EnumSet;
+use tauri::{AppHandle, Manager, Runtime};
+use theseus::prelude::ProcessMetadata;
+use theseus::profile::{QuickPlayType, get_full_path};
+use theseus::worlds::{
+    DisplayStatus, ServerPackStatus, ServerStatus, World, WorldType,
+    WorldWithProfile,
+};
+use theseus::{profile, worlds};
+
+pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
+    tauri::plugin::Builder::new("worlds")
+        .invoke_handler(tauri::generate_handler![
+            get_recent_worlds,
+            get_profile_worlds,
+            get_singleplayer_world,
+            set_world_display_status,
+            rename_world,
+            reset_world_icon,
+            backup_world,
+            delete_world,
+            add_server_to_profile,
+            edit_server_in_profile,
+            remove_server_from_profile,
+            get_profile_protocol_version,
+            get_server_status,
+            start_join_singleplayer_world,
+            start_join_server,
+        ])
+        .build()
+}
+
+#[tauri::command]
+pub async fn get_recent_worlds<R: Runtime>(
+    app_handle: AppHandle<R>,
+    limit: usize,
+    display_statuses: Option<EnumSet<DisplayStatus>>,
+) -> Result<Vec<WorldWithProfile>> {
+    let mut result = worlds::get_recent_worlds(
+        limit,
+        display_statuses.unwrap_or(EnumSet::all()),
+    )
+    .await?;
+    for world in result.iter_mut() {
+        adapt_world_icon(&app_handle, &mut world.world);
+    }
+    Ok(result)
+}
+
+#[tauri::command]
+pub async fn get_profile_worlds<R: Runtime>(
+    app_handle: AppHandle<R>,
+    path: &str,
+) -> Result<Vec<World>> {
+    let mut result = worlds::get_profile_worlds(path).await?;
+    for world in result.iter_mut() {
+        adapt_world_icon(&app_handle, world);
+    }
+    Ok(result)
+}
+
+#[tauri::command]
+pub async fn get_singleplayer_world<R: Runtime>(
+    app_handle: AppHandle<R>,
+    instance: &str,
+    world: &str,
+) -> Result<World> {
+    let mut world = worlds::get_singleplayer_world(instance, world).await?;
+    adapt_world_icon(&app_handle, &mut world);
+    Ok(world)
+}
+
+fn adapt_world_icon<R: Runtime>(app_handle: &AppHandle<R>, world: &mut World) {
+    if let Some(Either::Left(icon_path)) = &world.icon {
+        let icon_path = icon_path.clone();
+        if let Ok(new_url) = super::utils::tauri_convert_file_src(&icon_path) {
+            world.icon = Some(Either::Right(new_url));
+            if let Err(e) =
+                app_handle.asset_protocol_scope().allow_file(&icon_path)
+            {
+                tracing::warn!(
+                    "Failed to allow file access for icon {}: {}",
+                    icon_path.display(),
+                    e
+                );
+            }
+        } else {
+            tracing::warn!(
+                "Encountered invalid icon path for world {}: {}",
+                world.name,
+                icon_path.display()
+            );
+            world.icon = None;
+        }
+    }
+}
+
+#[tauri::command]
+pub async fn set_world_display_status(
+    instance: &str,
+    world_type: WorldType,
+    world_id: &str,
+    display_status: DisplayStatus,
+) -> Result<()> {
+    Ok(worlds::set_world_display_status(
+        instance,
+        world_type,
+        world_id,
+        display_status,
+    )
+    .await?)
+}
+
+#[tauri::command]
+pub async fn rename_world(
+    instance: &str,
+    world: &str,
+    new_name: &str,
+) -> Result<()> {
+    let instance = get_full_path(instance).await?;
+    worlds::rename_world(&instance, world, new_name).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn reset_world_icon(instance: &str, world: &str) -> Result<()> {
+    let instance = get_full_path(instance).await?;
+    worlds::reset_world_icon(&instance, world).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn backup_world(instance: &str, world: &str) -> Result<u64> {
+    let instance = get_full_path(instance).await?;
+    Ok(worlds::backup_world(&instance, world).await?)
+}
+
+#[tauri::command]
+pub async fn delete_world(instance: &str, world: &str) -> Result<()> {
+    let instance = get_full_path(instance).await?;
+    worlds::delete_world(&instance, world).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn add_server_to_profile(
+    path: &str,
+    name: String,
+    address: String,
+    pack_status: ServerPackStatus,
+) -> Result<usize> {
+    let path = get_full_path(path).await?;
+    Ok(
+        worlds::add_server_to_profile(&path, name, address, pack_status)
+            .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn edit_server_in_profile(
+    path: &str,
+    index: usize,
+    name: String,
+    address: String,
+    pack_status: ServerPackStatus,
+) -> Result<()> {
+    let path = get_full_path(path).await?;
+    worlds::edit_server_in_profile(&path, index, name, address, pack_status)
+        .await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn remove_server_from_profile(
+    path: &str,
+    index: usize,
+) -> Result<()> {
+    let path = get_full_path(path).await?;
+    worlds::remove_server_from_profile(&path, index).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn get_profile_protocol_version(path: &str) -> Result<Option<i32>> {
+    Ok(worlds::get_profile_protocol_version(path).await?)
+}
+
+#[tauri::command]
+pub async fn get_server_status(
+    address: &str,
+    protocol_version: Option<i32>,
+) -> Result<ServerStatus> {
+    Ok(worlds::get_server_status(address, protocol_version).await?)
+}
+
+#[tauri::command]
+pub async fn start_join_singleplayer_world(
+    path: &str,
+    world: String,
+) -> Result<ProcessMetadata> {
+    let process =
+        profile::run(path, &QuickPlayType::Singleplayer(world)).await?;
+
+    Ok(process)
+}
+
+#[tauri::command]
+pub async fn start_join_server(
+    path: &str,
+    address: &str,
+) -> Result<ProcessMetadata> {
+    let process =
+        profile::run(path, &QuickPlayType::Server(address.to_owned())).await?;
+
+    Ok(process)
+}
diff --git a/apps/app/src/macos/mod.rs b/apps/app/src/macos/mod.rs
index 8098222e..af946b00 100644
--- a/apps/app/src/macos/mod.rs
+++ b/apps/app/src/macos/mod.rs
@@ -1,2 +1 @@
 pub mod deep_link;
-pub mod window_ext;
diff --git a/apps/app/src/macos/window_ext.rs b/apps/app/src/macos/window_ext.rs
deleted file mode 100644
index 8a2d9e15..00000000
--- a/apps/app/src/macos/window_ext.rs
+++ /dev/null
@@ -1,412 +0,0 @@
-// Stolen from https://gist.github.com/charrondev/43150e940bd2771b1ea88256d491c7a9
-use objc::{msg_send, sel, sel_impl};
-use rand::{distributions::Alphanumeric, Rng};
-use tauri::{
-    plugin::{Builder, TauriPlugin},
-    Emitter, Runtime, Window,
-}; // 0.8
-
-const WINDOW_CONTROL_PAD_X: f64 = 9.0;
-const WINDOW_CONTROL_PAD_Y: f64 = 10.0;
-
-struct UnsafeWindowHandle(*mut std::ffi::c_void);
-unsafe impl Send for UnsafeWindowHandle {}
-unsafe impl Sync for UnsafeWindowHandle {}
-
-pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    Builder::new("traffic_light_positioner")
-        .on_window_ready(|window| {
-            #[cfg(target_os = "macos")]
-            setup_traffic_light_positioner(window);
-        })
-        .build()
-}
-
-#[cfg(target_os = "macos")]
-fn position_traffic_lights(
-    ns_window_handle: UnsafeWindowHandle,
-    x: f64,
-    y: f64,
-) {
-    use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
-    use cocoa::foundation::NSRect;
-    let ns_window = ns_window_handle.0 as cocoa::base::id;
-    unsafe {
-        let close = ns_window
-            .standardWindowButton_(NSWindowButton::NSWindowCloseButton);
-        let miniaturize = ns_window
-            .standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
-        let zoom =
-            ns_window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
-
-        let title_bar_container_view = close.superview().superview();
-
-        let close_rect: NSRect = msg_send![close, frame];
-        let button_height = close_rect.size.height + 12.0;
-
-        let title_bar_frame_height = button_height + y;
-        let mut title_bar_rect = NSView::frame(title_bar_container_view);
-        title_bar_rect.size.height = title_bar_frame_height;
-        title_bar_rect.origin.y =
-            NSView::frame(ns_window).size.height - title_bar_frame_height;
-        let _: () =
-            msg_send![title_bar_container_view, setFrame: title_bar_rect];
-
-        let window_buttons = vec![close, miniaturize, zoom];
-        let space_between =
-            NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
-
-        for (i, button) in window_buttons.into_iter().enumerate() {
-            let mut rect: NSRect = NSView::frame(button);
-            rect.origin.x = x + (i as f64 * space_between) + 6.0;
-            button.setFrameOrigin(rect.origin);
-        }
-    }
-}
-
-#[cfg(target_os = "macos")]
-#[derive(Debug)]
-struct WindowState<R: Runtime> {
-    window: Window<R>,
-}
-
-#[cfg(target_os = "macos")]
-pub fn setup_traffic_light_positioner<R: Runtime>(window: Window<R>) {
-    use cocoa::appkit::NSWindow;
-    use cocoa::base::{id, BOOL};
-    use cocoa::foundation::NSUInteger;
-    use objc::runtime::{Object, Sel};
-    use std::ffi::c_void;
-
-    // Do the initial positioning
-    position_traffic_lights(
-        UnsafeWindowHandle(
-            window.ns_window().expect("Failed to create window handle"),
-        ),
-        WINDOW_CONTROL_PAD_X,
-        WINDOW_CONTROL_PAD_Y,
-    );
-
-    // Ensure they stay in place while resizing the window.
-    fn with_window_state<R: Runtime, F: FnOnce(&mut WindowState<R>) -> T, T>(
-        this: &Object,
-        func: F,
-    ) {
-        let ptr = unsafe {
-            let x: *mut c_void = *this.get_ivar("app_box");
-            &mut *(x as *mut WindowState<R>)
-        };
-        func(ptr);
-    }
-
-    unsafe {
-        let ns_win = window
-            .ns_window()
-            .expect("NS Window should exist to mount traffic light delegate.")
-            as id;
-
-        let current_delegate: id = ns_win.delegate();
-
-        extern "C" fn on_window_should_close(
-            this: &Object,
-            _cmd: Sel,
-            sender: id,
-        ) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, windowShouldClose: sender]
-            }
-        }
-        extern "C" fn on_window_will_close(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillClose: notification];
-            }
-        }
-        extern "C" fn on_window_did_resize<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(this, |state: &mut WindowState<R>| {
-                    let id = state.window.ns_window().expect(
-                        "NS window should exist on state to handle resize",
-                    ) as id;
-
-                    #[cfg(target_os = "macos")]
-                    position_traffic_lights(
-                        UnsafeWindowHandle(id as *mut std::ffi::c_void),
-                        WINDOW_CONTROL_PAD_X,
-                        WINDOW_CONTROL_PAD_Y,
-                    );
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidResize: notification];
-            }
-        }
-        extern "C" fn on_window_did_move(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidMove: notification];
-            }
-        }
-        extern "C" fn on_window_did_change_backing_properties(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidChangeBackingProperties: notification];
-            }
-        }
-        extern "C" fn on_window_did_become_key(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () =
-                    msg_send![super_del, windowDidBecomeKey: notification];
-            }
-        }
-        extern "C" fn on_window_did_resign_key(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () =
-                    msg_send![super_del, windowDidResignKey: notification];
-            }
-        }
-        extern "C" fn on_dragging_entered(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, draggingEntered: notification]
-            }
-        }
-        extern "C" fn on_prepare_for_drag_operation(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, prepareForDragOperation: notification]
-            }
-        }
-        extern "C" fn on_perform_drag_operation(
-            this: &Object,
-            _cmd: Sel,
-            sender: id,
-        ) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, performDragOperation: sender]
-            }
-        }
-        extern "C" fn on_conclude_drag_operation(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () =
-                    msg_send![super_del, concludeDragOperation: notification];
-            }
-        }
-        extern "C" fn on_dragging_exited(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, draggingExited: notification];
-            }
-        }
-        extern "C" fn on_window_will_use_full_screen_presentation_options(
-            this: &Object,
-            _cmd: Sel,
-            window: id,
-            proposed_options: NSUInteger,
-        ) -> NSUInteger {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, window: window willUseFullScreenPresentationOptions: proposed_options]
-            }
-        }
-        extern "C" fn on_window_did_enter_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("did-enter-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidEnterFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_will_enter_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("will-enter-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillEnterFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_did_exit_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("did-exit-fullscreen", ())
-                        .expect("Failed to emit event");
-
-                    let id =
-                        state.window.ns_window().expect("Failed to emit event")
-                            as id;
-                    position_traffic_lights(
-                        UnsafeWindowHandle(id as *mut std::ffi::c_void),
-                        WINDOW_CONTROL_PAD_X,
-                        WINDOW_CONTROL_PAD_Y,
-                    );
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () =
-                    msg_send![super_del, windowDidExitFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_will_exit_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("will-exit-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillExitFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_did_fail_to_enter_full_screen(
-            this: &Object,
-            _cmd: Sel,
-            window: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidFailToEnterFullScreen: window];
-            }
-        }
-        extern "C" fn on_effective_appearance_did_change(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, effectiveAppearanceDidChange: notification];
-            }
-        }
-        extern "C" fn on_effective_appearance_did_changed_on_main_thread(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![
-                    super_del,
-                    effectiveAppearanceDidChangedOnMainThread: notification
-                ];
-            }
-        }
-
-        // Are we deallocing this properly ? (I miss safe Rust :(  )
-        let window_label = window.label().to_string();
-
-        let app_state = WindowState { window };
-        let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void;
-        let random_str: String = rand::thread_rng()
-            .sample_iter(&Alphanumeric)
-            .take(20)
-            .map(char::from)
-            .collect();
-
-        // We need to ensure we have a unique delegate name, otherwise we will panic while trying to create a duplicate
-        // delegate with the same name.
-        let delegate_name =
-            format!("windowDelegate_{}_{}", window_label, random_str);
-
-        ns_win.setDelegate_(delegate!(&delegate_name, {
-            window: id = ns_win,
-            app_box: *mut c_void = app_box,
-            toolbar: id = cocoa::base::nil,
-            super_delegate: id = current_delegate,
-            (windowShouldClose:) => on_window_should_close as extern fn(&Object, Sel, id) -> BOOL,
-            (windowWillClose:) => on_window_will_close as extern fn(&Object, Sel, id),
-            (windowDidResize:) => on_window_did_resize::<R> as extern fn(&Object, Sel, id),
-            (windowDidMove:) => on_window_did_move as extern fn(&Object, Sel, id),
-            (windowDidChangeBackingProperties:) => on_window_did_change_backing_properties as extern fn(&Object, Sel, id),
-            (windowDidBecomeKey:) => on_window_did_become_key as extern fn(&Object, Sel, id),
-            (windowDidResignKey:) => on_window_did_resign_key as extern fn(&Object, Sel, id),
-            (draggingEntered:) => on_dragging_entered as extern fn(&Object, Sel, id) -> BOOL,
-            (prepareForDragOperation:) => on_prepare_for_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
-            (performDragOperation:) => on_perform_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
-            (concludeDragOperation:) => on_conclude_drag_operation as extern fn(&Object, Sel, id),
-            (draggingExited:) => on_dragging_exited as extern fn(&Object, Sel, id),
-            (window:willUseFullScreenPresentationOptions:) => on_window_will_use_full_screen_presentation_options as extern fn(&Object, Sel, id, NSUInteger) -> NSUInteger,
-            (windowDidEnterFullScreen:) => on_window_did_enter_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowWillEnterFullScreen:) => on_window_will_enter_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowDidExitFullScreen:) => on_window_did_exit_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowWillExitFullScreen:) => on_window_will_exit_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowDidFailToEnterFullScreen:) => on_window_did_fail_to_enter_full_screen as extern fn(&Object, Sel, id),
-            (effectiveAppearanceDidChange:) => on_effective_appearance_did_change as extern fn(&Object, Sel, id),
-            (effectiveAppearanceDidChangedOnMainThread:) => on_effective_appearance_did_changed_on_main_thread as extern fn(&Object, Sel, id)
-        }))
-    }
-}
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index c73c06da..9c0f9eee 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -3,7 +3,7 @@
     windows_subsystem = "windows"
 )]
 
-use native_dialog::{MessageDialog, MessageType};
+use native_dialog::{DialogBuilder, MessageLevel};
 use std::env;
 use tauri::{Listener, Manager};
 use theseus::prelude::*;
@@ -14,14 +14,6 @@ mod error;
 #[cfg(target_os = "macos")]
 mod macos;
 
-#[cfg(target_os = "macos")]
-#[macro_use]
-extern crate cocoa;
-
-#[cfg(target_os = "macos")]
-#[macro_use]
-extern crate objc;
-
 // Should be called in launcher initialization
 #[tracing::instrument(skip_all)]
 #[tauri::command]
@@ -113,14 +105,14 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
 fn show_window(app: tauri::AppHandle) {
     let win = app.get_window("main").unwrap();
     if let Err(e) = win.show() {
-        MessageDialog::new()
-            .set_type(MessageType::Error)
+        DialogBuilder::message()
+            .set_level(MessageLevel::Error)
             .set_title("Initialization error")
-            .set_text(&format!(
-                "Cannot display application window due to an error:\n{}",
-                e
+            .set_text(format!(
+                "Cannot display application window due to an error:\n{e}"
             ))
-            .show_alert()
+            .alert()
+            .show()
             .unwrap();
         panic!("cannot display application window")
     } else {
@@ -138,8 +130,7 @@ fn is_dev() -> bool {
 async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
     window.set_decorations(b).map_err(|e| {
         theseus::Error::from(theseus::ErrorKind::OtherError(format!(
-            "Failed to toggle decorations: {}",
-            e
+            "Failed to toggle decorations: {e}"
         )))
     })?;
     Ok(())
@@ -255,9 +246,9 @@ fn main() {
             });
 
             #[cfg(not(target_os = "linux"))]
-            {
-                if let Some(window) = app.get_window("main") {
-                    window.set_shadow(true).unwrap();
+            if let Some(window) = app.get_window("main") {
+                if let Err(e) = window.set_shadow(true) {
+                    tracing::warn!("Failed to set window shadow: {e}");
                 }
             }
 
@@ -280,6 +271,7 @@ fn main() {
         .plugin(api::utils::init())
         .plugin(api::cache::init())
         .plugin(api::friends::init())
+        .plugin(api::worlds::init())
         .invoke_handler(tauri::generate_handler![
             initialize_state,
             is_dev,
@@ -288,11 +280,6 @@ fn main() {
             restart_app,
         ]);
 
-    #[cfg(target_os = "macos")]
-    {
-        builder = builder.plugin(macos::window_ext::init());
-    }
-
     tracing::info!("Initializing app...");
     let app = builder.build(tauri::generate_context!());
 
@@ -331,28 +318,29 @@ fn main() {
             #[cfg(target_os = "windows")]
             {
                 // tauri doesn't expose runtime errors, so matching a string representation seems like the only solution
-                if format!("{:?}", e).contains(
+                if format!("{e:?}").contains(
                     "Runtime(CreateWebview(WebView2Error(WindowsError",
                 ) {
-                    MessageDialog::new()
-                        .set_type(MessageType::Error)
+                    DialogBuilder::message()
+                        .set_level(MessageLevel::Error)
                         .set_title("Initialization error")
                         .set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://support.modrinth.com/en/articles/8797765-corrupted-microsoft-edge-webview2-installation")
-                        .show_alert()
+                        .alert()
+                        .show()
                         .unwrap();
 
                     panic!("webview2 initialization failed")
                 }
             }
 
-            MessageDialog::new()
-                .set_type(MessageType::Error)
+            DialogBuilder::message()
+                .set_level(MessageLevel::Error)
                 .set_title("Initialization error")
-                .set_text(&format!(
-                    "Cannot initialize application due to an error:\n{:?}",
-                    e
+                .set_text(format!(
+                    "Cannot initialize application due to an error:\n{e:?}"
                 ))
-                .show_alert()
+                .alert()
+                .show()
                 .unwrap();
 
             tracing::error!("Error while running tauri application: {:?}", e);
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index 6a83c167..66d6e144 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://schema.tauri.app/config/2",
   "build": {
     "beforeDevCommand": "pnpm turbo run dev --filter=@modrinth/app-frontend",
     "beforeBuildCommand": "pnpm turbo run build --filter=@modrinth/app-frontend",
@@ -44,7 +45,7 @@
     ]
   },
   "productName": "AstralRinth App",
-  "version": "0.9.306",
+  "version": "0.9.501",
   "mainBinaryName": "AstralRinth App",
   "identifier": "AstralRinthApp",
   "plugins": {
@@ -76,18 +77,26 @@
     ],
     "security": {
       "assetProtocol": {
-        "scope": ["$APPDATA/caches/icons/*", "$APPCONFIG/caches/icons/*", "$CONFIG/caches/icons/*"],
+        "scope": [
+          "$APPDATA/caches/icons/*",
+          "$APPCONFIG/caches/icons/*",
+          "$CONFIG/caches/icons/*",
+          "$APPDATA/profiles/*/saves/*/icon.png",
+          "$APPCONFIG/profiles/*/saves/*/icon.png",
+          "$CONFIG/profiles/*/saves/*/icon.png"
+        ],
         "enable": true
       },
       "capabilities": ["core", "plugins"],
       "csp": {
         "default-src": "'self' customprotocol: asset:",
         "connect-src": "https://git.astralium.su ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://api.mclo.gs",
-        "font-src": ["https://cdn-raw.modrinth.com/fonts/inter/"],
+        "font-src": ["https://cdn-raw.modrinth.com/fonts/"],
         "img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost blob: data:",
         "style-src": "'unsafe-inline' 'self'",
         "script-src": "https://*.posthog.com 'self'",
-        "frame-src": "https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'"
+        "frame-src": "https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'",
+        "media-src": "https://*.githubusercontent.com"
       }
     }
   }
diff --git a/apps/app/tauri.macos.conf.json b/apps/app/tauri.macos.conf.json
index 36a54d5c..3e6de5bf 100644
--- a/apps/app/tauri.macos.conf.json
+++ b/apps/app/tauri.macos.conf.json
@@ -13,7 +13,11 @@
         "minWidth": 1100,
         "visible": false,
         "zoomHotkeysEnabled": false,
-        "decorations": true
+        "decorations": true,
+        "trafficLightPosition": {
+          "x": 15.0,
+          "y": 22.0
+        }
       }
     ]
   }
diff --git a/apps/daedalus_client/.env b/apps/daedalus_client/.env.example
similarity index 100%
rename from apps/daedalus_client/.env
rename to apps/daedalus_client/.env.example
diff --git a/apps/daedalus_client/Cargo.toml b/apps/daedalus_client/Cargo.toml
index 6ddb4c5b..cb2a646c 100644
--- a/apps/daedalus_client/Cargo.toml
+++ b/apps/daedalus_client/Cargo.toml
@@ -2,39 +2,29 @@
 name = "daedalus_client"
 version = "0.2.2"
 authors = ["Jai A <jai@modrinth.com>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-daedalus = { path = "../../packages/daedalus" }
-tokio = { version = "1", features = ["full"] }
-futures = "0.3.25"
-dotenvy = "0.15.6"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde-xml-rs = "0.6.0"
-lazy_static = "1.4.0"
-thiserror = "1.0"
-reqwest = { version = "0.12.5", default-features = false, features = [
-    "stream",
-    "json",
-    "rustls-tls-native-roots",
-] }
-async_zip = { version = "0.0.17", features = ["full"] }
-chrono = { version = "0.4", features = ["serde"] }
-bytes = "1.6.0"
-rust-s3 = { version = "0.33.0", default-features = false, features = [
-    "fail-on-err",
-    "tags",
-    "tokio-rustls-tls",
-    "reqwest",
-] }
-dashmap = "5.5.3"
-sha1_smol = { version = "1.0.0", features = ["std"] }
-indexmap = { version = "2.2.6", features = ["serde"] }
-itertools = "0.13.0"
-tracing-error = "0.2.0"
+daedalus.workspace = true
+tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] }
+futures.workspace = true
+dotenvy.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+serde-xml-rs.workspace = true
+thiserror.workspace = true
+reqwest = { workspace = true, features = ["stream", "json", "rustls-tls-native-roots"] }
+async_zip = { workspace = true, features = ["chrono", "tokio-fs", "deflate", "bzip2", "zstd", "deflate64"] }
+chrono = { workspace = true, features = ["serde"] }
+bytes.workspace = true
+rust-s3.workspace = true
+dashmap.workspace = true
+sha1_smol.workspace = true
+indexmap = { workspace = true, features = ["serde"] }
+itertools.workspace = true
+tracing-error.workspace = true
 
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing.workspace = true
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
diff --git a/apps/daedalus_client/Dockerfile b/apps/daedalus_client/Dockerfile
index f47e750e..5e5930e2 100644
--- a/apps/daedalus_client/Dockerfile
+++ b/apps/daedalus_client/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.82.0 as build
+FROM rust:1.86.0 AS build
 ENV PKG_CONFIG_ALLOW_CROSS=1
 
 WORKDIR /usr/src/daedalus
@@ -9,9 +9,9 @@ RUN cargo build --release --package daedalus_client
 FROM debian:bookworm-slim
 
 RUN apt-get update \
- && apt-get install -y --no-install-recommends ca-certificates openssl \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+  && apt-get install -y --no-install-recommends ca-certificates openssl \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN update-ca-certificates
 
diff --git a/apps/daedalus_client/src/error.rs b/apps/daedalus_client/src/error.rs
index d4a0167c..586c7fc5 100644
--- a/apps/daedalus_client/src/error.rs
+++ b/apps/daedalus_client/src/error.rs
@@ -12,7 +12,9 @@ pub enum ErrorKind {
     SerdeJSON(#[from] serde_json::Error),
     #[error("Error while deserializing XML: {0}")]
     SerdeXML(#[from] serde_xml_rs::Error),
-    #[error("Failed to validate file checksum at url {url} with hash {hash} after {tries} tries")]
+    #[error(
+        "Failed to validate file checksum at url {url} with hash {hash} after {tries} tries"
+    )]
     ChecksumFailure {
         hash: String,
         url: String,
@@ -22,7 +24,7 @@ pub enum ErrorKind {
     Fetch { inner: reqwest::Error, item: String },
     #[error("Error while uploading file to S3: {file}")]
     S3 {
-        inner: s3::error::S3Error,
+        inner: Box<s3::error::S3Error>,
         file: String,
     },
     #[error("Error acquiring semaphore: {0}")]
diff --git a/apps/daedalus_client/src/fabric.rs b/apps/daedalus_client/src/fabric.rs
index 2c394bc2..805d0e28 100644
--- a/apps/daedalus_client/src/fabric.rs
+++ b/apps/daedalus_client/src/fabric.rs
@@ -1,6 +1,6 @@
 use crate::util::{download_file, fetch_json, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
-use daedalus::modded::{Manifest, PartialVersionInfo, DUMMY_REPLACE_STRING};
+use crate::{Error, MirrorArtifact, UploadFile, insert_mirrored_artifact};
+use daedalus::modded::{DUMMY_REPLACE_STRING, Manifest, PartialVersionInfo};
 use dashmap::DashMap;
 use serde::Deserialize;
 use std::sync::Arc;
@@ -169,10 +169,11 @@ async fn fetch(
                         insert_mirrored_artifact(
                             &new_name,
                             None,
-                            vec![lib
-                                .url
-                                .clone()
-                                .unwrap_or_else(|| maven_url.to_string())],
+                            vec![
+                                lib.url
+                                    .clone()
+                                    .unwrap_or_else(|| maven_url.to_string()),
+                            ],
                             false,
                             mirror_artifacts,
                         )?;
diff --git a/apps/daedalus_client/src/forge.rs b/apps/daedalus_client/src/forge.rs
index a4f7a33a..ab67ae91 100644
--- a/apps/daedalus_client/src/forge.rs
+++ b/apps/daedalus_client/src/forge.rs
@@ -1,5 +1,5 @@
 use crate::util::{download_file, fetch_json, fetch_xml, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
+use crate::{Error, MirrorArtifact, UploadFile, insert_mirrored_artifact};
 use chrono::{DateTime, Utc};
 use daedalus::get_path_from_artifact;
 use daedalus::modded::PartialVersionInfo;
@@ -7,8 +7,8 @@ use dashmap::DashMap;
 use futures::io::Cursor;
 use indexmap::IndexMap;
 use itertools::Itertools;
-use serde::de::DeserializeOwned;
 use serde::Deserialize;
+use serde::de::DeserializeOwned;
 use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::Semaphore;
@@ -57,7 +57,7 @@ pub async fn fetch_forge(
 
         ForgeVersion {
             format_version,
-            installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{0}/forge-{0}-installer.jar", loader_version),
+            installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{loader_version}/forge-{loader_version}-installer.jar"),
             raw: loader_version,
             loader_version: version_split,
             game_version: game_version.clone(),
@@ -137,7 +137,7 @@ pub async fn fetch_neo(
 
         Ok(ForgeVersion {
             format_version: 2,
-            installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{0}/forge-{0}-installer.jar", loader_version),
+            installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{loader_version}/forge-{loader_version}-installer.jar"),
             raw: loader_version,
             loader_version: version_split,
             game_version: "1.20.1".to_string(), // All NeoForge Forge versions are for 1.20.1
@@ -163,7 +163,7 @@ pub async fn fetch_neo(
 
         Ok(ForgeVersion {
             format_version: 2,
-            installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{0}/neoforge-{0}-installer.jar", loader_version),
+            installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{loader_version}/neoforge-{loader_version}-installer.jar"),
             loader_version: loader_version.clone(),
             raw: loader_version,
             game_version,
@@ -502,7 +502,7 @@ async fn fetch(
                             )?;
 
                             artifact.url =
-                                format_url(&format!("maven/{}", artifact_path));
+                                format_url(&format!("maven/{artifact_path}"));
 
                             return Ok(lib);
                         }
@@ -589,14 +589,16 @@ async fn fetch(
                         mod_loader: &str,
                         version: &ForgeVersion,
                     ) -> Result<String, Error> {
-                        let extract_file =
-                            read_file(zip, &value[1..value.len()])
-                                .await?
-                                .ok_or_else(|| {
-                                    crate::ErrorKind::InvalidInput(format!(
+                        let extract_file = read_file(
+                            zip,
+                            &value[1..value.len()],
+                        )
+                        .await?
+                        .ok_or_else(|| {
+                            crate::ErrorKind::InvalidInput(format!(
                                 "Unable reading data key {key} at path {value}",
                             ))
-                                })?;
+                        })?;
 
                         let file_name = value.split('/').next_back()
                             .ok_or_else(|| {
@@ -622,10 +624,7 @@ async fn fetch(
 
                         let path = format!(
                             "com.modrinth.daedalus:{}-installer-extracts:{}:{}@{}",
-                            mod_loader,
-                            version.raw,
-                            file_name,
-                            ext
+                            mod_loader, version.raw, file_name, ext
                         );
 
                         upload_files.insert(
@@ -753,7 +752,8 @@ async fn fetch(
                 .rev()
                 .chunk_by(|x| x.game_version.clone())
                 .into_iter()
-                .map(|(game_version, loaders)| daedalus::modded::Version {
+                .map(|(game_version, loaders)| {
+                    daedalus::modded::Version {
                     id: game_version,
                     stable: true,
                     loaders: loaders
@@ -766,6 +766,7 @@ async fn fetch(
                             stable: false,
                         })
                         .collect(),
+                }
                 })
                 .collect(),
         };
diff --git a/apps/daedalus_client/src/main.rs b/apps/daedalus_client/src/main.rs
index 870a55ec..dcd61055 100644
--- a/apps/daedalus_client/src/main.rs
+++ b/apps/daedalus_client/src/main.rs
@@ -1,13 +1,13 @@
 use crate::util::{
-    format_url, upload_file_to_bucket, upload_url_to_bucket_mirrors,
-    REQWEST_CLIENT,
+    REQWEST_CLIENT, format_url, upload_file_to_bucket,
+    upload_url_to_bucket_mirrors,
 };
 use daedalus::get_path_from_artifact;
 use dashmap::{DashMap, DashSet};
 use std::sync::Arc;
 use tokio::sync::Semaphore;
 use tracing_error::ErrorLayer;
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 
 mod error;
 mod fabric;
diff --git a/apps/daedalus_client/src/minecraft.rs b/apps/daedalus_client/src/minecraft.rs
index e98b1204..c2ee6e2d 100644
--- a/apps/daedalus_client/src/minecraft.rs
+++ b/apps/daedalus_client/src/minecraft.rs
@@ -1,11 +1,11 @@
 use crate::util::fetch_json;
 use crate::{
-    util::download_file, util::format_url, util::sha1_async, Error,
-    MirrorArtifact, UploadFile,
+    Error, MirrorArtifact, UploadFile, util::download_file, util::format_url,
+    util::sha1_async,
 };
 use daedalus::minecraft::{
-    merge_partial_library, Library, PartialLibrary, VersionInfo,
-    VersionManifest, VERSION_MANIFEST_URL,
+    Library, PartialLibrary, VERSION_MANIFEST_URL, VersionInfo,
+    VersionManifest, merge_partial_library,
 };
 use dashmap::DashMap;
 use serde::Deserialize;
diff --git a/apps/daedalus_client/src/util.rs b/apps/daedalus_client/src/util.rs
index b5e4b360..3f8f11e5 100644
--- a/apps/daedalus_client/src/util.rs
+++ b/apps/daedalus_client/src/util.rs
@@ -3,59 +3,57 @@ use bytes::Bytes;
 use s3::creds::Credentials;
 use s3::{Bucket, Region};
 use serde::de::DeserializeOwned;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 use tokio::sync::Semaphore;
 
-lazy_static::lazy_static! {
-    static ref BUCKET : Bucket = {
-        let region = dotenvy::var("S3_REGION").unwrap();
-        let b = Bucket::new(
-            &dotenvy::var("S3_BUCKET_NAME").unwrap(),
-            if &*region == "r2" {
-                Region::R2 {
-                    account_id: dotenvy::var("S3_URL").unwrap(),
-                }
-            } else {
-                Region::Custom {
-                    region: region.clone(),
-                    endpoint: dotenvy::var("S3_URL").unwrap(),
-                }
-            },
-            Credentials::new(
-                Some(&*dotenvy::var("S3_ACCESS_TOKEN").unwrap()),
-                Some(&*dotenvy::var("S3_SECRET").unwrap()),
-                None,
-                None,
-                None,
-            ).unwrap(),
-        ).unwrap();
-
-        if region == "path-style" {
-            b.with_path_style()
+static BUCKET: LazyLock<Bucket> = LazyLock::new(|| {
+    let region = dotenvy::var("S3_REGION").unwrap();
+    let b = Bucket::new(
+        &dotenvy::var("S3_BUCKET_NAME").unwrap(),
+        if &*region == "r2" {
+            Region::R2 {
+                account_id: dotenvy::var("S3_URL").unwrap(),
+            }
         } else {
-            b
-        }
-    };
-}
+            Region::Custom {
+                region: region.clone(),
+                endpoint: dotenvy::var("S3_URL").unwrap(),
+            }
+        },
+        Credentials::new(
+            Some(&*dotenvy::var("S3_ACCESS_TOKEN").unwrap()),
+            Some(&*dotenvy::var("S3_SECRET").unwrap()),
+            None,
+            None,
+            None,
+        )
+        .unwrap(),
+    )
+    .unwrap();
 
-lazy_static::lazy_static! {
-    pub static ref REQWEST_CLIENT: reqwest::Client = {
-        let mut headers = reqwest::header::HeaderMap::new();
-        if let Ok(header) = reqwest::header::HeaderValue::from_str(&format!(
-            "modrinth/daedalus/{} (support@modrinth.com)",
-            env!("CARGO_PKG_VERSION")
-        )) {
-            headers.insert(reqwest::header::USER_AGENT, header);
-        }
+    if region == "path-style" {
+        *b.with_path_style()
+    } else {
+        *b
+    }
+});
 
-        reqwest::Client::builder()
-            .tcp_keepalive(Some(std::time::Duration::from_secs(10)))
-            .timeout(std::time::Duration::from_secs(15))
-            .default_headers(headers)
-            .build()
-            .unwrap()
-    };
-}
+pub static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
+    let mut headers = reqwest::header::HeaderMap::new();
+    if let Ok(header) = reqwest::header::HeaderValue::from_str(&format!(
+        "modrinth/daedalus/{} (support@modrinth.com)",
+        env!("CARGO_PKG_VERSION")
+    )) {
+        headers.insert(reqwest::header::USER_AGENT, header);
+    }
+
+    reqwest::Client::builder()
+        .tcp_keepalive(Some(std::time::Duration::from_secs(10)))
+        .timeout(std::time::Duration::from_secs(15))
+        .default_headers(headers)
+        .build()
+        .unwrap()
+});
 
 #[tracing::instrument(skip(bytes, semaphore))]
 pub async fn upload_file_to_bucket(
@@ -78,7 +76,7 @@ pub async fn upload_file_to_bucket(
             BUCKET.put_object(key.clone(), &bytes).await
         }
         .map_err(|err| ErrorKind::S3 {
-            inner: err,
+            inner: Box::new(err),
             file: path.clone(),
         });
 
@@ -203,7 +201,7 @@ pub async fn download_file(
                     inner: err,
                     item: url.to_string(),
                 }
-                .into())
+                .into());
             }
         }
     }
diff --git a/apps/docs/src/content/docs/contributing/labrinth.md b/apps/docs/src/content/docs/contributing/labrinth.md
index 309e5d1a..8ce0ac88 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.
 
-Now, you'll have to install the sqlx CLI, which can be done with cargo:
+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:
 
 ```bash
 cargo install --git https://github.com/launchbadge/sqlx sqlx-cli --no-default-features --features postgres,rustls
@@ -53,8 +53,12 @@ If you would like 'placeholder_category' to be marked as supporting modpacks too
 INSERT INTO categories VALUES (0, 'placeholder_category', 2); -- modloader id, supported type id
 ```
 
+You can find more example SQL statements for seeding the database in the `apps/labrinth/tests/files/dummy_data.sql` file.
+
 The majority of configuration is done at runtime using [dotenvy](https://crates.io/crates/dotenvy) and the `.env` file. Each of the variables and what they do can be found in the dropdown below. Additionally, there are three command line options that can be used to specify to MeiliSearch what you want to do.
 
+During development, you might notice that changes made directly to entities in the PostgreSQL database do not seem to take effect. This is often because the Redis cache still holds outdated data. To ensure your updates are reflected, clear the cache by e.g. running `redis-cli FLUSHALL`, which will force Labrinth to fetch the latest data from the database the next time it is needed.
+
 <details>
 <summary>.env variables & command line options</summary>
 
@@ -73,6 +77,11 @@ The majority of configuration is done at runtime using [dotenvy](https://crates.
 `MEILISEARCH_KEY`: The name that MeiliSearch is given  
 `BIND_ADDR`: The bind address for the server. Supports both IPv4 and IPv6  
 `MOCK_FILE_PATH`: The path used to store uploaded files; this has no default value and will panic if unspecified
+`SMTP_USERNAME`: The username used to authenticate with the SMTP server
+`SMTP_PASSWORD`: The password associated with the `SMTP_USERNAME` for SMTP authentication
+`SMTP_HOST`: The hostname or IP address of the SMTP server
+`SMTP_PORT`: The port number on which the SMTP server is listening (commonly 25, 465, or 587)
+`SMTP_TLS`: The TLS mode to use for the SMTP connection, which can be one of the following: `none`, `opportunistic_start_tls`, `requires_start_tls`, `tls`
 
 #### CDN options
 
diff --git a/apps/frontend/.env.prod b/apps/frontend/.env.prod
new file mode 100644
index 00000000..8aebc57d
--- /dev/null
+++ b/apps/frontend/.env.prod
@@ -0,0 +1,4 @@
+BASE_URL=https://api.modrinth.com/v2/
+BROWSER_BASE_URL=https://api.modrinth.com/v2/
+PYRO_BASE_URL=https://archon.modrinth.com
+PROD_OVERRIDE=true
diff --git a/apps/frontend/.env.staging b/apps/frontend/.env.staging
new file mode 100644
index 00000000..3dd5f73d
--- /dev/null
+++ b/apps/frontend/.env.staging
@@ -0,0 +1,4 @@
+BASE_URL=https://staging-api.modrinth.com/v2/
+BROWSER_BASE_URL=https://staging-api.modrinth.com/v2/
+PYRO_BASE_URL=https://staging-archon.modrinth.com
+PROD_OVERRIDE=true
diff --git a/apps/frontend/src/assets/images/external/gdlauncher.png b/apps/frontend/src/assets/images/external/gdlauncher.png
index 06081082..4f02315e 100644
Binary files a/apps/frontend/src/assets/images/external/gdlauncher.png and b/apps/frontend/src/assets/images/external/gdlauncher.png differ
diff --git a/apps/frontend/src/assets/images/games/rinth.png b/apps/frontend/src/assets/images/games/rinth.png
index 35b04a57..7b11a7fc 100644
Binary files a/apps/frontend/src/assets/images/games/rinth.png and b/apps/frontend/src/assets/images/games/rinth.png differ
diff --git a/apps/frontend/src/assets/images/servers/minecraft-background-dark.png b/apps/frontend/src/assets/images/servers/minecraft-background-dark.png
index bb22629b..f71044f5 100644
Binary files a/apps/frontend/src/assets/images/servers/minecraft-background-dark.png and b/apps/frontend/src/assets/images/servers/minecraft-background-dark.png differ
diff --git a/apps/frontend/src/assets/images/servers/minecraft_server_icon.png b/apps/frontend/src/assets/images/servers/minecraft_server_icon.png
index ec98382d..32aa13d4 100644
Binary files a/apps/frontend/src/assets/images/servers/minecraft_server_icon.png and b/apps/frontend/src/assets/images/servers/minecraft_server_icon.png differ
diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss
index 0cc47628..a1ea3a1e 100644
--- a/apps/frontend/src/assets/styles/components.scss
+++ b/apps/frontend/src/assets/styles/components.scss
@@ -930,7 +930,7 @@ button {
     color: var(--color-text);
     padding: 0.5rem 0 0.5rem 1rem;
     font-weight: var(--font-weight-medium);
-    min-height: 40px;
+    min-height: 36px;
     box-sizing: border-box;
     width: fit-content;
     align-items: center;
diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss
index 06d8568c..b52b738e 100644
--- a/apps/frontend/src/assets/styles/global.scss
+++ b/apps/frontend/src/assets/styles/global.scss
@@ -162,6 +162,18 @@ html {
   --landing-green-label-bg: rgba(0, 216, 69, 0.15);
 
   --landing-raw-bg: #fff;
+
+  --banner-error-bg: #fee2e2;
+  --banner-error-text: #991b1b;
+  --banner-error-border: #ef4444;
+
+  --banner-warning-bg: #ffedd5;
+  --banner-warning-text: #713f12;
+  --banner-warning-border: #f97316;
+
+  --banner-info-bg: #dbeafe;
+  --banner-info-text: #1e3a8a;
+  --banner-info-border: #3b82f6;
 }
 
 .dark,
@@ -286,6 +298,18 @@ html {
 
   --hover-filter: brightness(120%);
   --active-filter: brightness(140%);
+
+  --banner-error-bg: #4c1515;
+  --banner-error-text: #fee2e2;
+  --banner-error-border: #7f1d1d;
+
+  --banner-warning-bg: #4a2a0a;
+  --banner-warning-text: #ffe6c0;
+  --banner-warning-border: #b54708;
+
+  --banner-info-bg: #1e2a44;
+  --banner-info-text: #dbeafe;
+  --banner-info-border: #2563eb;
 }
 
 .oled-mode {
@@ -451,7 +475,7 @@ textarea {
     var(--shadow-inset-sm),
     0 0 0 0 transparent;
   transition: box-shadow 0.1s ease-in-out;
-  min-height: 40px;
+  min-height: 36px;
 
   &:focus,
   &:focus-visible {
diff --git a/apps/frontend/src/components/ui/ModalConfirm.vue b/apps/frontend/src/components/ui/ModalConfirm.vue
deleted file mode 100644
index 703d19a9..00000000
--- a/apps/frontend/src/components/ui/ModalConfirm.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <Modal ref="modal" :header="title">
-    <div class="modal-delete">
-      <div class="markdown-body" v-html="renderString(description)" />
-      <label v-if="hasToType" for="confirmation" class="confirmation-label">
-        <span>
-          <strong>To verify, type</strong>
-          <em class="confirmation-text">{{ confirmationText }}</em>
-          <strong>below:</strong>
-        </span>
-      </label>
-      <div class="confirmation-input">
-        <input
-          v-if="hasToType"
-          id="confirmation"
-          v-model="confirmation_typed"
-          type="text"
-          placeholder="Type here..."
-          @input="type"
-        />
-      </div>
-      <div class="button-group">
-        <button class="iconified-button" @click="cancel">
-          <XIcon />
-          Cancel
-        </button>
-        <button class="iconified-button danger-button" :disabled="action_disabled" @click="proceed">
-          <TrashIcon />
-          {{ proceedLabel }}
-        </button>
-      </div>
-    </div>
-  </Modal>
-</template>
-
-<script>
-import { renderString } from "@modrinth/utils";
-import { TrashIcon, XIcon } from "@modrinth/assets";
-import Modal from "~/components/ui/Modal.vue";
-
-export default {
-  components: {
-    XIcon,
-    TrashIcon,
-    Modal,
-  },
-  props: {
-    confirmationText: {
-      type: String,
-      default: "",
-    },
-    hasToType: {
-      type: Boolean,
-      default: false,
-    },
-    title: {
-      type: String,
-      default: "No title defined",
-      required: true,
-    },
-    description: {
-      type: String,
-      default: "No description defined",
-      required: true,
-    },
-    proceedLabel: {
-      type: String,
-      default: "Proceed",
-    },
-  },
-  emits: ["proceed"],
-  data() {
-    return {
-      action_disabled: this.hasToType,
-      confirmation_typed: "",
-    };
-  },
-  methods: {
-    renderString,
-    cancel() {
-      this.$refs.modal.hide();
-    },
-    proceed() {
-      this.$refs.modal.hide();
-      this.$emit("proceed");
-    },
-    type() {
-      if (this.hasToType) {
-        this.action_disabled =
-          this.confirmation_typed.toLowerCase() !== this.confirmationText.toLowerCase();
-      }
-    },
-    show() {
-      this.$refs.modal.show();
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.modal-delete {
-  padding: var(--spacing-card-bg);
-  display: flex;
-  flex-direction: column;
-
-  .markdown-body {
-    margin-bottom: 1rem;
-  }
-
-  .confirmation-label {
-    margin-bottom: 0.5rem;
-  }
-
-  .confirmation-text {
-    padding-right: 0.25ch;
-    margin: 0 0.25rem;
-  }
-
-  .confirmation-input {
-    input {
-      width: 20rem;
-      max-width: 100%;
-    }
-  }
-}
-</style>
diff --git a/apps/frontend/src/components/ui/ModerationChecklist.vue b/apps/frontend/src/components/ui/ModerationChecklist.vue
index 9717384d..c4fabfa3 100644
--- a/apps/frontend/src/components/ui/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/ModerationChecklist.vue
@@ -256,7 +256,9 @@
         </p>
         <div class="options input-group">
           <button
-            v-for="(option, index) in steps[currentStepIndex].options"
+            v-for="(option, index) in steps[currentStepIndex].options.filter(
+              (x) => x.shown !== false,
+            )"
             :key="index"
             class="btn"
             :class="{
@@ -426,6 +428,18 @@ const steps = computed(() =>
           resultingMessage: `## Misuse of Title
 Per section 5.2 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#miscellaneous) we ask that you limit the title to just the name of your project. Additional information, such as themes, tags, supported versions or loaders, etc. should be saved for the Summary or Description. When changing your project title, remember to also ensure that your project slug (URL) matches and accurately represents your project.`,
         },
+        {
+          name: "Minecraft title",
+          resultingMessage: `## Project Title
+Projects must not use Minecraft's branding or include "Minecraft" as a significant part of the title.
+The title of your project may be confusingly similar to the game, and we encourage you to change your title to avoid a potential violation of Minecraft's Usage Guidelines.
+Abbreviations like "MC" or elaborate titles that do not make the name Minecraft a significant portion of the name are okay.`,
+        },
+        {
+          name: "Title similarities",
+          resultingMessage: `## Project Branding
+Per section 1.8 of [Modrinth's Content Rules](https://modrinth.com/legal/rules) we ask that you change your project title and other relevant branding to avoid causing confusion or implying association with existing projects.`,
+        },
       ],
     },
     {
@@ -472,6 +486,12 @@ Per section 5.3 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#m
 
 This is the first thing most people will see about your mod other than the Logo, so it's important it be accurate, reasonably detailed, and exciting.`,
         },
+        {
+          name: "Non-english",
+          resultingMessage: `## No English Summary
+Per section 2.2 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#accessibility) a project's Summary and Description must be in English, unless meant exclusively for non-English use, such as translations.
+You may include your non-English Summary but we ask that you also add an English translation.`,
+        },
       ],
     },
     {
@@ -628,11 +648,21 @@ For a brief rundown of how this works:
     {
       id: "gallery",
       navigate: `/${props.project.project_type}/${props.project.slug}/gallery`,
-      question: `Are the project's gallery images relevant?`,
-      shown: props.project.gallery.length > 0,
+      question: `Are this project's gallery images sufficient?`,
+      shown: true,
       options: [
+        {
+          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.`,
+        },
         {
           name: "Not relevant",
+          shown: props.project.gallery.length > 0,
           resultingMessage: `## Unrelated Gallery Images
 Per section 5.5 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#miscellaneous) any images in your project's Gallery must be relevant to the project and also include a Title.`,
         },
diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue
index 1dabdc7b..1da769a3 100644
--- a/apps/frontend/src/components/ui/NotificationItem.vue
+++ b/apps/frontend/src/components/ui/NotificationItem.vue
@@ -184,7 +184,7 @@
               "
               class="date"
             >
-              {{ fromNow(notif.extra_data.version.date_published) }}
+              {{ formatRelativeTime(notif.extra_data.version.date_published) }}
             </span>
           </span>
         </div>
@@ -201,7 +201,7 @@
         v-tooltip="$dayjs(notification.created).format('MMMM D, YYYY [at] h:mm A')"
         class="inline-flex"
       >
-        <CalendarIcon class="mr-1" /> Received {{ fromNow(notification.created) }}
+        <CalendarIcon class="mr-1" /> Received {{ formatRelativeTime(notification.created) }}
       </span>
     </span>
     <div v-if="compact" class="notification__actions">
@@ -331,11 +331,12 @@ import {
   XIcon,
   ExternalIcon,
 } from "@modrinth/assets";
+import { 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.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";
@@ -345,6 +346,8 @@ import Categories from "~/components/ui/search/Categories.vue";
 const app = useNuxtApp();
 const emit = defineEmits(["update:notifications"]);
 
+const formatRelativeTime = useRelativeTime();
+
 const props = defineProps({
   notification: {
     type: Object,
diff --git a/apps/frontend/src/components/ui/Notifications.vue b/apps/frontend/src/components/ui/Notifications.vue
index fc2ed6ec..563cf23f 100644
--- a/apps/frontend/src/components/ui/Notifications.vue
+++ b/apps/frontend/src/components/ui/Notifications.vue
@@ -1,85 +1,140 @@
 <template>
-  <div class="vue-notification-group">
+  <div class="vue-notification-group experimental-styles-within">
     <transition-group name="notifs">
       <div
         v-for="(item, index) in notifications"
         :key="item.id"
         class="vue-notification-wrapper"
-        @click="notifications.splice(index, 1)"
         @mouseenter="stopTimer(item)"
         @mouseleave="setNotificationTimer(item)"
       >
-        <div class="vue-notification-template vue-notification" :class="{ [item.type]: true }">
-          <div class="notification-title" v-html="item.title"></div>
-          <div class="notification-content" v-html="item.text"></div>
+        <div class="flex w-full gap-2 overflow-hidden rounded-lg bg-bg-raised shadow-xl">
+          <div
+            class="w-2"
+            :class="{
+              'bg-red': item.type === 'error',
+              'bg-orange': item.type === 'warning',
+              'bg-green': item.type === 'success',
+              'bg-blue': !item.type || !['error', 'warning', 'success'].includes(item.type),
+            }"
+          ></div>
+          <div
+            class="grid w-full grid-cols-[auto_1fr_auto] items-center gap-x-2 gap-y-1 py-2 pl-1 pr-3"
+          >
+            <div
+              class="flex items-center"
+              :class="{
+                'text-red': item.type === 'error',
+                'text-orange': item.type === 'warning',
+                'text-green': item.type === 'success',
+                'text-blue': !item.type || !['error', 'warning', 'success'].includes(item.type),
+              }"
+            >
+              <IssuesIcon v-if="item.type === 'warning'" class="h-6 w-6" />
+              <CheckCircleIcon v-else-if="item.type === 'success'" class="h-6 w-6" />
+              <XCircleIcon v-else-if="item.type === 'error'" class="h-6 w-6" />
+              <InfoIcon v-else class="h-6 w-6" />
+            </div>
+            <div class="m-0 text-wrap font-bold text-contrast" v-html="item.title"></div>
+            <div class="flex items-center gap-1">
+              <div v-if="item.count && item.count > 1" class="text-xs font-bold text-contrast">
+                x{{ item.count }}
+              </div>
+              <ButtonStyled circular size="small">
+                <button v-tooltip="'Copy to clipboard'" @click="copyToClipboard(item)">
+                  <CheckIcon v-if="copied[createNotifText(item)]" />
+                  <CopyIcon v-else />
+                </button>
+              </ButtonStyled>
+              <ButtonStyled circular size="small">
+                <button v-tooltip="`Dismiss`" @click="notifications.splice(index, 1)">
+                  <XIcon />
+                </button>
+              </ButtonStyled>
+            </div>
+            <div></div>
+            <div class="col-span-2 text-sm text-primary" v-html="item.text"></div>
+            <template v-if="item.errorCode">
+              <div></div>
+              <div
+                class="m-0 text-wrap text-xs font-medium text-secondary"
+                v-html="item.errorCode"
+              ></div>
+            </template>
+          </div>
         </div>
       </div>
     </transition-group>
   </div>
 </template>
 <script setup>
+import { ButtonStyled } from "@modrinth/ui";
+import {
+  XCircleIcon,
+  CheckCircleIcon,
+  CheckIcon,
+  InfoIcon,
+  IssuesIcon,
+  XIcon,
+  CopyIcon,
+} from "@modrinth/assets";
 const notifications = useNotifications();
 
 function stopTimer(notif) {
   clearTimeout(notif.timer);
 }
+
+const copied = ref({});
+
+const createNotifText = (notif) => {
+  let text = "";
+  if (notif.title) {
+    text += notif.title;
+  }
+  if (notif.text) {
+    if (text.length > 0) {
+      text += "\n";
+    }
+    text += notif.text;
+  }
+  if (notif.errorCode) {
+    if (text.length > 0) {
+      text += "\n";
+    }
+    text += notif.errorCode;
+  }
+  return text;
+};
+
+function copyToClipboard(notif) {
+  const text = createNotifText(notif);
+
+  copied.value[text] = true;
+  navigator.clipboard.writeText(text);
+  setTimeout(() => {
+    delete copied.value[text];
+  }, 2000);
+}
 </script>
 <style lang="scss" scoped>
-.vue-notification {
-  background: var(--color-blue) !important;
-  border-left: 5px solid var(--color-blue) !important;
-  color: var(--color-brand-inverted) !important;
-
-  box-sizing: border-box;
-  text-align: left;
-  font-size: 12px;
-  padding: 10px;
-  margin: 0 5px 5px;
-
-  &.success {
-    background: var(--color-green) !important;
-    border-left-color: var(--color-green) !important;
-  }
-
-  &.warn {
-    background: var(--color-orange) !important;
-    border-left-color: var(--color-orange) !important;
-  }
-
-  &.error {
-    background: var(--color-red) !important;
-    border-left-color: var(--color-red) !important;
-  }
-}
-
 .vue-notification-group {
   position: fixed;
-  right: 25px;
-  bottom: 25px;
-  z-index: 99999999;
-  width: 300px;
+  right: 1.5rem;
+  bottom: 1.5rem;
+  z-index: 200;
+  width: 450px;
+
+  @media screen and (max-width: 500px) {
+    width: calc(100% - 0.75rem * 2);
+    right: 0.75rem;
+    bottom: 0.75rem;
+  }
 
   .vue-notification-wrapper {
     width: 100%;
     overflow: hidden;
     margin-bottom: 10px;
 
-    .vue-notification-template {
-      border-radius: var(--size-rounded-card);
-      margin: 0;
-
-      .notification-title {
-        font-size: var(--font-size-lg);
-        margin-right: auto;
-        font-weight: 600;
-      }
-
-      .notification-content {
-        margin-right: auto;
-        font-size: var(--font-size-md);
-      }
-    }
-
     &:last-child {
       margin: 0;
     }
@@ -98,10 +153,18 @@ function stopTimer(notif) {
 .notifs-enter-active,
 .notifs-leave-active,
 .notifs-move {
-  transition: all 0.5s;
+  transition: all 0.25s ease-in-out;
 }
 .notifs-enter-from,
 .notifs-leave-to {
   opacity: 0;
 }
+
+.notifs-enter-from {
+  transform: translateY(100%) scale(0.8);
+}
+
+.notifs-leave-to {
+  transform: translateX(100%) scale(0.8);
+}
 </style>
diff --git a/apps/frontend/src/components/ui/ProjectCard.vue b/apps/frontend/src/components/ui/ProjectCard.vue
index 4a71f2ee..fbb147c2 100644
--- a/apps/frontend/src/components/ui/ProjectCard.vue
+++ b/apps/frontend/src/components/ui/ProjectCard.vue
@@ -75,7 +75,7 @@
         class="stat date"
       >
         <UpdatedIcon aria-hidden="true" />
-        <span class="date-label">Updated </span>{{ fromNow(updatedAt) }}
+        <span class="date-label">Updated </span>{{ formatRelativeTime(updatedAt) }}
       </div>
       <div
         v-else-if="showCreatedDate"
@@ -83,7 +83,7 @@
         class="stat date"
       >
         <CalendarIcon aria-hidden="true" />
-        <span class="date-label">Published </span>{{ fromNow(createdAt) }}
+        <span class="date-label">Published </span>{{ formatRelativeTime(createdAt) }}
       </div>
     </div>
   </article>
@@ -95,6 +95,7 @@ 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: {
@@ -213,8 +214,9 @@ export default {
   },
   setup() {
     const tags = useTags();
+    const formatRelativeTime = useRelativeTime();
 
-    return { tags };
+    return { tags, formatRelativeTime };
   },
   computed: {
     projectTypeDisplay() {
diff --git a/apps/frontend/src/components/ui/charts/ChartDisplay.vue b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
index a6ca889c..39c93e98 100644
--- a/apps/frontend/src/components/ui/charts/ChartDisplay.vue
+++ b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
@@ -86,8 +86,8 @@
                 <UpdatedIcon />
               </Button>
               <DropdownSelect
-                class="range-dropdown"
                 v-model="selectedRange"
+                class="range-dropdown"
                 :options="ranges"
                 name="Time range"
                 :display-name="
@@ -197,11 +197,11 @@
               >
                 <div class="country-flag-container">
                   <template v-if="name.toLowerCase() === 'xx' || !name">
-                    <img
-                      src="https://cdn.modrinth.com/placeholder-banner.svg"
-                      alt="Placeholder flag"
-                      class="country-flag"
-                    />
+                    <div
+                      class="country-flag flex select-none items-center justify-center bg-bg-raised font-extrabold text-secondary"
+                    >
+                      ?
+                    </div>
                   </template>
                   <template v-else>
                     <img
@@ -213,7 +213,7 @@
                 </div>
                 <div class="country-text">
                   <strong class="country-name"
-                    ><template v-if="name.toLowerCase() === 'xx' || !name">Hidden</template>
+                    ><template v-if="name.toLowerCase() === 'xx' || !name">Other</template>
                     <template v-else>{{ countryCodeToName(name) }}</template>
                   </strong>
                   <span class="data-point">{{ formatNumber(count) }}</span>
@@ -256,11 +256,11 @@
               >
                 <div class="country-flag-container">
                   <template v-if="name.toLowerCase() === 'xx' || !name">
-                    <img
-                      src="https://cdn.modrinth.com/placeholder-banner.svg"
-                      alt="Placeholder flag"
-                      class="country-flag"
-                    />
+                    <div
+                      class="country-flag flex select-none items-center justify-center bg-bg-raised font-extrabold text-secondary"
+                    >
+                      ?
+                    </div>
                   </template>
                   <template v-else>
                     <img
@@ -272,7 +272,7 @@
                 </div>
                 <div class="country-text">
                   <strong class="country-name">
-                    <template v-if="name.toLowerCase() === 'xx' || !name">Hidden</template>
+                    <template v-if="name.toLowerCase() === 'xx' || !name">Other</template>
                     <template v-else>{{ countryCodeToName(name) }}</template>
                   </strong>
                   <span class="data-point">{{ formatNumber(count) }}</span>
diff --git a/apps/frontend/src/components/ui/report/ReportInfo.vue b/apps/frontend/src/components/ui/report/ReportInfo.vue
index b44e20fa..924ad8f9 100644
--- a/apps/frontend/src/components/ui/report/ReportInfo.vue
+++ b/apps/frontend/src/components/ui/report/ReportInfo.vue
@@ -95,7 +95,7 @@
       </nuxt-link>
       <span>&nbsp;</span>
       <span v-tooltip="$dayjs(report.created).format('MMMM D, YYYY [at] h:mm A')">{{
-        fromNow(report.created)
+        formatRelativeTime(report.created)
       }}</span>
       <CopyCode v-if="flags.developerMode" :text="report.id" class="report-id" />
     </div>
@@ -105,11 +105,14 @@
 <script setup>
 import { ReportIcon, UnknownIcon, VersionIcon } from "@modrinth/assets";
 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();
+
 defineProps({
   report: {
     type: Object,
diff --git a/apps/frontend/src/components/ui/servers/FileItem.vue b/apps/frontend/src/components/ui/servers/FileItem.vue
index 6d269d8f..5889503b 100644
--- a/apps/frontend/src/components/ui/servers/FileItem.vue
+++ b/apps/frontend/src/components/ui/servers/FileItem.vue
@@ -53,6 +53,7 @@
       <ButtonStyled circular type="transparent">
         <UiServersTeleportOverflowMenu :options="menuOptions" direction="left" position="bottom">
           <MoreHorizontalIcon class="h-5 w-5 bg-transparent" />
+          <template #extract><PackageOpenIcon /> Extract</template>
           <template #rename><EditIcon /> Rename</template>
           <template #move><RightArrowIcon /> Move</template>
           <template #download><DownloadIcon /> Download</template>
@@ -73,6 +74,8 @@ import {
   FolderOpenIcon,
   FileIcon,
   RightArrowIcon,
+  PackageOpenIcon,
+  FileArchiveIcon,
 } from "@modrinth/assets";
 import { computed, shallowRef, ref } from "vue";
 import { renderToString } from "vue/server-renderer";
@@ -99,15 +102,14 @@ interface FileItemProps {
 const props = defineProps<FileItemProps>();
 
 const emit = defineEmits<{
-  (e: "rename", item: { name: string; type: string; path: string }): void;
-  (e: "move", item: { name: string; type: string; path: string }): void;
+  (
+    e: "rename" | "move" | "download" | "delete" | "edit" | "extract",
+    item: { name: string; type: string; path: string },
+  ): void;
   (
     e: "moveDirectTo",
     item: { name: string; type: string; path: string; destination: string },
   ): void;
-  (e: "download", item: { name: string; type: string; path: string }): void;
-  (e: "delete", item: { name: string; type: string; path: string }): void;
-  (e: "edit", item: { name: string; type: string; path: string }): void;
   (e: "contextmenu", x: number, y: number): void;
 }>();
 
@@ -143,6 +145,7 @@ const codeExtensions = Object.freeze([
 
 const textExtensions = Object.freeze(["txt", "md", "log", "cfg", "conf", "properties", "ini"]);
 const imageExtensions = Object.freeze(["png", "jpg", "jpeg", "gif", "svg", "webp"]);
+const supportedArchiveExtensions = Object.freeze(["zip"]);
 const units = Object.freeze(["B", "KB", "MB", "GB", "TB", "PB", "EB"]);
 
 const route = shallowRef(useRoute());
@@ -156,7 +159,18 @@ const containerClasses = computed(() => [
 
 const fileExtension = computed(() => props.name.split(".").pop()?.toLowerCase() || "");
 
+const isZip = computed(() => fileExtension.value === "zip");
+
 const menuOptions = computed(() => [
+  {
+    id: "extract",
+    shown: isZip.value,
+    action: () => emit("extract", { name: props.name, type: props.type, path: props.path }),
+  },
+  {
+    divider: true,
+    shown: isZip.value,
+  },
   {
     id: "rename",
     action: () => emit("rename", { name: props.name, type: props.type, path: props.path }),
@@ -189,6 +203,7 @@ const iconComponent = computed(() => {
   if (codeExtensions.includes(ext)) return UiServersIconsCodeFileIcon;
   if (textExtensions.includes(ext)) return UiServersIconsTextFileIcon;
   if (imageExtensions.includes(ext)) return UiServersIconsImageFileIcon;
+  if (supportedArchiveExtensions.includes(ext)) return FileArchiveIcon;
   return FileIcon;
 });
 
diff --git a/apps/frontend/src/components/ui/servers/FileVirtualList.vue b/apps/frontend/src/components/ui/servers/FileVirtualList.vue
index 56125d76..ecc38ce7 100644
--- a/apps/frontend/src/components/ui/servers/FileVirtualList.vue
+++ b/apps/frontend/src/components/ui/servers/FileVirtualList.vue
@@ -30,6 +30,7 @@
           :size="item.size"
           @delete="$emit('delete', item)"
           @rename="$emit('rename', item)"
+          @extract="$emit('extract', item)"
           @download="$emit('download', item)"
           @move="$emit('move', item)"
           @move-direct-to="$emit('moveDirectTo', $event)"
@@ -49,14 +50,12 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: "delete", item: any): void;
-  (e: "rename", item: any): void;
-  (e: "download", item: any): void;
-  (e: "move", item: any): void;
-  (e: "edit", item: any): void;
+  (
+    e: "delete" | "rename" | "download" | "move" | "edit" | "moveDirectTo" | "extract",
+    item: any,
+  ): void;
   (e: "contextmenu", item: any, x: number, y: number): void;
   (e: "loadMore"): void;
-  (e: "moveDirectTo", item: any): void;
 }>();
 
 const ITEM_HEIGHT = 61;
diff --git a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue b/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
index c2e5e70a..5f9f1afe 100644
--- a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
+++ b/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
@@ -117,7 +117,8 @@
       </div>
 
       <ButtonStyled type="transparent">
-        <UiServersTeleportOverflowMenu
+        <OverflowMenu
+          :dropdown-id="`create-new-${baseId}`"
           position="bottom"
           direction="left"
           aria-label="Create new..."
@@ -125,6 +126,10 @@
             { id: 'file', action: () => $emit('create', 'file') },
             { id: 'directory', action: () => $emit('create', 'directory') },
             { id: 'upload', action: () => $emit('upload') },
+            { divider: true },
+            { id: 'upload-zip', shown: false, action: () => $emit('upload-zip') },
+            { id: 'install-from-url', action: () => $emit('unzip-from-url', false) },
+            { id: 'install-cf-pack', action: () => $emit('unzip-from-url', true) },
           ]"
         >
           <PlusIcon aria-hidden="true" />
@@ -132,7 +137,16 @@
           <template #file> <BoxIcon aria-hidden="true" /> New file </template>
           <template #directory> <FolderOpenIcon aria-hidden="true" /> New folder </template>
           <template #upload> <UploadIcon aria-hidden="true" /> Upload file </template>
-        </UiServersTeleportOverflowMenu>
+          <template #upload-zip>
+            <FileArchiveIcon aria-hidden="true" /> Upload from .zip file
+          </template>
+          <template #install-from-url>
+            <LinkIcon aria-hidden="true" /> Upload from .zip URL
+          </template>
+          <template #install-cf-pack>
+            <CurseForgeIcon aria-hidden="true" /> Install CurseForge pack
+          </template>
+        </OverflowMenu>
       </ButtonStyled>
     </div>
   </header>
@@ -140,6 +154,9 @@
 
 <script setup lang="ts">
 import {
+  LinkIcon,
+  CurseForgeIcon,
+  FileArchiveIcon,
   BoxIcon,
   PlusIcon,
   UploadIcon,
@@ -150,7 +167,7 @@ import {
   ChevronRightIcon,
   FilterIcon,
 } from "@modrinth/assets";
-import { ButtonStyled } from "@modrinth/ui";
+import { ButtonStyled, OverflowMenu } from "@modrinth/ui";
 import { ref, computed } from "vue";
 import { useIntersectionObserver } from "@vueuse/core";
 
@@ -158,12 +175,14 @@ const props = defineProps<{
   breadcrumbSegments: string[];
   searchQuery: string;
   currentFilter: string;
+  baseId: string;
 }>();
 
 defineEmits<{
   (e: "navigate", index: number): void;
   (e: "create", type: "file" | "directory"): void;
-  (e: "upload"): void;
+  (e: "upload" | "upload-zip"): void;
+  (e: "unzip-from-url", cf: boolean): void;
   (e: "update:searchQuery", value: string): void;
   (e: "filter", type: string): void;
 }>();
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadConflictModal.vue b/apps/frontend/src/components/ui/servers/FilesUploadConflictModal.vue
new file mode 100644
index 00000000..ab4dfc51
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/FilesUploadConflictModal.vue
@@ -0,0 +1,56 @@
+<template>
+  <ConfirmModal
+    ref="modal"
+    title="Do you want to overwrite these conflicting files?"
+    :proceed-label="`Overwrite`"
+    :proceed-icon="CheckIcon"
+    @proceed="proceed"
+  >
+    <div class="flex max-w-[30rem] flex-col gap-4">
+      <p class="m-0 font-semibold leading-normal">
+        <template v-if="hasMany">
+          Over 100 files will be overwritten if you proceed with extraction; here is just some of
+          them:
+        </template>
+        <template v-else>
+          The following {{ files.length }} files already exist on your server, and will be
+          overwritten if you proceed with extraction:
+        </template>
+      </p>
+      <ul class="m-0 max-h-80 list-none overflow-auto rounded-2xl bg-bg px-4 py-3">
+        <li v-for="file in files" :key="file" class="flex items-center gap-1 py-1 font-medium">
+          <XIcon class="shrink-0 text-red" /> {{ file }}
+        </li>
+      </ul>
+    </div>
+  </ConfirmModal>
+</template>
+
+<script setup lang="ts">
+import { ConfirmModal } from "@modrinth/ui";
+import { ref } from "vue";
+import { XIcon, CheckIcon } from "@modrinth/assets";
+
+const path = ref("");
+const files = ref<string[]>([]);
+
+const emit = defineEmits<{
+  (e: "proceed", path: string): void;
+}>();
+
+const modal = ref<typeof ConfirmModal>();
+
+const hasMany = computed(() => files.value.length > 100);
+
+const show = (zipPath: string, conflictingFiles: string[]) => {
+  path.value = zipPath;
+  files.value = conflictingFiles;
+  modal.value?.show();
+};
+
+const proceed = () => {
+  emit("proceed", path.value);
+};
+
+defineExpose({ show });
+</script>
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue b/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
index 4841ea53..14d8ca34 100644
--- a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
+++ b/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
@@ -1,101 +1,105 @@
 <template>
-  <Transition name="upload-status" @enter="onUploadStatusEnter" @leave="onUploadStatusLeave">
-    <div v-show="isUploading" ref="uploadStatusRef" class="upload-status">
-      <div
-        ref="statusContentRef"
-        :class="['flex flex-col p-4 text-sm text-contrast', $attrs.class]"
-      >
-        <div class="flex items-center justify-between">
-          <div class="flex items-center gap-2 font-bold">
-            <FolderOpenIcon class="size-4" />
-            <span>
-              <span class="capitalize">
-                {{ props.fileType ? props.fileType : "File" }} Uploads
+  <div>
+    <Transition name="upload-status" @enter="onUploadStatusEnter" @leave="onUploadStatusLeave">
+      <div v-show="isUploading" ref="uploadStatusRef" class="upload-status">
+        <div
+          ref="statusContentRef"
+          v-bind="$attrs"
+          :class="['flex flex-col p-4 text-sm text-contrast']"
+        >
+          <div class="flex items-center justify-between">
+            <div class="flex items-center gap-2 font-bold">
+              <FolderOpenIcon class="size-4" />
+              <span>
+                <span class="capitalize">
+                  {{ props.fileType ? props.fileType : "File" }} uploads
+                </span>
+                <span>{{ activeUploads.length > 0 ? ` - ${activeUploads.length} left` : "" }}</span>
               </span>
-              <span>{{ activeUploads.length > 0 ? ` - ${activeUploads.length} left` : "" }}</span>
-            </span>
-          </div>
-        </div>
-
-        <div class="mt-2 space-y-2">
-          <div
-            v-for="item in uploadQueue"
-            :key="item.file.name"
-            class="flex h-6 items-center justify-between gap-2 text-xs"
-          >
-            <div class="flex flex-1 items-center gap-2 truncate">
-              <transition-group name="status-icon" mode="out-in">
-                <UiServersPanelSpinner
-                  v-show="item.status === 'uploading'"
-                  key="spinner"
-                  class="absolute !size-4"
-                />
-                <CheckCircleIcon
-                  v-show="item.status === 'completed'"
-                  key="check"
-                  class="absolute size-4 text-green"
-                />
-                <XCircleIcon
-                  v-show="
-                    item.status === 'error' ||
-                    item.status === 'cancelled' ||
-                    item.status === 'incorrect-type'
-                  "
-                  key="error"
-                  class="absolute size-4 text-red"
-                />
-              </transition-group>
-              <span class="ml-6 truncate">{{ item.file.name }}</span>
-              <span class="text-secondary">{{ item.size }}</span>
             </div>
-            <div class="flex min-w-[80px] items-center justify-end gap-2">
-              <template v-if="item.status === 'completed'">
-                <span>Done</span>
-              </template>
-              <template v-else-if="item.status === 'error'">
-                <span class="text-red">Failed - File already exists</span>
-              </template>
-              <template v-else-if="item.status === 'incorrect-type'">
-                <span class="text-red">Failed - Incorrect file type</span>
-              </template>
-              <template v-else>
-                <template v-if="item.status === 'uploading'">
-                  <span>{{ item.progress }}%</span>
-                  <div class="h-1 w-20 overflow-hidden rounded-full bg-bg">
-                    <div
-                      class="h-full bg-contrast transition-all duration-200"
-                      :style="{ width: item.progress + '%' }"
-                    />
-                  </div>
-                  <ButtonStyled color="red" type="transparent" @click="cancelUpload(item)">
-                    <button>Cancel</button>
-                  </ButtonStyled>
+          </div>
+
+          <div class="mt-2 space-y-2">
+            <div
+              v-for="item in uploadQueue"
+              :key="item.file.name"
+              class="flex h-6 items-center justify-between gap-2 text-xs"
+            >
+              <div class="flex flex-1 items-center gap-2 truncate">
+                <transition-group name="status-icon" mode="out-in">
+                  <UiServersPanelSpinner
+                    v-show="item.status === 'uploading'"
+                    key="spinner"
+                    class="absolute !size-4"
+                  />
+                  <CheckCircleIcon
+                    v-show="item.status === 'completed'"
+                    key="check"
+                    class="absolute size-4 text-green"
+                  />
+                  <XCircleIcon
+                    v-show="
+                      item.status === 'error' ||
+                      item.status === 'cancelled' ||
+                      item.status === 'incorrect-type'
+                    "
+                    key="error"
+                    class="absolute size-4 text-red"
+                  />
+                </transition-group>
+                <span class="ml-6 truncate">{{ item.file.name }}</span>
+                <span class="text-secondary">{{ item.size }}</span>
+              </div>
+              <div class="flex min-w-[80px] items-center justify-end gap-2">
+                <template v-if="item.status === 'completed'">
+                  <span>Done</span>
                 </template>
-                <template v-else-if="item.status === 'cancelled'">
-                  <span class="text-red">Cancelled</span>
+                <template v-else-if="item.status === 'error'">
+                  <span class="text-red">Failed - File already exists</span>
+                </template>
+                <template v-else-if="item.status === 'incorrect-type'">
+                  <span class="text-red">Failed - Incorrect file type</span>
                 </template>
                 <template v-else>
-                  <span>{{ item.progress }}%</span>
-                  <div class="h-1 w-20 overflow-hidden rounded-full bg-bg">
-                    <div
-                      class="h-full bg-contrast transition-all duration-200"
-                      :style="{ width: item.progress + '%' }"
-                    />
-                  </div>
+                  <template v-if="item.status === 'uploading'">
+                    <span>{{ item.progress }}%</span>
+                    <div class="h-1 w-20 overflow-hidden rounded-full bg-bg">
+                      <div
+                        class="h-full bg-contrast transition-all duration-200"
+                        :style="{ width: item.progress + '%' }"
+                      />
+                    </div>
+                    <ButtonStyled color="red" type="transparent" @click="cancelUpload(item)">
+                      <button>Cancel</button>
+                    </ButtonStyled>
+                  </template>
+                  <template v-else-if="item.status === 'cancelled'">
+                    <span class="text-red">Cancelled</span>
+                  </template>
+                  <template v-else>
+                    <span>{{ item.progress }}%</span>
+                    <div class="h-1 w-20 overflow-hidden rounded-full bg-bg">
+                      <div
+                        class="h-full bg-contrast transition-all duration-200"
+                        :style="{ width: item.progress + '%' }"
+                      />
+                    </div>
+                  </template>
                 </template>
-              </template>
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-  </Transition>
+    </Transition>
+  </div>
 </template>
 
 <script setup lang="ts">
 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";
 
 interface UploadItem {
   file: File;
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue b/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
new file mode 100644
index 00000000..6703bada
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
@@ -0,0 +1,159 @@
+<template>
+  <NewModal
+    ref="modal"
+    :header="cf ? `Installing a CurseForge pack` : `Uploading .zip contents from URL`"
+  >
+    <form class="flex flex-col gap-4 md:w-[600px]" @submit.prevent="handleSubmit">
+      <div class="flex flex-col gap-2">
+        <div class="font-bold text-contrast">
+          {{ cf ? `How to get the modpack version's URL` : "URL of .zip file" }}
+        </div>
+        <ol v-if="cf" class="mb-1 mt-0 flex flex-col gap-1 pl-8 leading-normal text-secondary">
+          <li>
+            <a
+              href="https://www.curseforge.com/minecraft/search?page=1&pageSize=40&sortBy=relevancy&class=modpacks"
+              class="inline-flex font-semibold text-[#F16436] transition-all hover:underline active:brightness-[--hover-brightness]"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              Find the CurseForge modpack
+              <ExternalIcon class="ml-1 inline size-4" stroke-width="3" />
+            </a>
+            you'd like to install on your server.
+          </li>
+          <li>
+            On the modpack's page, go to the
+            <span class="font-semibold text-primary">"Files"</span> tab, and
+            <span class="font-semibold text-primary">select the version</span> of the modpack you
+            want to install.
+          </li>
+          <li>
+            <span class="font-semibold text-primary">Copy the URL</span> of the version you want to
+            install, and paste it in the box below.
+          </li>
+        </ol>
+        <p v-else class="mb-1 mt-0">Copy and paste the direct download URL of a .zip file.</p>
+        <input
+          ref="urlInput"
+          v-model="url"
+          autofocus
+          :disabled="submitted"
+          type="text"
+          data-1p-ignore
+          data-lpignore="true"
+          data-protonpass-ignore="true"
+          required
+          :placeholder="
+            cf
+              ? 'https://www.curseforge.com/minecraft/modpacks/.../files/6412259'
+              : 'https://www.example.com/.../modpack-name-1.0.2.zip'
+          "
+          autocomplete="off"
+        />
+        <div v-if="submitted && error" class="text-red">{{ error }}</div>
+      </div>
+      <BackupWarning :backup-link="`/servers/manage/${props.server.serverId}/backups`" />
+      <div class="flex justify-start gap-2">
+        <ButtonStyled color="brand">
+          <button v-tooltip="error" :disabled="submitted || !!error" type="submit">
+            <SpinnerIcon v-if="submitted" class="animate-spin" />
+            <DownloadIcon v-else class="h-5 w-5" />
+            {{ submitted ? "Installing..." : "Install" }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled>
+          <button type="button" @click="hide">
+            <XIcon class="h-5 w-5" />
+            {{ submitted ? "Close" : "Cancel" }}
+          </button>
+        </ButtonStyled>
+      </div>
+    </form>
+  </NewModal>
+</template>
+
+<script setup lang="ts">
+import { ExternalIcon, SpinnerIcon, DownloadIcon, XIcon } from "@modrinth/assets";
+import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
+import { ref, computed, nextTick } from "vue";
+import { handleError, type Server } from "~/composables/pyroServers.ts";
+
+const cf = ref(false);
+
+const props = defineProps<{
+  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+}>();
+
+const modal = ref<typeof NewModal>();
+const urlInput = ref<HTMLInputElement | null>(null);
+const url = ref("");
+const submitted = ref(false);
+
+const trimmedUrl = computed(() => url.value.trim());
+
+const regex = /https:\/\/(www\.)?curseforge\.com\/minecraft\/modpacks\/[^/]+\/files\/\d+/;
+
+const error = computed(() => {
+  if (trimmedUrl.value.length === 0) {
+    return "URL is required.";
+  }
+  if (cf.value && !regex.test(trimmedUrl.value)) {
+    return "URL must be a CurseForge modpack version URL.";
+  } else if (!cf.value && !trimmedUrl.value.includes("/")) {
+    return "URL must be valid.";
+  }
+  return "";
+});
+
+const handleSubmit = async () => {
+  submitted.value = true;
+  if (!error.value) {
+    // hide();
+    try {
+      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);
+        hide();
+      } else {
+        submitted.value = false;
+        handleError(
+          new ServersError(
+            "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.",
+            },
+          ),
+        );
+      }
+    } catch (error) {
+      submitted.value = false;
+      console.error("Error installing:", error);
+      handleError(error);
+    }
+  }
+};
+
+const show = (isCf: boolean) => {
+  cf.value = isCf;
+  url.value = "";
+  submitted.value = false;
+  modal.value?.show();
+  nextTick(() => {
+    setTimeout(() => {
+      urlInput.value?.focus();
+    }, 100);
+  });
+};
+
+const hide = () => {
+  modal.value?.hide();
+};
+
+defineExpose({ show, hide });
+</script>
diff --git a/apps/frontend/src/components/ui/servers/MOTDEditor.vue b/apps/frontend/src/components/ui/servers/MOTDEditor.vue
deleted file mode 100644
index aa4c5d0e..00000000
--- a/apps/frontend/src/components/ui/servers/MOTDEditor.vue
+++ /dev/null
@@ -1,660 +0,0 @@
-<template>
-  <div class="flex items-center justify-center">
-    <div class="w-full overflow-hidden">
-      <div class="mb-4">
-        <div
-          v-for="(line, lineIndex) in motd"
-          :key="lineIndex"
-          class="relative mb-2 rounded bg-button-bg p-2"
-        >
-          <div
-            class="font-minecraft text-white"
-            :contenteditable="true"
-            spellcheck="false"
-            @input="handleInput($event, lineIndex)"
-            @keydown.enter.prevent
-            @paste.prevent="handlePaste($event, lineIndex)"
-            @mouseup="handleSelection(lineIndex)"
-            v-html="renderLine(line)"
-          ></div>
-          <div class="text-sm text-gray-400">
-            {{ motd[lineIndex].reduce((sum, segment) => sum + segment.text.length, 0) }}/45
-            characters
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <transition name="fade">
-      <div
-        v-if="showPopup"
-        :style="{ top: `${popupY}px`, left: `${popupX}px` }"
-        class="fixed z-10 flex flex-col items-end gap-2 transition-all duration-300 ease-in-out"
-      >
-        <div class="rounded-xl border bg-table-alternateRow p-2 shadow-lg">
-          <div class="flex space-x-2">
-            <Button
-              v-for="style in styles"
-              :key="style.name"
-              icon-only
-              transparent
-              @click="applyStyle({ [style.name]: !currentStyle[style.name] })"
-            >
-              <component :is="style.icon" class="h-4 w-4" />
-            </Button>
-            <div class="relative overflow-y-scroll">
-              <Button icon-only transparent :class="colorPicker ?? 'hidden'" @click="pickColor">
-                <PaintBrushIcon />
-              </Button>
-            </div>
-          </div>
-        </div>
-        <div
-          v-if="colorPicker"
-          icon-only
-          class="w-fit overflow-y-auto rounded-xl p-2 [&&]:bg-table-alternateRow"
-        >
-          <div :class="colorPicker ? `grid grid-flow-col grid-rows-4 gap-2` : '[&&]:hidden'">
-            <button
-              v-for="format in sortedFormatCodes()"
-              :key="format.code"
-              class="rounded-full p-3"
-              :style="{ backgroundColor: format.color }"
-              :title="format.description"
-              @click="applyStyle({ color: format.color })"
-            ></button>
-          </div>
-        </div>
-      </div>
-    </transition>
-  </div>
-</template>
-
-<script setup>
-import {
-  ItalicIcon,
-  BoldIcon,
-  StrikethroughIcon,
-  UnderlineIcon,
-  PaintBrushIcon,
-  ChevronLeftIcon,
-} from "@modrinth/assets";
-import { Button } from "@modrinth/ui";
-
-const props = defineProps({
-  server: {
-    type: Object,
-    required: true,
-  },
-});
-
-const formatCodes = [
-  { code: "§f", color: "white", description: "White" },
-  { code: "§7", color: "#AAAAAA", description: "Gray" },
-  { code: "§8", color: "#555555", description: "Dark Gray" },
-  { code: "§0", color: "#000000", description: "Black" },
-  { code: "§9", color: "#5555FF", description: "Blue" },
-  { code: "§1", color: "#0000AA", description: "Dark Blue" },
-  { code: "§b", color: "#55FFFF", description: "Aqua" },
-  { code: "§3", color: "#00AAAA", description: "Dark Aqua" },
-  { code: "§a", color: "#55FF55", description: "Green" },
-  { code: "§2", color: "#00AA00", description: "Dark Green" },
-  { code: "§e", color: "#FFFF55", description: "Yellow" },
-  { code: "§6", color: "#FFAA00", description: "Gold" },
-  { code: "§c", color: "#FF5555", description: "Red" },
-  { code: "§4", color: "#AA0000", description: "Dark Red" },
-  { code: "§d", color: "#FF55FF", description: "Light Purple" },
-  { code: "§5", color: "#AA00AA", description: "Dark Purple" },
-];
-
-const sortedFormatCodes = () => {
-  const colors = formatCodes;
-  if (colors[0].description === "White") {
-    colors.reverse();
-  }
-  return colors;
-};
-
-const minecraftEmojis = [
-  { char: "☺", name: "SMILING FACE" },
-  { char: "☹", name: "FROWNING FACE" },
-  { char: "☠", name: "SKULL AND CROSSBONES" },
-  { char: "❣", name: "HEART EXCLAMATION" },
-  { char: "❤", name: "RED HEART" },
-  { char: "✌", name: "VICTORY HAND" },
-  { char: "☝", name: "INDEX POINTING UP" },
-  { char: "✍", name: "WRITING HAND" },
-  { char: "♨", name: "HOT SPRINGS" },
-  { char: "✈", name: "AIRPLANE" },
-  { char: "⌛", name: "HOURGLASS DONE" },
-  { char: "⌚", name: "WATCH" },
-  { char: "☀", name: "SUN" },
-  { char: "☁", name: "CLOUD" },
-  { char: "☂", name: "UMBRELLA" },
-  { char: "❄", name: "SNOWFLAKE" },
-  { char: "☃", name: "SNOWMAN" },
-  { char: "☄", name: "COMET" },
-  { char: "♠", name: "SPADE SUIT" },
-  { char: "♥", name: "HEART SUIT" },
-  { char: "♦", name: "DIAMOND SUIT" },
-  { char: "♣", name: "CLUB SUIT" },
-  { char: "♟", name: "CHESS PAWN" },
-  { char: "☎", name: "TELEPHONE" },
-  { char: "⌨", name: "KEYBOARD" },
-  { char: "✉", name: "ENVELOPE" },
-  { char: "✏", name: "PENCIL" },
-  { char: "✒", name: "BLACK PEN" },
-  { char: "✂", name: "SCISSORS" },
-  { char: "☢", name: "RADIOACTIVE" },
-  { char: "☣", name: "BIOHAZARD" },
-  { char: "⬆", name: "UP ARROW" },
-  { char: "⬇", name: "DOWN ARROW" },
-  { char: "➡", name: "RIGHT ARROW" },
-  { char: "⬅", name: "LEFT ARROW" },
-  { char: "↗", name: "UP-RIGHT ARROW" },
-  { char: "↘", name: "DOWN-RIGHT ARROW" },
-  { char: "↙", name: "DOWN-LEFT ARROW" },
-  { char: "↖", name: "UP-LEFT ARROW" },
-  { char: "↕", name: "UP-DOWN ARROW" },
-  { char: "↔", name: "LEFT-RIGHT ARROW" },
-  { char: "↩", name: "RIGHT ARROW CURVING LEFT" },
-  { char: "↪", name: "LEFT ARROW CURVING RIGHT" },
-  { char: "✡", name: "STAR OF DAVID" },
-  { char: "☸", name: "WHEEL OF DHARMA" },
-  { char: "☯", name: "YIN YANG" },
-  { char: "✝", name: "LATIN CROSS" },
-  { char: "☦", name: "ORTHODOX CROSS" },
-  { char: "☪", name: "STAR AND CRESCENT" },
-  { char: "☮", name: "PEACE SYMBOL" },
-  { char: "♈", name: "ARIES" },
-  { char: "♉", name: "TAURUS" },
-  { char: "♊", name: "GEMINI" },
-  { char: "♋", name: "CANCER" },
-  { char: "♌", name: "LEO" },
-  { char: "♍", name: "VIRGO" },
-  { char: "♎", name: "LIBRA" },
-  { char: "♏", name: "SCORPIO" },
-  { char: "♐", name: "SAGITTARIUS" },
-  { char: "♑", name: "CAPRICORN" },
-  { char: "♒", name: "AQUARIUS" },
-  { char: "♓", name: "PISCES" },
-  { char: "▶", name: "PLAY BUTTON" },
-  { char: "◀", name: "REVERSE BUTTON" },
-  { char: "♀", name: "FEMALE SIGN" },
-  { char: "♂", name: "MALE SIGN" },
-  { char: "✖", name: "MULTIPLY" },
-  { char: "‼", name: "DOUBLE EXCLAMATION MARK" },
-  { char: "〰", name: "WAVY DASH" },
-  { char: "☑", name: "CHECK BOX WITH CHECK" },
-  { char: "✔", name: "CHECK MARK" },
-  { char: "✳", name: "EIGHT-SPOKED ASTERISK" },
-  { char: "✴", name: "EIGHT-POINTED STAR" },
-  { char: "❇", name: "SPARKLE" },
-  { char: "©", name: "COPYRIGHT" },
-  { char: "®", name: "REGISTERED" },
-  { char: "™", name: "TRADE MARK" },
-  { char: "Ⓜ", name: "CIRCLED M" },
-  { char: "㊗", name: 'JAPANESE "CONGRATULATIONS" BUTTON' },
-  { char: "㊙", name: 'JAPANESE "SECRET" BUTTON' },
-  { char: "▪", name: "BLACK SMALL SQUARE" },
-  { char: "▫", name: "WHITE SMALL SQUARE" },
-  { char: "☷", name: "TRIGRAM FOR EARTH" },
-  { char: "☵", name: "TRIGRAM FOR WATER" },
-  { char: "☶", name: "TRIGRAM FOR MOUNTAIN" },
-  { char: "☋", name: "DESCENDING NODE" },
-  { char: "☌", name: "CONJUNCTION" },
-  { char: "♜", name: "BLACK CHESS ROOK" },
-  { char: "♕", name: "WHITE CHESS QUEEN" },
-  { char: "♡", name: "WHITE HEART SUIT" },
-  { char: "♬", name: "BEAMED SIXTEENTH NOTES" },
-  { char: "☚", name: "BLACK LEFT POINTING INDEX" },
-  { char: "♮", name: "MUSIC NATURAL SIGN" },
-  { char: "♝", name: "BLACK CHESS BISHOP" },
-  { char: "♯", name: "SHARP" },
-  { char: "☴", name: "TRIGRAM FOR WIND" },
-  { char: "♭", name: "FLAT" },
-  { char: "☓", name: "SALTIRE" },
-  { char: "☛", name: "BLACK RIGHT POINTING INDEX" },
-  { char: "☭", name: "HAMMER AND SICKLE" },
-  { char: "♢", name: "WHITE DIAMOND SUIT" },
-  { char: "✐", name: "UPPER RIGHT PENCIL" },
-  { char: "♖", name: "WHITE CHESS ROOK" },
-  { char: "☈", name: "THUNDERSTORM" },
-  { char: "☒", name: "BALLOT BOX WITH X" },
-  { char: "★", name: "BLACK STAR" },
-  { char: "♚", name: "BLACK CHESS KING" },
-  { char: "♛", name: "BLACK CHESS QUEEN" },
-  { char: "✎", name: "LOWER RIGHT PENCIL" },
-  { char: "♪", name: "EIGHTH NOTE" },
-  { char: "☰", name: "TRIGRAM FOR HEAVEN" },
-  { char: "☽", name: "FIRST QUARTER MOON" },
-  { char: "☡", name: "CAUTION SIGN" },
-  { char: "☼", name: "WHITE SUN WITH RAYS" },
-  { char: "♅", name: "URANUS" },
-  { char: "☐", name: "BALLOT BOX" },
-  { char: "☟", name: "WHITE DOWN POINTING INDEX" },
-  { char: "❦", name: "FLORAL HEART" },
-  { char: "☊", name: "ASCENDING NODE" },
-  { char: "☍", name: "OPPOSITION" },
-  { char: "☬", name: "ADI SHAKTI" },
-  { char: "♧", name: "WHITE CLUB SUIT" },
-  { char: "☫", name: "FARSI SYMBOL" },
-  { char: "☱", name: "TRIGRAM FOR LAKE" },
-  { char: "☾", name: "LAST QUARTER MOON" },
-  { char: "☤", name: "CADUCEUS" },
-  { char: "❧", name: "ROTATED FLORAL HEART BULLET" },
-  { char: "♄", name: "SATURN" },
-  { char: "♁", name: "EARTH" },
-  { char: "♔", name: "WHITE CHESS KING" },
-  { char: "❥", name: "ROTATED HEAVY BLACK HEART BULLET" },
-  { char: "☥", name: "ANKH" },
-  { char: "☻", name: "BLACK SMILING FACE" },
-  { char: "♤", name: "WHITE SPADE SUIT" },
-  { char: "♞", name: "BLACK CHESS KNIGHT" },
-  { char: "♆", name: "NEPTUNE" },
-  { char: "#", name: "HASH SIGN" },
-  { char: "♃", name: "JUPITER" },
-  { char: "♩", name: "QUARTER NOTE" },
-  { char: "☇", name: "LIGHTNING" },
-  { char: "☞", name: "WHITE RIGHT POINTING INDEX" },
-  { char: "♫", name: "BEAMED EIGHTH NOTES" },
-  { char: "☏", name: "WHITE TELEPHONE" },
-  { char: "♘", name: "WHITE CHESS KNIGHT" },
-  { char: "☧", name: "CHI RHO" },
-  { char: "☉", name: "SUN" },
-  { char: "♇", name: "PLUTO" },
-  { char: "☩", name: "CROSS OF JERUSALEM" },
-  { char: "♙", name: "WHITE CHESS PAWN" },
-  { char: "☜", name: "WHITE LEFT POINTING INDEX" },
-  { char: "☲", name: "TRIGRAM FOR FIRE" },
-  { char: "☨", name: "CROSS OF LORRAINE" },
-  { char: "♗", name: "WHITE CHESS BISHOP" },
-  { char: "☳", name: "TRIGRAM FOR THUNDER" },
-  { char: "⚔", name: "CROSSED SWORDS" },
-  { char: "⚀", name: "DICE ONE" },
-];
-
-const rawMotd = ref(props.server.general?.motd ?? "");
-
-const motd = computed(() => {
-  const lines = rawMotd.value.split("\n");
-  return lines.map((line) => {
-    const segments = [];
-    let currentSegment = { text: "", color: "White" };
-    let i = 0;
-    while (i < line.length) {
-      if (line[i] === "§") {
-        if (currentSegment.text) {
-          segments.push({ ...currentSegment });
-          currentSegment = { text: "", color: "White" };
-        }
-        const formatCode = line.substr(i, 2);
-        const format = formatCodes.find((f) => f.code === formatCode);
-        console.log(format);
-        console.log(formatCode);
-        if (format) {
-          currentSegment.color = format.color;
-          i += 2;
-          continue;
-        } else if (formatCode === "§l") {
-          currentSegment.bold = true;
-          i += 2;
-          continue;
-        } else if (formatCode === "§o") {
-          currentSegment.italic = true;
-          i += 2;
-          continue;
-        } else if (formatCode === "§n") {
-          currentSegment.underline = true;
-          i += 2;
-          continue;
-        } else if (formatCode === "§m") {
-          currentSegment.strikethrough = true;
-          i += 2;
-          continue;
-        }
-      }
-      currentSegment.text += line[i];
-      i++;
-    }
-    if (currentSegment.text) {
-      segments.push(currentSegment);
-    }
-    return segments;
-  });
-});
-
-const styles = [
-  {
-    name: "bold",
-    icon: BoldIcon,
-  },
-  {
-    name: "italic",
-    icon: ItalicIcon,
-  },
-  {
-    name: "underline",
-    icon: UnderlineIcon,
-  },
-  {
-    name: "strikethrough",
-    icon: StrikethroughIcon,
-  },
-];
-
-const showPopup = ref(false);
-const popupX = ref(0);
-const popupY = ref(0);
-const currentLineIndex = ref(0);
-const selectionStart = ref(0);
-const selectionEnd = ref(0);
-const colorPicker = ref(false);
-
-const pickColor = () => {
-  colorPicker.value = !colorPicker.value;
-};
-
-const totalCharacters = computed(() => {
-  return motd.value.reduce((sum, line) => {
-    return Math.max(
-      sum,
-      line.reduce((lineSum, segment) => lineSum + segment.text.length, 0),
-    );
-  }, 0);
-});
-
-const minecraftFormat = computed(() => {
-  return motd.value
-    .map((line) => {
-      return line
-        .map((segment) => {
-          let format = getColorCode(segment.color);
-          if (segment.bold) format += "§l";
-          if (segment.italic) format += "§o";
-          if (segment.underline) format += "§n";
-          if (segment.strikethrough) format += "§m";
-          return format + segment.text;
-        })
-        .join("");
-    })
-    .join("\n");
-});
-
-const currentStyle = computed(() => {
-  const line = motd.value[currentLineIndex.value];
-  if (!line) return {};
-
-  let start = 0;
-  for (const segment of line) {
-    if (start + segment.text.length > selectionStart.value) {
-      return {
-        color: segment.color || "White",
-        bold: segment.bold || false,
-        italic: segment.italic || false,
-        underline: segment.underline || false,
-        strikethrough: segment.strikethrough || false,
-      };
-    }
-    start += segment.text.length;
-  }
-  return {};
-});
-
-function getColorCode(color) {
-  const format = formatCodes.find((f) => f.description === color);
-  return format ? format.code : "§f";
-}
-
-function renderLine(line) {
-  return line
-    .map((segment) => {
-      let style = `color: ${segment.color};`;
-      if (segment.bold) style += "font-weight: 900;";
-      if (segment.italic) style += "font-style: italic;";
-      if (segment.underline) style += "text-decoration: underline;";
-      if (segment.strikethrough) style += "text-decoration: line-through;";
-      return `<span style="${style}">${segment.text}</span>`;
-    })
-    .join("");
-}
-
-function handleSelection(lineIndex) {
-  const selection = window.getSelection();
-  if (selection.toString().length > 0) {
-    const range = selection.getRangeAt(0);
-    const rect = range.getBoundingClientRect();
-
-    popupX.value = rect.left;
-    popupY.value = rect.bottom;
-    showPopup.value = true;
-    currentLineIndex.value = lineIndex;
-
-    const lineElement = document.querySelectorAll("[contenteditable]")[lineIndex];
-    const rangeClone = range.cloneRange();
-    rangeClone.selectNodeContents(lineElement);
-    rangeClone.setEnd(range.startContainer, range.startOffset);
-    selectionStart.value = rangeClone.toString().length;
-    selectionEnd.value = selectionStart.value + range.toString().length;
-  } else {
-    showPopup.value = false;
-    colorPicker.value = false;
-  }
-}
-
-function applyStyle(newStyle) {
-  const line = motd.value[currentLineIndex.value];
-  const newLine = [];
-  let currentPos = 0;
-
-  for (const segment of line) {
-    if (currentPos + segment.text.length <= selectionStart.value) {
-      newLine.push(segment);
-    } else if (currentPos >= selectionEnd.value) {
-      newLine.push(segment);
-    } else {
-      const beforeSelection = segment.text.slice(0, Math.max(0, selectionStart.value - currentPos));
-      const inSelection = segment.text.slice(
-        Math.max(0, selectionStart.value - currentPos),
-        Math.min(segment.text.length, selectionEnd.value - currentPos),
-      );
-      const afterSelection = segment.text.slice(
-        Math.min(segment.text.length, selectionEnd.value - currentPos),
-      );
-      console.log(beforeSelection);
-      console.log(inSelection);
-      console.log(afterSelection);
-
-      if (beforeSelection) newLine.push({ ...segment, text: beforeSelection });
-      if (inSelection) {
-        const mergedStyle = { ...segment, ...newStyle };
-        for (const key in newStyle) {
-          if (newStyle[key] === false) {
-            delete mergedStyle[key];
-          }
-        }
-        newLine.push({ ...mergedStyle, text: inSelection });
-      }
-      if (afterSelection) newLine.push({ ...segment, text: afterSelection });
-    }
-    currentPos += segment.text.length;
-  }
-
-  motd.value[currentLineIndex.value] = newLine;
-  showPopup.value = false;
-  colorPicker.value = false;
-
-  // Rerender the line to reflect the changes
-  nextTick(() => {
-    const lineElement = document.querySelectorAll("[contenteditable]")[currentLineIndex.value];
-    lineElement.innerHTML = renderLine(newLine);
-  });
-}
-
-function insertEmoji() {
-  const emoji = "☺";
-  if (totalCharacters.value + emoji.length <= 90) {
-    applyStyle({ text: emoji });
-  }
-}
-
-function handleInput(event, lineIndex) {
-  const newText = event.target.textContent;
-  const oldText = motd.value[lineIndex].reduce((acc, segment) => acc + segment.text, "");
-  const diff = newText.length - oldText.length;
-
-  if (newText.length <= 45) {
-    const selection = window.getSelection();
-    const range = selection.getRangeAt(0);
-    const cursorOffset = getCursorOffset(event.target, range);
-
-    const newLine = [];
-    let currentPos = 0;
-    for (const segment of motd.value[lineIndex]) {
-      const segmentEnd = currentPos + segment.text.length;
-      const newSegmentText = newText.slice(currentPos, Math.min(segmentEnd, newText.length));
-      if (newSegmentText) {
-        newLine.push({ ...segment, text: newSegmentText });
-      }
-      currentPos = segmentEnd;
-      if (currentPos >= newText.length) break;
-    }
-    if (currentPos < newText.length) {
-      newLine.push({ text: newText.slice(currentPos), color: "White" });
-    }
-    motd.value[lineIndex] = newLine;
-
-    nextTick(() => {
-      const lineElement = event.target;
-      lineElement.innerHTML = renderLine(newLine);
-
-      const newRange = document.createRange();
-      const sel = window.getSelection();
-      const { node, offset } = getCursorNodeAndOffset(lineElement, cursorOffset);
-
-      if (node) {
-        newRange.setStart(node, offset);
-        newRange.collapse(true);
-        sel.removeAllRanges();
-        sel.addRange(newRange);
-      }
-    });
-  } else {
-    event.target.innerHTML = renderLine(motd.value[lineIndex]);
-  }
-}
-
-// Helper function to get cursor offset considering styled spans
-function getCursorOffset(element, range) {
-  let offset = 0;
-  const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT, null, false);
-  let node;
-
-  while ((node = walker.nextNode())) {
-    if (node === range.startContainer) {
-      return offset + range.startOffset;
-    }
-    offset += node.length;
-  }
-  return offset;
-}
-
-// Helper function to find the node and offset for cursor placement
-function getCursorNodeAndOffset(element, targetOffset) {
-  let currentOffset = 0;
-  const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT, null, false);
-  let node;
-
-  while ((node = walker.nextNode())) {
-    if (currentOffset + node.length >= targetOffset) {
-      return { node, offset: targetOffset - currentOffset };
-    }
-    currentOffset += node.length;
-  }
-
-  // If we've gone past the end, return the last possible position
-  const lastTextNode = element.lastChild?.lastChild;
-  return { node: lastTextNode, offset: lastTextNode?.length || 0 };
-}
-
-function handlePaste(event, lineIndex) {
-  event.preventDefault();
-  const pastedText = (event.clipboardData || window.clipboardData).getData("text");
-  const selection = window.getSelection();
-  const range = selection.getRangeAt(0);
-  const startOffset = range.startOffset;
-
-  const currentText = motd.value[lineIndex].reduce((acc, segment) => acc + segment.text, "");
-  const newText = currentText.slice(0, startOffset) + pastedText + currentText.slice(startOffset);
-
-  if (newText.length <= 45) {
-    // Preserve existing styles by matching new text with old segments
-    const newLine = [];
-    let currentPos = 0;
-    for (const segment of motd.value[lineIndex]) {
-      if (currentPos < startOffset) {
-        const segmentEnd = Math.min(currentPos + segment.text.length, startOffset);
-        newLine.push({ ...segment, text: newText.slice(currentPos, segmentEnd) });
-        currentPos = segmentEnd;
-      } else if (currentPos >= startOffset + pastedText.length) {
-        newLine.push({ ...segment, text: newText.slice(currentPos) });
-        break;
-      }
-    }
-    // Insert pasted text as a new segment
-    if (currentPos < startOffset + pastedText.length) {
-      newLine.push({
-        text: newText.slice(currentPos, startOffset + pastedText.length),
-        color: "White",
-      });
-    }
-    motd.value[lineIndex] = newLine;
-
-    nextTick(() => {
-      const lineElement = document.querySelectorAll("[contenteditable]")[lineIndex];
-      lineElement.innerHTML = renderLine(newLine);
-      const newRange = document.createRange();
-      const sel = window.getSelection();
-      newRange.setStart(lineElement.childNodes[0], startOffset + pastedText.length);
-      newRange.collapse(true);
-      sel.removeAllRanges();
-      sel.addRange(newRange);
-    });
-  }
-}
-</script>
-
-<style scoped>
-.minecraft-font {
-  font-family: "Minecraft", monospace;
-  font-size: 16px;
-  line-height: 1.5;
-}
-
-[contenteditable] {
-  outline: none;
-}
-</style>
-
-<style scoped>
-@font-face {
-  font-family: "Monocraft";
-  src: url("/Monocraft.ttf") format("truetype");
-}
-
-.font-minecraft {
-  font-family: "Monocraft", monospace;
-}
-
-.mcbg {
-  background: url("@/assets/images/servers/minecraft-background-dark.png") repeat center center;
-}
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.5s ease-in-out;
-}
-.fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
-  opacity: 0;
-}
-</style>
diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index 6b3e1f24..cdc71fa1 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -53,7 +53,7 @@
         </div>
 
         <div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4">
-          <div class="text-sm font-bold text-contrast">Minecraft version</div>
+          <div class="text-lg font-bold text-contrast">Minecraft version</div>
           <UiServersTeleportDropdownMenu
             v-model="selectedMCVersion"
             name="mcVersion"
@@ -61,6 +61,20 @@
             class="w-full max-w-[100%]"
             placeholder="Select Minecraft version..."
           />
+          <div class="mt-2 flex items-center justify-between gap-2">
+            <label for="toggle-snapshots" class="font-semibold"> Show snapshot versions </label>
+            <div
+              v-tooltip="
+                isSnapshotSelected ? 'A snapshot version is currently selected.' : undefined
+              "
+            >
+              <Toggle
+                id="toggle-snapshots"
+                v-model="showSnapshots"
+                :disabled="isSnapshotSelected"
+              />
+            </div>
+          </div>
         </div>
 
         <div
@@ -74,7 +88,7 @@
           }"
         >
           <div class="flex flex-col gap-2">
-            <div class="text-sm font-bold text-contrast">{{ selectedLoader }} version</div>
+            <div class="text-lg font-bold text-contrast">{{ selectedLoader }} version</div>
 
             <template v-if="!selectedMCVersion">
               <div
@@ -177,8 +191,9 @@
 </template>
 
 <script setup lang="ts">
-import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
-import { RightArrowIcon, XIcon, ServerIcon, DropdownIcon } from "@modrinth/assets";
+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 { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
@@ -214,6 +229,7 @@ const hardReset = ref(false);
 const isLoading = ref(false);
 const loadingServerCheck = ref(false);
 const serverCheckError = ref("");
+const showSnapshots = ref(false);
 
 const selectedLoader = ref<Loaders>("Vanilla");
 const selectedMCVersion = ref("");
@@ -226,6 +242,22 @@ const cachedVersions = ref<VersionCache>({});
 
 const versionStrings = ["forge", "fabric", "quilt", "neo"] as const;
 
+const isSnapshotSelected = computed(() => {
+  if (selectedMCVersion.value) {
+    const selected = tags.value.gameVersions.find((x) => x.version === selectedMCVersion.value);
+    if (selected?.version_type !== "release") {
+      return true;
+    }
+  }
+  return false;
+});
+
+const getLoaderVersions = async (loader: string) => {
+  return await $fetch(
+    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/manifest.json`,
+  );
+};
+
 const fetchLoaderVersions = async () => {
   const versions = await Promise.all(
     versionStrings.map(async (loader) => {
@@ -234,7 +266,7 @@ const fetchLoaderVersions = async () => {
           throw new Error("Failed to fetch loader versions");
         }
         try {
-          const res = await $fetch(`/loader-versions?loader=${loader}`);
+          const res = await getLoaderVersions(loader);
           return { [loader]: (res as any).gameVersions };
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (_) {
@@ -277,11 +309,11 @@ const fetchPurpurVersions = async (mcVersion: string) => {
   }
 };
 
-const selectedLoaderVersions = computed(() => {
+const selectedLoaderVersions = computed<string[]>(() => {
   const loader = selectedLoader.value.toLowerCase();
 
   if (loader === "paper") {
-    return paperVersions.value[selectedMCVersion.value] || [];
+    return paperVersions.value[selectedMCVersion.value].map((x) => `${x}`) || [];
   }
 
   if (loader === "purpur") {
@@ -325,13 +357,22 @@ watch(selectedLoader, async () => {
 watch(
   selectedLoaderVersions,
   (newVersions) => {
-    if (newVersions.length > 0 && !selectedLoaderVersion.value) {
+    if (
+      newVersions.length > 0 &&
+      (!selectedLoaderVersion.value || !newVersions.includes(selectedLoaderVersion.value))
+    ) {
       selectedLoaderVersion.value = String(newVersions[0]);
     }
   },
   { immediate: true },
 );
 
+const getLoaderVersion = async (loader: string, version: string) => {
+  return await $fetch(
+    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/versions/${version}.json`,
+  );
+};
+
 const checkVersionAvailability = async (version: string) => {
   if (!version || version.trim().length < 3) return;
 
@@ -339,9 +380,7 @@ const checkVersionAvailability = async (version: string) => {
   loadingServerCheck.value = true;
 
   try {
-    const mcRes =
-      cachedVersions.value[version] ||
-      (await $fetch(`/loader-versions?loader=minecraft&version=${version}`));
+    const mcRes = cachedVersions.value[version] || (await getLoaderVersion("minecraft", version));
 
     cachedVersions.value[version] = mcRes;
 
@@ -377,13 +416,15 @@ onMounted(() => {
 });
 
 const tags = useTags();
-const mcVersions = tags.value.gameVersions
-  .filter((x) => x.version_type === "release")
-  .map((x) => x.version)
-  .filter((x) => {
-    const segment = parseInt(x.split(".")[1], 10);
-    return !isNaN(segment) && segment > 2;
-  });
+const mcVersions = computed(() =>
+  tags.value.gameVersions
+    .filter((x) =>
+      showSnapshots.value
+        ? x.version_type === "snapshot" || x.version_type === "release"
+        : x.version_type === "release",
+    )
+    .map((x) => x.version),
+);
 
 const isDangerous = computed(() => hardReset.value);
 const canInstall = computed(() => {
@@ -448,6 +489,9 @@ const handleReinstall = async () => {
 
 const onShow = () => {
   selectedMCVersion.value = props.server.general?.mc_version || "";
+  if (isSnapshotSelected.value) {
+    showSnapshots.value = true;
+  }
 };
 
 const onHide = () => {
diff --git a/apps/frontend/src/components/ui/servers/PoweredByPyro.vue b/apps/frontend/src/components/ui/servers/PoweredByPyro.vue
deleted file mode 100644
index f6c54fa3..00000000
--- a/apps/frontend/src/components/ui/servers/PoweredByPyro.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <a
-    href="https://pyro.host"
-    target="_blank"
-    class="mx-auto mt-8 flex select-none flex-row items-center gap-2 hover:underline"
-  >
-    <PyroIcon class="size-4 text-secondary" />
-    <span class="text-sm text-secondary">Powered by Pyro</span>
-  </a>
-</template>
-
-<script setup lang="ts">
-import { PyroIcon } from "@modrinth/assets";
-</script>
diff --git a/apps/frontend/src/components/ui/servers/ServerListing.vue b/apps/frontend/src/components/ui/servers/ServerListing.vue
index a8bfeece..bacf2ab3 100644
--- a/apps/frontend/src/components/ui/servers/ServerListing.vue
+++ b/apps/frontend/src/components/ui/servers/ServerListing.vue
@@ -60,15 +60,7 @@
       Your server's hardware is currently being upgraded and will be back online shortly.
     </div>
     <div
-      v-if="status === 'suspended' && suspension_reason === 'support'"
-      class="relative -mt-4 flex w-full flex-row items-center gap-2 rounded-b-3xl bg-bg-blue p-4 text-sm font-bold text-contrast"
-    >
-      <HammerIcon />
-      You recently requested support for your server and we are actively working on it. It will be
-      back online shortly.
-    </div>
-    <div
-      v-else-if="status === 'suspended' && suspension_reason !== 'upgrading'"
+      v-else-if="status === 'suspended'"
       class="relative -mt-4 flex w-full flex-col gap-2 rounded-b-3xl bg-bg-red p-4 text-sm font-bold text-contrast"
     >
       <div class="flex flex-row gap-2">
diff --git a/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue b/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
index 284f432b..da6ac622 100644
--- a/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
+++ b/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
@@ -32,68 +32,68 @@
           @mousedown.stop
           @mouseleave="handleMouseLeave"
         >
-          <ButtonStyled
+          <template
             v-for="(option, index) in filteredOptions"
-            :key="option.id"
-            type="transparent"
-            role="menuitem"
-            :color="option.color"
+            :key="isDivider(option) ? `divider-${index}` : option.id"
           >
-            <button
-              v-if="typeof option.action === 'function'"
-              :ref="
-                (el) => {
-                  if (el) menuItemsRef[index] = el as HTMLElement;
-                }
-              "
-              class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
-              :aria-selected="index === selectedIndex"
-              :style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
-              @click="handleItemClick(option, index)"
-              @focus="selectedIndex = index"
-              @mouseover="handleMouseOver(index)"
-            >
-              <slot :name="option.id">{{ option.id }}</slot>
-            </button>
-            <nuxt-link
-              v-else-if="typeof option.action === 'string' && option.action.startsWith('/')"
-              :ref="
-                (el) => {
-                  if (el) menuItemsRef[index] = el as HTMLElement;
-                }
-              "
-              :to="option.action"
-              class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
-              :aria-selected="index === selectedIndex"
-              :style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
-              @click="handleItemClick(option, index)"
-              @focus="selectedIndex = index"
-              @mouseover="handleMouseOver(index)"
-            >
-              <slot :name="option.id">{{ option.id }}</slot>
-            </nuxt-link>
-            <a
-              v-else-if="typeof option.action === 'string' && !option.action.startsWith('http')"
-              :ref="
-                (el) => {
-                  if (el) menuItemsRef[index] = el as HTMLElement;
-                }
-              "
-              :href="option.action"
-              target="_blank"
-              class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
-              :aria-selected="index === selectedIndex"
-              :style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
-              @click="handleItemClick(option, index)"
-              @focus="selectedIndex = index"
-              @mouseover="handleMouseOver(index)"
-            >
-              <slot :name="option.id">{{ option.id }}</slot>
-            </a>
-            <span v-else>
-              <slot :name="option.id">{{ option.id }}</slot>
-            </span>
-          </ButtonStyled>
+            <div v-if="isDivider(option)" class="h-px w-full bg-button-bg"></div>
+            <ButtonStyled v-else type="transparent" role="menuitem" :color="option.color">
+              <button
+                v-if="typeof option.action === 'function'"
+                :ref="
+                  (el) => {
+                    if (el) menuItemsRef[index] = el as HTMLElement;
+                  }
+                "
+                class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
+                :aria-selected="index === selectedIndex"
+                :style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
+                @click="handleItemClick(option, index)"
+                @focus="selectedIndex = index"
+                @mouseover="handleMouseOver(index)"
+              >
+                <slot :name="option.id">{{ option.id }}</slot>
+              </button>
+              <nuxt-link
+                v-else-if="typeof option.action === 'string' && option.action.startsWith('/')"
+                :ref="
+                  (el) => {
+                    if (el) menuItemsRef[index] = el as HTMLElement;
+                  }
+                "
+                :to="option.action"
+                class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
+                :aria-selected="index === selectedIndex"
+                :style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
+                @click="handleItemClick(option, index)"
+                @focus="selectedIndex = index"
+                @mouseover="handleMouseOver(index)"
+              >
+                <slot :name="option.id">{{ option.id }}</slot>
+              </nuxt-link>
+              <a
+                v-else-if="typeof option.action === 'string' && !option.action.startsWith('http')"
+                :ref="
+                  (el) => {
+                    if (el) menuItemsRef[index] = el as HTMLElement;
+                  }
+                "
+                :href="option.action"
+                target="_blank"
+                class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
+                :aria-selected="index === selectedIndex"
+                :style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
+                @click="handleItemClick(option, index)"
+                @focus="selectedIndex = index"
+                @mouseover="handleMouseOver(index)"
+              >
+                <slot :name="option.id">{{ option.id }}</slot>
+              </a>
+              <span v-else>
+                <slot :name="option.id">{{ option.id }}</slot>
+              </span>
+            </ButtonStyled>
+          </template>
         </div>
       </Transition>
     </Teleport>
@@ -112,9 +112,20 @@ interface Option {
   color?: "standard" | "brand" | "red" | "orange" | "green" | "blue" | "purple";
 }
 
+type Divider = {
+  divider: true;
+  shown?: boolean;
+};
+
+type Item = Option | Divider;
+
+function isDivider(item: Item): item is Divider {
+  return (item as Divider).divider;
+}
+
 const props = withDefaults(
   defineProps<{
-    options: Option[];
+    options: Item[];
     hoverable?: boolean;
   }>(),
   {
@@ -338,7 +349,9 @@ const handleKeydown = (event: KeyboardEvent) => {
     case " ":
       event.preventDefault();
       if (selectedIndex.value >= 0) {
-        selectOption(filteredOptions.value[selectedIndex.value]);
+        const option = filteredOptions.value[selectedIndex.value];
+        if (isDivider(option)) break;
+        selectOption(option);
       }
       break;
     case "Escape":
@@ -361,8 +374,9 @@ const handleKeydown = (event: KeyboardEvent) => {
     default:
       if (event.key.length === 1) {
         typeAheadBuffer.value += event.key.toLowerCase();
-        const matchIndex = filteredOptions.value.findIndex((option) =>
-          option.id.toLowerCase().startsWith(typeAheadBuffer.value),
+        const matchIndex = filteredOptions.value.findIndex(
+          (option) =>
+            !isDivider(option) && option.id.toLowerCase().startsWith(typeAheadBuffer.value),
         );
         if (matchIndex !== -1) {
           selectedIndex.value = matchIndex;
diff --git a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
index bae501e0..7b7c4f99 100644
--- a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
+++ b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
@@ -3,6 +3,7 @@ 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,
@@ -11,6 +12,7 @@ import {
 import { useVIntl } from "@vintl/vintl";
 
 const { formatMessage } = useVIntl();
+const formatRelativeTime = useRelativeTime();
 
 const props = defineProps<{
   notice: ServerNoticeType;
@@ -25,7 +27,7 @@ const props = defineProps<{
       <div class="text-sm">
         <span v-if="notice.announce_at">
           {{ dayjs(notice.announce_at).format("MMM D, YYYY [at] h:mm A") }} ({{
-            dayjs(notice.announce_at).fromNow()
+            formatRelativeTime(notice.announce_at)
           }})
         </span>
         <template v-else> Never begins </template>
@@ -35,7 +37,7 @@ const props = defineProps<{
           v-if="notice.expires"
           v-tooltip="dayjs(notice.expires).format('MMMM D, YYYY [at] h:mm A')"
         >
-          {{ dayjs(notice.expires).fromNow() }}
+          {{ formatRelativeTime(notice.expires) }}
         </span>
         <template v-else> Never expires </template>
       </div>
diff --git a/apps/frontend/src/components/ui/thread/ThreadMessage.vue b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
index 42263b48..607b269b 100644
--- a/apps/frontend/src/components/ui/thread/ThreadMessage.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
@@ -103,7 +103,7 @@ import {
   ModrinthIcon,
   ScaleIcon,
 } from "@modrinth/assets";
-import { AutoLink, OverflowMenu } from "@modrinth/ui";
+import { AutoLink, OverflowMenu, useRelativeTime } from "@modrinth/ui";
 import { renderString } from "@modrinth/utils";
 import Avatar from "~/components/ui/Avatar.vue";
 import Badge from "~/components/ui/Badge.vue";
diff --git a/apps/frontend/src/composables/country.js b/apps/frontend/src/composables/country.js
deleted file mode 100644
index 19a0aca2..00000000
--- a/apps/frontend/src/composables/country.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const useUserCountry = () =>
-  useState("userCountry", () => {
-    const headers = useRequestHeaders(["cf-ipcountry"]);
-
-    return headers["cf-ipcountry"] ?? "US";
-  });
diff --git a/apps/frontend/src/composables/country.ts b/apps/frontend/src/composables/country.ts
new file mode 100644
index 00000000..0d3dd6a8
--- /dev/null
+++ b/apps/frontend/src/composables/country.ts
@@ -0,0 +1,36 @@
+import { useState, useRequestHeaders } from "#imports";
+
+export const useUserCountry = () => {
+  const country = useState<string>("userCountry", () => "US");
+  const fromServer = useState<boolean>("userCountryFromServer", () => false);
+
+  if (import.meta.server) {
+    const headers = useRequestHeaders(["cf-ipcountry", "accept-language"]);
+    const cf = headers["cf-ipcountry"];
+    if (cf) {
+      country.value = cf.toUpperCase();
+      fromServer.value = true;
+    } else {
+      const al = headers["accept-language"] || "";
+      const tag = al.split(",")[0];
+      const val = tag.split("-")[1]?.toLowerCase();
+      if (val) {
+        country.value = val;
+        fromServer.value = true;
+      }
+    }
+  }
+
+  if (import.meta.client) {
+    onMounted(() => {
+      if (fromServer.value) return;
+      const lang = navigator.language || navigator.userLanguage || "";
+      const region = lang.split("-")[1];
+      if (region) {
+        country.value = region.toUpperCase();
+      }
+    });
+  }
+
+  return country;
+};
diff --git a/apps/frontend/src/composables/date.js b/apps/frontend/src/composables/date.js
deleted file mode 100644
index 36eb8c62..00000000
--- a/apps/frontend/src/composables/date.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import dayjs from "dayjs";
-import relativeTime from "dayjs/plugin/relativeTime";
-
-dayjs.extend(relativeTime); // eslint-disable-line import/no-named-as-default-member
-
-export const useCurrentDate = () => useState("currentDate", () => Date.now());
-
-export const updateCurrentDate = () => {
-  const currentDate = useCurrentDate();
-
-  currentDate.value = Date.now();
-};
-
-export const fromNow = (date) => {
-  const currentDate = useCurrentDate();
-  return dayjs(date).from(currentDate.value);
-};
diff --git a/apps/frontend/src/composables/how-ago.ts b/apps/frontend/src/composables/how-ago.ts
deleted file mode 100644
index 63ab90a0..00000000
--- a/apps/frontend/src/composables/how-ago.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createFormatter, type Formatter } from "@vintl/how-ago";
-import type { IntlController } from "@vintl/vintl/controller";
-
-const formatters = new WeakMap<IntlController<any>, Formatter>();
-
-export function useRelativeTime(): Formatter {
-  const vintl = useVIntl();
-
-  let formatter = formatters.get(vintl);
-
-  if (formatter == null) {
-    const formatterRef = computed(() => createFormatter(vintl.intl));
-    formatter = (value, options) => formatterRef.value(value, options);
-    formatters.set(vintl, formatter);
-  }
-
-  return formatter;
-}
diff --git a/apps/frontend/src/composables/notifs.js b/apps/frontend/src/composables/notifs.js
index 292832b8..7ec7786c 100644
--- a/apps/frontend/src/composables/notifs.js
+++ b/apps/frontend/src/composables/notifs.js
@@ -11,11 +11,13 @@ export const addNotification = (notification) => {
   );
   if (existingNotif) {
     setNotificationTimer(existingNotif);
+    existingNotif.count++;
 
     return;
   }
 
   notification.id = new Date();
+  notification.count = 1;
 
   setNotificationTimer(notification);
   notifications.value.push(notification);
diff --git a/apps/frontend/src/composables/pyroServers.ts b/apps/frontend/src/composables/pyroServers.ts
index 609c1390..9c758e11 100644
--- a/apps/frontend/src/composables/pyroServers.ts
+++ b/apps/frontend/src/composables/pyroServers.ts
@@ -1,7 +1,7 @@
 // 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 { WSBackupState, WSBackupTask } from "~/types/servers.ts";
+import type { FilesystemOp, FSQueuedOp, WSBackupState, WSBackupTask } from "~/types/servers.ts";
 
 interface PyroFetchOptions {
   method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
@@ -40,12 +40,19 @@ class PyroServerError extends Error {
   }
 }
 
-export class PyroServersFetchError extends Error {
+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";
@@ -96,17 +103,35 @@ export class PyroServersFetchError extends Error {
   }
 }
 
+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 PyroServersFetchError("Missing auth token", 401, undefined, module);
+    throw new ServersError("Missing auth token", 401, undefined, module);
   }
 
   const {
@@ -124,16 +149,18 @@ async function PyroFetch<T>(
   );
 
   if (!base) {
-    throw new PyroServersFetchError(
-      "Configuration error: Missing PYRO_BASE_URL",
-      500,
-      undefined,
-      module,
-    );
+    throw new ServersError("Configuration error: Missing PYRO_BASE_URL", 500, undefined, module);
   }
 
-  const fullUrl = override?.url
-    ? `https://${override.url}/${path.replace(/^\//, "")}`
+  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> = {
@@ -170,11 +197,20 @@ async function PyroFetch<T>(
       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 PyroServersFetchError(error.message, statusCode, error, module);
+          throw new ServersError(error.message, statusCode, error, module, v1Error);
         }
 
         const delay = Math.min(1000 * Math.pow(2, attempts - 1) + Math.random() * 1000, 10000);
@@ -182,7 +218,7 @@ async function PyroFetch<T>(
         continue;
       }
 
-      throw new PyroServersFetchError(
+      throw new ServersError(
         "Unexpected error during fetch operation",
         undefined,
         error as Error,
@@ -271,10 +307,8 @@ interface General {
     | "moderated"
     | "paymentfailed"
     | "cancelled"
-    | "other"
-    | "transferring"
     | "upgrading"
-    | "support"
+    | "other"
     | (string & {});
   loader: string;
   loader_version: string;
@@ -419,7 +453,7 @@ const processImage = async (iconUrl: string | undefined) => {
         }
       }
     } catch (error) {
-      if (error instanceof PyroServersFetchError && error.statusCode === 404 && iconUrl) {
+      if (error instanceof ServersError && error.statusCode === 404 && iconUrl) {
         try {
           const response = await fetch(iconUrl);
           if (!response.ok) throw new Error("Failed to fetch icon");
@@ -892,7 +926,7 @@ const retryWithAuth = async (requestFn: () => Promise<any>) => {
   try {
     return await requestFn();
   } catch (error) {
-    if (error instanceof PyroServersFetchError && error.statusCode === 401) {
+    if (error instanceof ServersError && error.statusCode === 401) {
       await internalServerReference.value.refresh(["fs"]);
       return await requestFn();
     }
@@ -1051,6 +1085,68 @@ const moveFileOrFolder = (path: string, newPath: string) => {
   });
 };
 
+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 () => {
@@ -1104,9 +1200,9 @@ const modules: any = {
         return data;
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           status: "error",
@@ -1135,9 +1231,9 @@ const modules: any = {
         };
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           data: [],
@@ -1160,9 +1256,9 @@ const modules: any = {
         };
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           data: [],
@@ -1196,9 +1292,9 @@ const modules: any = {
         };
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           allocations: [],
@@ -1221,9 +1317,9 @@ const modules: any = {
         return await PyroFetch<Startup>(`servers/${serverId}/startup`, {}, "startup");
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           error: {
@@ -1241,9 +1337,9 @@ const modules: any = {
         return await PyroFetch<JWTAuth>(`servers/${serverId}/ws`, {}, "ws");
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           error: {
@@ -1255,14 +1351,16 @@ const modules: any = {
     },
   },
   fs: {
+    queuedOps: [],
+    opsQueuedForModification: [],
     get: async (serverId: string) => {
       try {
         return { auth: await PyroFetch<JWTAuth>(`servers/${serverId}/fs`, {}, "fs") };
       } catch (error) {
         const fetchError =
-          error instanceof PyroServersFetchError
+          error instanceof ServersError
             ? error
-            : new PyroServersFetchError("Unknown error occurred", undefined, error as Error);
+            : new ServersError("Unknown error occurred", undefined, error as Error);
 
         return {
           auth: undefined,
@@ -1281,6 +1379,10 @@ const modules: any = {
     moveFileOrFolder,
     deleteFileOrFolder,
     downloadFile,
+    extractFile,
+    removeQueuedOp,
+    clearQueuedOps,
+    modifyOp,
   },
 };
 
@@ -1588,10 +1690,29 @@ type FSFunctions = {
    * @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: PyroServersFetchError;
+  error: ServersError;
   timestamp: number;
 };
 
@@ -1624,8 +1745,11 @@ type WSModule = JWTAuth & {
   error?: ModuleError;
 };
 
-type FSModule = {
+export type FSModule = {
   auth: JWTAuth;
+  ops: FilesystemOp[];
+  queuedOps: FSQueuedOp[];
+  opsQueuedForModification: string[];
   error?: ModuleError;
 } & FSFunctions;
 
diff --git a/apps/frontend/src/error.vue b/apps/frontend/src/error.vue
index be5cee6e..8b28f35e 100644
--- a/apps/frontend/src/error.vue
+++ b/apps/frontend/src/error.vue
@@ -5,12 +5,7 @@
         <Logo404 />
       </div>
       <div class="error-box" :class="{ 'has-bot': !is404 }">
-        <img
-          v-if="!is404"
-          src="https://cdn-raw.modrinth.com/sad-bot.webp"
-          alt="Sad Modrinth bot"
-          class="error-box__sad-bot"
-        />
+        <img v-if="!is404" :src="SadRinthbot" alt="Sad Modrinth bot" class="error-box__sad-bot" />
         <div v-if="!is404" class="error-box__top-glow" />
         <div class="error-box__body">
           <h1 class="error-box__title">{{ formatMessage(errorMessages.title) }}</h1>
@@ -55,6 +50,7 @@
 
 <script setup>
 import { defineMessage, useVIntl } from "@vintl/vintl";
+import { SadRinthbot } from "@modrinth/assets";
 import Logo404 from "~/assets/images/404.svg";
 
 const { formatMessage } = useVIntl();
@@ -272,6 +268,19 @@ const routeMessages = [
   }
 }
 
+.error-graphic {
+  margin-bottom: 2rem;
+  display: flex;
+  justify-content: center;
+
+  svg {
+    fill: var(--color-text);
+    color: var(--color-text);
+    width: min(15rem, 100%);
+    height: auto;
+  }
+}
+
 .error-box {
   background-color: var(--color-raised-bg);
   border-radius: 1.25rem;
@@ -281,105 +290,96 @@ const routeMessages = [
   gap: 1.25rem;
   box-shadow: var(--shadow-card);
   position: relative;
-}
 
-.error-box.has-bot {
-  margin-block: 120px;
-}
+  &.has-bot {
+    margin-block: 120px;
+  }
 
-.error-box p {
-  margin: 0;
-}
+  p {
+    margin: 0;
+  }
 
-.error-box a {
-  color: var(--color-brand);
-  font-weight: 600;
-}
+  a {
+    color: var(--color-brand);
+    font-weight: 600;
 
-.error-box a:hover,
-.error-box a:focus {
-  filter: brightness(1.125);
-  text-decoration: underline;
-}
+    &:hover,
+    &:focus {
+      filter: brightness(1.125);
+      text-decoration: underline;
+    }
+  }
 
-.error-graphic {
-  margin-bottom: 2rem;
-  display: flex;
-  justify-content: center;
-}
+  &__sad-bot {
+    --_bot-height: 112px;
+    position: absolute;
+    top: calc(-1 * var(--_bot-height));
+    right: 5rem;
+    width: auto;
+    height: var(--_bot-height);
 
-.error-graphic svg {
-  fill: var(--color-text);
-  color: var(--color-text);
+    @media screen and (max-width: 768px) {
+      --_bot-height: 70px;
+      right: 2rem;
+    }
+  }
 
-  width: min(15rem, 100%);
-  height: auto;
-}
+  &__top-glow {
+    width: 100%;
+    height: 1px;
+    background: linear-gradient(
+      to right,
+      transparent 2rem,
+      var(--color-green) calc(100% - 13rem),
+      var(--color-green) calc(100% - 5rem),
+      transparent calc(100% - 2rem)
+    );
+    position: absolute;
+    top: 0;
+    left: 0;
+    opacity: 0.4;
+  }
 
-.error-box__sad-bot {
-  --_bot-height: 112px;
-  position: absolute;
-  top: calc(-1 * var(--_bot-height));
-  right: 5rem;
-  width: auto;
-  height: var(--_bot-height);
-}
+  &__title {
+    font-size: 2rem;
+    font-weight: 900;
+    margin: 0;
+  }
 
-.error-box__top-glow {
-  width: 100%;
-  height: 1px;
-  background: linear-gradient(
-    to right,
-    transparent 2rem,
-    var(--color-green) calc(100% - 13rem),
-    var(--color-green) calc(100% - 5rem),
-    transparent calc(100% - 2rem)
-  );
-  position: absolute;
-  top: 0;
-  left: 0;
-  opacity: 0.4;
-}
+  &__subtitle {
+    font-size: 1.25rem;
+    font-weight: 600;
+  }
 
-.error-box__title {
-  font-size: 2rem;
-  font-weight: 900;
-  margin: 0;
-}
+  &__body {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+  }
 
-.error-box__subtitle {
-  font-size: 1.25rem;
-  font-weight: 600;
-}
+  &__list-title {
+    font-weight: 600;
+  }
 
-.error-box__body {
-  display: flex;
-  flex-direction: column;
-  gap: 0.75rem;
-}
+  &__list {
+    margin: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 0.25rem;
+    padding-left: 1.25rem;
+  }
 
-.error-box__list-title {
-  font-weight: 600;
-}
+  li {
+    line-height: 1.5;
+  }
 
-.error-box__list {
-  margin: 0;
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-  padding-left: 1.25rem;
-}
-
-.error-box li {
-  line-height: 1.5;
-}
-
-.error-box__details {
-  display: flex;
-  flex-direction: column;
-  color: var(--color-secondary);
-  gap: 0.25rem;
-  font-weight: 500;
-  font-size: 0.875rem;
+  &__details {
+    display: flex;
+    flex-direction: column;
+    color: var(--color-secondary);
+    gap: 0.25rem;
+    font-weight: 500;
+    font-size: 0.875rem;
+  }
 }
 </style>
diff --git a/apps/frontend/src/helpers/notifications.js b/apps/frontend/src/helpers/notifications.js
deleted file mode 100644
index e499e9e2..00000000
--- a/apps/frontend/src/helpers/notifications.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import { useNuxtApp } from "#imports";
-
-async function getBulk(type, ids, apiVersion = 2) {
-  if (ids.length === 0) {
-    return [];
-  }
-
-  const url = `${type}?ids=${encodeURIComponent(JSON.stringify([...new Set(ids)]))}`;
-  return await useBaseFetch(url, { apiVersion });
-}
-
-export async function fetchExtraNotificationData(notifications) {
-  const bulk = {
-    projects: [],
-    reports: [],
-    threads: [],
-    users: [],
-    versions: [],
-    organizations: [],
-  };
-
-  for (const notification of notifications) {
-    if (notification.body) {
-      if (notification.body.project_id) {
-        bulk.projects.push(notification.body.project_id);
-      }
-      if (notification.body.version_id) {
-        bulk.versions.push(notification.body.version_id);
-      }
-      if (notification.body.report_id) {
-        bulk.reports.push(notification.body.report_id);
-      }
-      if (notification.body.thread_id) {
-        bulk.threads.push(notification.body.thread_id);
-      }
-      if (notification.body.invited_by) {
-        bulk.users.push(notification.body.invited_by);
-      }
-      if (notification.body.organization_id) {
-        bulk.organizations.push(notification.body.organization_id);
-      }
-    }
-  }
-
-  const reports = await getBulk("reports", bulk.reports);
-  for (const report of reports) {
-    if (report.item_type === "project") {
-      bulk.projects.push(report.item_id);
-    } else if (report.item_type === "user") {
-      bulk.users.push(report.item_id);
-    } else if (report.item_type === "version") {
-      bulk.versions.push(report.item_id);
-    }
-  }
-  const versions = await getBulk("versions", bulk.versions);
-  for (const version of versions) {
-    bulk.projects.push(version.project_id);
-  }
-  const [projects, threads, users, organizations] = await Promise.all([
-    getBulk("projects", bulk.projects),
-    getBulk("threads", bulk.threads),
-    getBulk("users", bulk.users),
-    getBulk("organizations", bulk.organizations, 3),
-  ]);
-  for (const notification of notifications) {
-    notification.extra_data = {};
-    if (notification.body) {
-      if (notification.body.project_id) {
-        notification.extra_data.project = projects.find(
-          (x) => x.id === notification.body.project_id,
-        );
-      }
-      if (notification.body.organization_id) {
-        notification.extra_data.organization = organizations.find(
-          (x) => x.id === notification.body.organization_id,
-        );
-      }
-      if (notification.body.report_id) {
-        notification.extra_data.report = reports.find((x) => x.id === notification.body.report_id);
-
-        const type = notification.extra_data.report.item_type;
-        if (type === "project") {
-          notification.extra_data.project = projects.find(
-            (x) => x.id === notification.extra_data.report.item_id,
-          );
-        } else if (type === "user") {
-          notification.extra_data.user = users.find(
-            (x) => x.id === notification.extra_data.report.item_id,
-          );
-        } else if (type === "version") {
-          notification.extra_data.version = versions.find(
-            (x) => x.id === notification.extra_data.report.item_id,
-          );
-          notification.extra_data.project = projects.find(
-            (x) => x.id === notification.extra_data.version.project_id,
-          );
-        }
-      }
-      if (notification.body.thread_id) {
-        notification.extra_data.thread = threads.find((x) => x.id === notification.body.thread_id);
-      }
-      if (notification.body.invited_by) {
-        notification.extra_data.invited_by = users.find(
-          (x) => x.id === notification.body.invited_by,
-        );
-      }
-      if (notification.body.version_id) {
-        notification.extra_data.version = versions.find(
-          (x) => x.id === notification.body.version_id,
-        );
-      }
-    }
-  }
-  return notifications;
-}
-
-export function groupNotifications(notifications) {
-  const grouped = [];
-
-  for (let i = 0; i < notifications.length; i++) {
-    const current = notifications[i];
-    const next = notifications[i + 1];
-    if (current.body && i < notifications.length - 1 && isSimilar(current, next)) {
-      current.grouped_notifs = [next];
-
-      let j = i + 2;
-      while (j < notifications.length && isSimilar(current, notifications[j])) {
-        current.grouped_notifs.push(notifications[j]);
-        j++;
-      }
-
-      grouped.push(current);
-      i = j - 1; // skip i to the last ungrouped
-    } else {
-      grouped.push(current);
-    }
-  }
-
-  return grouped;
-}
-
-function isSimilar(notifA, notifB) {
-  return !!notifA.body.project_id && notifA.body.project_id === notifB.body.project_id;
-}
-
-export async function markAsRead(ids) {
-  try {
-    await useBaseFetch(`notifications?ids=${JSON.stringify([...new Set(ids)])}`, {
-      method: "PATCH",
-    });
-    return (notifications) => {
-      const newNotifs = notifications;
-      newNotifs.forEach((notif) => {
-        if (ids.includes(notif.id)) {
-          notif.read = true;
-        }
-      });
-      return newNotifs;
-    };
-  } catch (err) {
-    const app = useNuxtApp();
-    app.$notify({
-      group: "main",
-      title: "Error marking notification as read",
-      text: err.data ? err.data.description : err,
-      type: "error",
-    });
-    return () => {};
-  }
-}
diff --git a/apps/frontend/src/helpers/notifications.ts b/apps/frontend/src/helpers/notifications.ts
new file mode 100644
index 00000000..789a07d3
--- /dev/null
+++ b/apps/frontend/src/helpers/notifications.ts
@@ -0,0 +1,185 @@
+import { useNuxtApp } from "#imports";
+
+// TODO: There needs to be a standardized way to get these types, eg; @modrinth/types generated from api schema. Later problem.
+type Project = { id: string };
+type Version = { id: string; project_id: string };
+type Report = { id: string; item_type: "project" | "user" | "version"; item_id: string };
+type Thread = { id: string };
+type User = { id: string };
+type Organization = { id: string };
+
+export type NotificationAction = {
+  title: string;
+  action_route: [string, string];
+};
+
+export type NotificationBody = {
+  project_id?: string;
+  version_id?: string;
+  report_id?: string;
+  thread_id?: string;
+  invited_by?: string;
+  organization_id?: string;
+};
+
+export type Notification = {
+  id: string;
+  user_id: string;
+  type: "project_update" | "team_invite" | "status_change" | "moderator_message";
+  title: string;
+  text: string;
+  link: string;
+  read: boolean;
+  created: string;
+  actions: NotificationAction[];
+  body?: NotificationBody;
+  extra_data?: Record<string, unknown>;
+  grouped_notifs?: Notification[];
+};
+
+async function getBulk<T extends { id: string }>(
+  type: string,
+  ids: string[],
+  apiVersion = 2,
+): Promise<T[]> {
+  if (!ids || ids.length === 0) {
+    return [];
+  }
+  const url = `${type}?ids=${encodeURIComponent(JSON.stringify([...new Set(ids)]))}`;
+  try {
+    const res = await useBaseFetch(url, { apiVersion });
+    return Array.isArray(res) ? res : [];
+  } catch {
+    return [];
+  }
+}
+
+export async function fetchExtraNotificationData(
+  notifications: Notification[],
+): Promise<Notification[]> {
+  const bulk = {
+    projects: [] as string[],
+    reports: [] as string[],
+    threads: [] as string[],
+    users: [] as string[],
+    versions: [] as string[],
+    organizations: [] as string[],
+  };
+
+  for (const notification of notifications) {
+    if (notification.body) {
+      if (notification.body.project_id) bulk.projects.push(notification.body.project_id);
+      if (notification.body.version_id) bulk.versions.push(notification.body.version_id);
+      if (notification.body.report_id) bulk.reports.push(notification.body.report_id);
+      if (notification.body.thread_id) bulk.threads.push(notification.body.thread_id);
+      if (notification.body.invited_by) bulk.users.push(notification.body.invited_by);
+      if (notification.body.organization_id)
+        bulk.organizations.push(notification.body.organization_id);
+    }
+  }
+
+  const reports = (await getBulk<Report>("reports", bulk.reports)).filter(Boolean);
+  for (const r of reports) {
+    if (!r?.item_type) continue;
+    if (r.item_type === "project") bulk.projects.push(r.item_id);
+    else if (r.item_type === "user") bulk.users.push(r.item_id);
+    else if (r.item_type === "version") bulk.versions.push(r.item_id);
+  }
+
+  const versions = (await getBulk<Version>("versions", bulk.versions)).filter(Boolean);
+  for (const v of versions) bulk.projects.push(v.project_id);
+
+  const [projects, threads, users, organizations] = await Promise.all([
+    getBulk<Project>("projects", bulk.projects),
+    getBulk<Thread>("threads", bulk.threads),
+    getBulk<User>("users", bulk.users),
+    getBulk<Organization>("organizations", bulk.organizations, 3),
+  ]);
+
+  for (const n of notifications) {
+    n.extra_data = {};
+    if (n.body) {
+      if (n.body.project_id)
+        n.extra_data.project = projects.find((x) => x.id === n.body!.project_id);
+      if (n.body.organization_id)
+        n.extra_data.organization = organizations.find((x) => x.id === n.body!.organization_id);
+      if (n.body.report_id) {
+        n.extra_data.report = reports.find((x) => x.id === n.body!.report_id);
+        const t = (n.extra_data.report as Report | undefined)?.item_type;
+        if (t === "project")
+          n.extra_data.project = projects.find(
+            (x) => x.id === (n.extra_data?.report as Report | undefined)?.item_id,
+          );
+        else if (t === "user")
+          n.extra_data.user = users.find(
+            (x) => x.id === (n.extra_data?.report as Report | undefined)?.item_id,
+          );
+        else if (t === "version") {
+          n.extra_data.version = versions.find(
+            (x) => x.id === (n.extra_data?.report as Report | undefined)?.item_id,
+          );
+          n.extra_data.project = projects.find(
+            (x) => x.id === (n.extra_data?.version as Version | undefined)?.project_id,
+          );
+        }
+      }
+      if (n.body.thread_id) n.extra_data.thread = threads.find((x) => x.id === n.body!.thread_id);
+      if (n.body.invited_by)
+        n.extra_data.invited_by = users.find((x) => x.id === n.body!.invited_by);
+      if (n.body.version_id)
+        n.extra_data.version = versions.find((x) => x.id === n.body!.version_id);
+    }
+  }
+  return notifications;
+}
+
+export function groupNotifications(notifications: Notification[]): Notification[] {
+  const grouped: Notification[] = [];
+  for (let i = 0; i < notifications.length; i++) {
+    const current = notifications[i];
+    const next = notifications[i + 1];
+    if (current.body && i < notifications.length - 1 && isSimilar(current, next)) {
+      current.grouped_notifs = [next];
+      let j = i + 2;
+      while (j < notifications.length && isSimilar(current, notifications[j])) {
+        current.grouped_notifs.push(notifications[j]);
+        j++;
+      }
+      grouped.push(current);
+      i = j - 1;
+    } else {
+      grouped.push(current);
+    }
+  }
+  return grouped;
+}
+
+function isSimilar(a: Notification, b: Notification | undefined): boolean {
+  return !!a?.body?.project_id && a.body!.project_id === b?.body?.project_id;
+}
+
+export async function markAsRead(
+  ids: string[],
+): Promise<(notifications: Notification[]) => Notification[]> {
+  try {
+    await useBaseFetch(`notifications?ids=${JSON.stringify([...new Set(ids)])}`, {
+      method: "PATCH",
+    });
+    return (notifications: Notification[]) => {
+      const newNotifs = notifications ?? [];
+      newNotifs.forEach((n) => {
+        if (ids.includes(n.id)) n.read = true;
+      });
+      return newNotifs;
+    };
+  } catch (err: any) {
+    const app: any = useNuxtApp();
+    app.$notify({
+      group: "main",
+      title: "Error marking notification as read",
+      text: err?.data?.description ?? err,
+      type: "error",
+    });
+    return () => [];
+  }
+}
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index a387f493..e33542af 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -27,76 +27,90 @@
     </div>
   </div>
   <div ref="main_page" class="layout" :class="{ 'expanded-mobile-nav': isBrowseMenuOpen }">
-    <div
+    <PagewideBanner
       v-if="auth.user && !auth.user.email_verified && route.path !== '/auth/verify-email'"
-      class="email-nag"
+      variant="warning"
     >
-      <template v-if="auth.user.email">
-        <span>{{ formatMessage(verifyEmailBannerMessages.title) }}</span>
-        <button class="btn" @click="resendVerifyEmail">
+      <template #title>
+        <span>
+          {{
+            auth?.user?.email
+              ? formatMessage(verifyEmailBannerMessages.title)
+              : formatMessage(addEmailBannerMessages.title)
+          }}
+        </span>
+      </template>
+      <template #description>
+        <span>
+          {{
+            auth?.user?.email
+              ? formatMessage(verifyEmailBannerMessages.description)
+              : formatMessage(addEmailBannerMessages.description)
+          }}
+        </span>
+      </template>
+      <template #actions>
+        <button v-if="auth?.user?.email" class="btn" @click="resendVerifyEmail">
           {{ formatMessage(verifyEmailBannerMessages.action) }}
         </button>
-      </template>
-      <template v-else>
-        <span>{{ formatMessage(addEmailBannerMessages.title) }}</span>
-        <nuxt-link class="btn" to="/settings/account">
+        <nuxt-link v-else class="btn" to="/settings/account">
           <SettingsIcon aria-hidden="true" />
           {{ formatMessage(addEmailBannerMessages.action) }}
         </nuxt-link>
       </template>
-    </div>
-    <div
+    </PagewideBanner>
+    <PagewideBanner
       v-if="
-        user &&
-        user.subscriptions &&
         user.subscriptions.some((x) => x.status === 'payment-failed') &&
         route.path !== '/settings/billing'
       "
-      class="email-nag"
+      variant="error"
     >
-      <span>{{ formatMessage(subscriptionPaymentFailedBannerMessages.title) }}</span>
-      <nuxt-link class="btn" to="/settings/billing">
-        <SettingsIcon aria-hidden="true" />
-        {{ formatMessage(subscriptionPaymentFailedBannerMessages.action) }}
-      </nuxt-link>
-    </div>
-    <div
+      <template #title>
+        <span>{{ formatMessage(subscriptionPaymentFailedBannerMessages.title) }}</span>
+      </template>
+      <template #description>
+        <span>{{ formatMessage(subscriptionPaymentFailedBannerMessages.description) }}</span>
+      </template>
+      <template #actions>
+        <nuxt-link class="btn" to="/settings/billing">
+          <SettingsIcon aria-hidden="true" />
+          {{ formatMessage(subscriptionPaymentFailedBannerMessages.action) }}
+        </nuxt-link>
+      </template>
+    </PagewideBanner>
+    <PagewideBanner
       v-if="
         config.public.apiBaseUrl.startsWith('https://staging-api.modrinth.com') &&
         !cosmetics.hideStagingBanner
       "
-      class="site-banner site-banner--warning [&>*]:z-[6]"
+      variant="warning"
     >
-      <div class="site-banner__title">
-        <IssuesIcon aria-hidden="true" />
+      <template #title>
         <span>{{ formatMessage(stagingBannerMessages.title) }}</span>
-      </div>
-      <div class="site-banner__description">
+      </template>
+      <template #description>
         {{ formatMessage(stagingBannerMessages.description) }}
-      </div>
-      <div class="site-banner__actions">
-        <Button transparent icon-only :action="hideStagingBanner" aria-label="Close banner"
-          ><XIcon aria-hidden="true"
-        /></Button>
-      </div>
-    </div>
-    <div
-      v-if="generatedStateErrors && generatedStateErrors.length > 0"
-      class="site-banner site-banner--warning [&>*]:z-[6]"
-    >
-      <div class="site-banner__title">
-        <IssuesIcon aria-hidden="true" />
+      </template>
+      <template #actions_right>
+        <Button transparent icon-only aria-label="Close" @click="hideStagingBanner">
+          <XIcon aria-hidden="true" />
+        </Button>
+      </template>
+    </PagewideBanner>
+    <PagewideBanner v-if="generatedStateErrors?.length" variant="error">
+      <template #title>
         <span>{{ formatMessage(failedToBuildBannerMessages.title) }}</span>
-      </div>
-      <div class="site-banner__description">
+      </template>
+      <template #description>
         {{
           formatMessage(failedToBuildBannerMessages.description, {
             errors: generatedStateErrors,
             url: config.public.apiBaseUrl,
           })
         }}
-      </div>
-    </div>
+      </template>
+    </PagewideBanner>
     <header
       class="experimental-styles-within desktop-only relative z-[5] mx-auto grid max-w-[1280px] grid-cols-[1fr_auto] items-center gap-2 px-6 py-4 lg:grid-cols-[auto_1fr_auto]"
     >
@@ -692,7 +706,14 @@ import {
   GitHubIcon,
   ScaleIcon,
 } from "@modrinth/assets";
-import { Button, ButtonStyled, OverflowMenu, Avatar, commonMessages } from "@modrinth/ui";
+import {
+  Button,
+  ButtonStyled,
+  OverflowMenu,
+  PagewideBanner,
+  Avatar,
+  commonMessages,
+} from "@modrinth/ui";
 import { isAdmin, isStaff } from "@modrinth/utils";
 import { errors as generatedStateErrors } from "~/generated/state.json";
 
@@ -720,8 +741,13 @@ const basePopoutId = useId();
 
 const verifyEmailBannerMessages = defineMessages({
   title: {
-    id: "layout.banner.verify-email.title",
-    defaultMessage: "For security purposes, please verify your email address on Modrinth.",
+    id: "layout.banner.account-action",
+    defaultMessage: "Account action required",
+  },
+  description: {
+    id: "layout.banner.verify-email.description",
+    defaultMessage:
+      "For security reasons, Modrinth needs you to verify the email address associated with your account.",
   },
   action: {
     id: "layout.banner.verify-email.action",
@@ -731,8 +757,13 @@ const verifyEmailBannerMessages = defineMessages({
 
 const addEmailBannerMessages = defineMessages({
   title: {
-    id: "layout.banner.add-email.title",
-    defaultMessage: "For security purposes, please enter your email on Modrinth.",
+    id: "layout.banner.account-action",
+    defaultMessage: "Account action required",
+  },
+  description: {
+    id: "layout.banner.add-email.description",
+    defaultMessage:
+      "For security reasons, Modrinth needs you to register an email address to your account.",
   },
   action: {
     id: "layout.banner.add-email.button",
@@ -743,8 +774,12 @@ const addEmailBannerMessages = defineMessages({
 const subscriptionPaymentFailedBannerMessages = defineMessages({
   title: {
     id: "layout.banner.subscription-payment-failed.title",
+    defaultMessage: "Billing action required.",
+  },
+  description: {
+    id: "layout.banner.subscription-payment-failed.description",
     defaultMessage:
-      "Your subscription failed to renew. Please update your payment method to prevent losing access.",
+      "One or more subscriptions failed to renew. Please update your payment method to prevent losing access!",
   },
   action: {
     id: "layout.banner.subscription-payment-failed.button",
@@ -755,7 +790,7 @@ const subscriptionPaymentFailedBannerMessages = defineMessages({
 const stagingBannerMessages = defineMessages({
   title: {
     id: "layout.banner.staging.title",
-    defaultMessage: "You’re viewing Modrinth’s staging environment.",
+    defaultMessage: "You’re viewing Modrinth’s staging environment",
   },
   description: {
     id: "layout.banner.staging.description",
@@ -1052,7 +1087,6 @@ watch(
       document.body.removeAttribute("tabindex");
     }
 
-    updateCurrentDate();
     runAnalytics();
   },
 );
@@ -1348,72 +1382,6 @@ const footerLinks = [
   }
 }
 
-.email-nag {
-  z-index: 6;
-  position: relative;
-  background-color: var(--color-raised-bg);
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 1rem;
-  padding: 0.5rem 1rem;
-}
-
-.site-banner--warning {
-  // On some pages, there's gradient backgrounds that seep underneath
-  // the banner, so we need to add a solid color underlay.
-  background-color: black;
-  border-bottom: 2px solid var(--color-red);
-  display: grid;
-  gap: 0.5rem;
-  grid-template: "title actions" "description actions";
-  padding-block: var(--gap-xl);
-  padding-inline: max(calc((100% - 80rem) / 2 + var(--gap-md)), var(--gap-xl));
-  z-index: 4;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: var(--color-red-bg);
-    z-index: 5;
-  }
-
-  .site-banner__title {
-    grid-area: title;
-    display: flex;
-    gap: 0.5rem;
-    align-items: center;
-    font-weight: bold;
-    font-size: var(--font-size-md);
-    color: var(--color-contrast);
-
-    svg {
-      color: var(--color-red);
-      width: 1.5rem;
-      height: 1.5rem;
-      flex-shrink: 0;
-    }
-  }
-
-  .site-banner__description {
-    grid-area: description;
-  }
-
-  .site-banner__actions {
-    grid-area: actions;
-  }
-
-  a {
-    color: var(--color-red);
-  }
-}
-
 @media (max-width: 1200px) {
   .app-btn {
     display: none;
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 79fbaf58..5e1ecbe6 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": "Thank you for creating an account. You can now follow and create projects, receive updates about your favorite projects, and more!"
+    "message": "You’re now part of the awesome community of creators & explorers already building, downloading, and staying up-to-date with amazing 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>."
@@ -344,35 +344,38 @@
   "layout.avatar.alt": {
     "message": "Your avatar"
   },
+  "layout.banner.account-action": {
+    "message": "Account action required"
+  },
   "layout.banner.add-email.button": {
     "message": "Visit account settings"
   },
-  "layout.banner.add-email.title": {
-    "message": "For security purposes, please enter your email on Modrinth."
-  },
   "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."
   },
   "layout.banner.staging.title": {
-    "message": "You’re viewing Modrinth’s staging environment."
+    "message": "You’re viewing Modrinth’s staging environment"
   },
   "layout.banner.subscription-payment-failed.button": {
     "message": "Update billing info"
   },
   "layout.banner.subscription-payment-failed.title": {
-    "message": "Your subscription failed to renew. Please update your payment method to prevent losing access."
+    "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.verify-email.action": {
     "message": "Re-send verification email"
   },
-  "layout.banner.verify-email.title": {
-    "message": "For security purposes, please verify your email address on Modrinth."
+  "layout.banner.verify-email.description": {
+    "message": "For security reasons, Modrinth needs you to verify the email address associated with your account."
   },
   "layout.footer.about": {
     "message": "About"
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index 7f68b001..edf2660d 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -638,6 +638,7 @@
                     shown: !isMember,
                   },
                   { id: 'copy-id', action: () => copyId() },
+                  { id: 'copy-permalink', action: () => copyPermalink() },
                 ]"
                 aria-label="More options"
                 :dropdown-id="`${baseId}-more-options`"
@@ -659,6 +660,10 @@
                   <ClipboardCopyIcon aria-hidden="true" />
                   Copy ID
                 </template>
+                <template #copy-permalink>
+                  <ClipboardCopyIcon aria-hidden="true" />
+                  Copy permanent link
+                </template>
               </OverflowMenu>
             </ButtonStyled>
           </template>
@@ -866,6 +871,7 @@ import {
   ProjectSidebarDetails,
   ProjectSidebarLinks,
   ScrollablePanel,
+  useRelativeTime,
 } from "@modrinth/ui";
 import VersionSummary from "@modrinth/ui/src/components/version/VersionSummary.vue";
 import { formatCategory, isRejected, isStaff, isUnderReview, renderString } from "@modrinth/utils";
@@ -888,6 +894,7 @@ import { reportProject } from "~/utils/report-helpers.ts";
 
 const data = useNuxtApp();
 const route = useNativeRoute();
+const config = useRuntimeConfig();
 
 const auth = await useAuth();
 const user = await useUser();
@@ -1458,6 +1465,10 @@ async function copyId() {
   await navigator.clipboard.writeText(project.value.id);
 }
 
+async function copyPermalink() {
+  await navigator.clipboard.writeText(`${config.public.siteUrl}/project/${project.value.id}`);
+}
+
 const collapsedChecklist = ref(false);
 
 const showModerationChecklist = ref(false);
diff --git a/apps/frontend/src/pages/[type]/[id]/moderation.vue b/apps/frontend/src/pages/[type]/[id]/moderation.vue
index 86275b3a..4dc0e3d3 100644
--- a/apps/frontend/src/pages/[type]/[id]/moderation.vue
+++ b/apps/frontend/src/pages/[type]/[id]/moderation.vue
@@ -77,7 +77,7 @@
         This is a private conversation thread with the Modrinth moderators. They may message you
         with issues concerning this project. This thread is only checked when you submit your
         project for review. For additional inquiries, contact
-        <a href="https://support.modrinth.com">Modrinth support</a>.
+        <a href="https://support.modrinth.com">Modrinth Support</a>.
       </p>
       <ConversationThread
         v-if="thread"
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/index.vue b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
index 8312caa2..f17a36cc 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ModalConfirm
+    <ConfirmModal
       ref="modal_confirm"
       title="Are you sure you want to delete this project?"
       description="If you proceed, all versions and any attached data will be removed from our servers. This may break other projects, so be careful."
@@ -242,8 +242,8 @@
 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 ModalConfirm from "~/components/ui/ModalConfirm.vue";
 import FileInput from "~/components/ui/FileInput.vue";
 
 const props = defineProps({
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/members.vue b/apps/frontend/src/pages/[type]/[id]/settings/members.vue
index 9ccb4edd..c6f26c96 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/members.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/members.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ModalConfirm
+    <ConfirmModal
       ref="modal_remove"
       title="Are you sure you want to remove this project from the organization?"
       description="If you proceed, this project will no longer be managed by the organization."
@@ -530,8 +530,7 @@ import {
   OrganizationIcon,
   CrownIcon,
 } from "@modrinth/assets";
-import { Avatar, Badge, Card, Checkbox } from "@modrinth/ui";
-import ModalConfirm from "~/components/ui/ModalConfirm.vue";
+import { Avatar, Badge, Card, Checkbox, ConfirmModal } from "@modrinth/ui";
 import { removeSelfFromTeam } from "~/helpers/teams.js";
 
 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 fcd5f21e..b79b9b63 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -541,7 +541,6 @@
             :close-on-select="false"
             :clear-on-select="false"
             :show-labels="false"
-            :limit="6"
             :hide-selected="true"
             placeholder="Choose loaders..."
           />
@@ -566,7 +565,6 @@
               :close-on-select="false"
               :clear-on-select="false"
               :show-labels="false"
-              :limit="6"
               :hide-selected="true"
               :custom-label="(version) => version"
               placeholder="Choose versions..."
@@ -622,7 +620,7 @@
           <CopyCode :text="version.id" />
         </div>
         <div v-if="!isEditing && flags.developerMode">
-          <h4>Modrinth Maven</h4>
+          <h4>Maven coordinates</h4>
           <div class="maven-section">
             <CopyCode :text="`maven.modrinth:${project.id}:${version.id}`" />
           </div>
@@ -1555,6 +1553,10 @@ export default defineNuxtComponent({
     display: flex;
     align-items: center;
     gap: 0.5rem;
+
+    button {
+      max-width: 100%;
+    }
   }
 
   .team-member {
diff --git a/apps/frontend/src/pages/[type]/[id]/versions.vue b/apps/frontend/src/pages/[type]/[id]/versions.vue
index 1e85211d..e9cacb6f 100644
--- a/apps/frontend/src/pages/[type]/[id]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[id]/versions.vue
@@ -169,7 +169,7 @@
             </template>
             <template #copy-maven>
               <ClipboardCopyIcon aria-hidden="true" />
-              Copy Modrinth Maven
+              Copy Maven coordinates
             </template>
           </OverflowMenu>
         </ButtonStyled>
diff --git a/apps/frontend/src/pages/admin/billing/[id].vue b/apps/frontend/src/pages/admin/billing/[id].vue
index 79bbdf2a..fc2f5f11 100644
--- a/apps/frontend/src/pages/admin/billing/[id].vue
+++ b/apps/frontend/src/pages/admin/billing/[id].vue
@@ -92,7 +92,7 @@
             <div class="mb-4 mt-2 flex w-full items-center gap-1 text-sm text-secondary">
               {{ formatCategory(subscription.interval) }} ⋅ {{ subscription.status }} ⋅
               {{ dayjs(subscription.created).format("MMMM D, YYYY [at] h:mma") }} ({{
-                dayjs(subscription.created).fromNow()
+                formatRelativeTime(subscription.created)
               }})
             </div>
           </div>
@@ -151,7 +151,7 @@
                 </span>
                 <span class="text-sm text-secondary">
                   {{ dayjs(charge.due).format("MMMM D, YYYY [at] h:mma") }}
-                  <span class="text-secondary">({{ dayjs(charge.due).fromNow() }}) </span>
+                  <span class="text-secondary">({{ formatRelativeTime(charge.due) }}) </span>
                 </span>
                 <div
                   v-if="flags.developerMode"
@@ -196,7 +196,15 @@
   </div>
 </template>
 <script setup>
-import { Avatar, ButtonStyled, CopyCode, DropdownSelect, NewModal, Toggle } from "@modrinth/ui";
+import {
+  Avatar,
+  ButtonStyled,
+  CopyCode,
+  DropdownSelect,
+  NewModal,
+  Toggle,
+  useRelativeTime,
+} from "@modrinth/ui";
 import { formatCategory, formatPrice } from "@modrinth/utils";
 import {
   CheckIcon,
@@ -215,7 +223,9 @@ const flags = useFeatureFlags();
 const route = useRoute();
 const data = useNuxtApp();
 const vintl = useVIntl();
+
 const { formatMessage } = vintl;
+const formatRelativeTime = useRelativeTime();
 
 const messages = defineMessages({
   userNotFoundError: {
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index 1a919a71..392cc70a 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -156,7 +156,7 @@
             <div class="text-sm">
               <span v-if="notice.announce_at">
                 {{ dayjs(notice.announce_at).format("MMM D, YYYY [at] h:mm A") }} ({{
-                  dayjs(notice.announce_at).fromNow()
+                  formatRelativeTime(notice.announce_at)
                 }})
               </span>
               <template v-else> Never begins </template>
@@ -166,7 +166,7 @@
                 v-if="notice.expires"
                 v-tooltip="dayjs(notice.expires).format('MMMM D, YYYY [at] h:mm A')"
               >
-                {{ dayjs(notice.expires).fromNow() }}
+                {{ formatRelativeTime(notice.expires) }}
               </span>
               <template v-else> Never expires </template>
             </div>
@@ -267,6 +267,7 @@ import {
   NewModal,
   TeleportDropdownMenu,
   Toggle,
+  useRelativeTime,
 } from "@modrinth/ui";
 import { SettingsIcon, PlusIcon, SaveIcon, TrashIcon, EditIcon, XIcon } from "@modrinth/assets";
 import dayjs from "dayjs";
@@ -278,6 +279,8 @@ import { usePyroFetch } from "~/composables/pyroFetch.ts";
 import AssignNoticeModal from "~/components/ui/servers/notice/AssignNoticeModal.vue";
 
 const { formatMessage } = useVIntl();
+const formatRelativeTime = useRelativeTime();
+
 const app = useNuxtApp() as unknown as { $notify: any };
 
 const notices = ref<ServerNoticeType[]>([]);
diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue
index 01f07ba8..6aa9d716 100644
--- a/apps/frontend/src/pages/app.vue
+++ b/apps/frontend/src/pages/app.vue
@@ -19,7 +19,6 @@ import Checkbox from "~/components/ui/Checkbox.vue";
 import { homePageProjects } from "~/generated/state.json";
 
 const os = ref(null);
-const macValue = ref(null);
 const downloadWindows = ref(null);
 const downloadLinux = ref(null);
 const downloadSection = ref(null);
@@ -31,8 +30,7 @@ const linuxLinks = {
   thirdParty: "https://support.modrinth.com/en/articles/9298760",
 };
 const macLinks = {
-  appleSilicon: null,
-  intel: null,
+  universal: null,
 };
 
 let downloadLauncher;
@@ -53,8 +51,7 @@ const [{ data: launcherUpdates }] = await Promise.all([
   ),
 ]);
 
-macLinks.appleSilicon = launcherUpdates.value.platforms["darwin-aarch64"].install_urls[0];
-macLinks.intel = launcherUpdates.value.platforms["darwin-x86_64"].install_urls[0];
+macLinks.universal = launcherUpdates.value.platforms["darwin-aarch64"].install_urls[0];
 windowsLink.value = launcherUpdates.value.platforms["windows-x86_64"].install_urls[0];
 linuxLinks.appImage = launcherUpdates.value.platforms["linux-x86_64"].install_urls[1];
 linuxLinks.deb = launcherUpdates.value.platforms["linux-x86_64"].install_urls[0];
@@ -85,24 +82,6 @@ onMounted(() => {
   }
 });
 
-watch(macValue, () => {
-  if (macValue.value === "Download for Apple Silicon") {
-    const link = document.createElement("a");
-    link.href = macLinks.appleSilicon;
-    link.download = "";
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  } else if (macValue.value === "Download for Intel") {
-    const link = document.createElement("a");
-    link.href = macLinks.intel;
-    link.download = "";
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  }
-});
-
 const scrollToSection = () => {
   nextTick(() => {
     window.scrollTo({
@@ -834,13 +813,9 @@ useSeoMeta({
             Mac
           </div>
           <div class="description apple">
-            <a :href="macLinks.appleSilicon" download="">
+            <a :href="macLinks.universal" download="">
               <DownloadIcon />
-              <span> Download for Apple Silicon </span>
-            </a>
-            <a :href="macLinks.intel" download="">
-              <DownloadIcon />
-              <span> Download for Intel </span>
+              <span> Download the beta </span>
             </a>
           </div>
         </div>
diff --git a/apps/frontend/src/pages/auth/welcome.vue b/apps/frontend/src/pages/auth/welcome.vue
index 6d9d9420..ad1af120 100644
--- a/apps/frontend/src/pages/auth/welcome.vue
+++ b/apps/frontend/src/pages/auth/welcome.vue
@@ -1,10 +1,20 @@
 <template>
-  <div>
-    <h1>{{ formatMessage(messages.welcomeLongTitle) }}</h1>
+  <div class="welcome-box has-bot">
+    <img :src="WavingRinthbot" alt="Waving Modrinth Bot" class="welcome-box__waving-bot" />
+    <div class="welcome-box__top-glow" />
+    <div class="welcome-box__body">
+      <h1 class="welcome-box__title">
+        {{ formatMessage(messages.welcomeLongTitle) }}
+      </h1>
 
-    <section class="auth-form">
-      <p>
-        {{ formatMessage(messages.welcomeDescription) }}
+      <p class="welcome-box__subtitle">
+        <IntlFormatted :message-id="messages.welcomeDescription">
+          <template #bold="{ children }">
+            <strong>
+              <component :is="() => normalizeChildren(children)" />
+            </strong>
+          </template>
+        </IntlFormatted>
       </p>
 
       <Checkbox
@@ -14,11 +24,12 @@
         :description="formatMessage(messages.subscribeCheckbox)"
       />
 
-      <button class="btn btn-primary continue-btn centered-btn" @click="continueSignUp">
-        {{ formatMessage(commonMessages.continueButton) }} <RightArrowIcon />
+      <button class="btn btn-primary centered-btn" @click="continueSignUp">
+        {{ formatMessage(commonMessages.continueButton) }}
+        <RightArrowIcon />
       </button>
 
-      <p>
+      <p class="tos-text">
         <IntlFormatted :message-id="messages.tosLabel">
           <template #terms-link="{ children }">
             <NuxtLink to="/legal/terms" class="text-link">
@@ -32,12 +43,15 @@
           </template>
         </IntlFormatted>
       </p>
-    </section>
+    </div>
   </div>
 </template>
+
 <script setup>
 import { Checkbox, commonMessages } from "@modrinth/ui";
-import { RightArrowIcon } from "@modrinth/assets";
+import { RightArrowIcon, WavingRinthbot } from "@modrinth/assets";
+
+const route = useRoute();
 
 const { formatMessage } = useVIntl();
 
@@ -54,7 +68,7 @@ const messages = defineMessages({
   welcomeDescription: {
     id: "auth.welcome.description",
     defaultMessage:
-      "Thank you for creating an account. You can now follow and create projects, receive updates about your favorite projects, and more!",
+      "You’re now part of the awesome community of creators & explorers already building, downloading, and staying up-to-date with awazing mods.",
   },
   welcomeLongTitle: {
     id: "auth.welcome.long-title",
@@ -72,20 +86,18 @@ useHead({
 
 const subscribe = ref(true);
 
-async function continueSignUp() {
-  const route = useRoute();
-
+onMounted(async () => {
   await useAuth(route.query.authToken);
   await useUser();
+});
 
+async function continueSignUp() {
   if (subscribe.value) {
     try {
       await useBaseFetch("auth/email/subscribe", {
         method: "POST",
       });
-    } catch {
-      /* empty */
-    }
+    } catch {}
   }
 
   if (route.query.redirect) {
@@ -95,3 +107,84 @@ async function continueSignUp() {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.welcome-box {
+  background-color: var(--color-raised-bg);
+  border-radius: var(--size-rounded-lg);
+  padding: 1.75rem 2rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1.25rem;
+  box-shadow: var(--shadow-card);
+  position: relative;
+
+  &.has-bot {
+    margin-block: 120px;
+  }
+
+  p {
+    margin: 0;
+  }
+  a {
+    color: var(--color-brand);
+    font-weight: var(--weight-bold);
+    &:hover,
+    &:focus {
+      filter: brightness(1.125);
+      text-decoration: underline;
+    }
+  }
+
+  &__waving-bot {
+    --bot-height: 112px;
+    position: absolute;
+    top: calc(-1 * var(--bot-height));
+    right: 5rem;
+    height: var(--bot-height);
+    width: auto;
+
+    @media (max-width: 768px) {
+      --bot-height: 70px;
+      right: 2rem;
+    }
+  }
+
+  &__top-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 1px;
+    opacity: 0.4;
+    background: linear-gradient(
+      to right,
+      transparent 2rem,
+      var(--color-green) calc(100% - 13rem),
+      var(--color-green) calc(100% - 5rem),
+      transparent calc(100% - 2rem)
+    );
+  }
+
+  &__body {
+    display: flex;
+    flex-direction: column;
+    gap: 1.25rem;
+  }
+
+  &__title {
+    font-size: var(--text-32);
+    font-weight: var(--weight-extrabold);
+    margin: 0;
+  }
+
+  &__subtitle {
+    font-size: var(--text-18);
+  }
+
+  .tos-text {
+    font-size: var(--text-14);
+    line-height: 1.5;
+  }
+}
+</style>
diff --git a/apps/frontend/src/pages/collection/[id].vue b/apps/frontend/src/pages/collection/[id].vue
index 2c64dab5..97eaf32f 100644
--- a/apps/frontend/src/pages/collection/[id].vue
+++ b/apps/frontend/src/pages/collection/[id].vue
@@ -391,6 +391,7 @@ import {
   DropdownSelect,
   FileInput,
   PopoutMenu,
+  useRelativeTime,
 } from "@modrinth/ui";
 
 import { isAdmin } from "@modrinth/utils";
diff --git a/apps/frontend/src/pages/dashboard/index.vue b/apps/frontend/src/pages/dashboard/index.vue
index 5560110f..bacc6e4d 100644
--- a/apps/frontend/src/pages/dashboard/index.vue
+++ b/apps/frontend/src/pages/dashboard/index.vue
@@ -99,7 +99,7 @@
 import { ChevronRightIcon, HistoryIcon } from "@modrinth/assets";
 import Avatar from "~/components/ui/Avatar.vue";
 import NotificationItem from "~/components/ui/NotificationItem.vue";
-import { fetchExtraNotificationData, groupNotifications } from "~/helpers/notifications.js";
+import { fetchExtraNotificationData, groupNotifications } from "~/helpers/notifications.ts";
 
 useHead({
   title: "Dashboard - Modrinth",
diff --git a/apps/frontend/src/pages/dashboard/notifications.vue b/apps/frontend/src/pages/dashboard/notifications.vue
index 931b3846..cc1be438 100644
--- a/apps/frontend/src/pages/dashboard/notifications.vue
+++ b/apps/frontend/src/pages/dashboard/notifications.vue
@@ -12,7 +12,7 @@
           <h2 v-else class="text-2xl">Notifications</h2>
         </div>
         <template v-if="!history">
-          <Button v-if="hasRead" @click="updateRoute()">
+          <Button v-if="data.hasRead" @click="updateRoute()">
             <HistoryIcon />
             View history
           </Button>
@@ -60,7 +60,7 @@ import {
   fetchExtraNotificationData,
   groupNotifications,
   markAsRead,
-} from "~/helpers/notifications.js";
+} 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";
@@ -70,93 +70,69 @@ useHead({
 });
 
 const auth = await useAuth();
-
 const route = useNativeRoute();
 const router = useNativeRouter();
 
-const history = computed(() => {
-  return route.name === "dashboard-notifications-history";
-});
-
+const history = computed(() => route.name === "dashboard-notifications-history");
 const selectedType = ref("all");
 const page = ref(1);
-
 const perPage = ref(50);
 
 const { data, pending, error, refresh } = await useAsyncData(
   async () => {
     const pageNum = page.value - 1;
-
-    const notifications = await useBaseFetch(`user/${auth.value.user.id}/notifications`);
     const showRead = history.value;
-    const hasRead = notifications.some((notif) => notif.read);
+    const notifications = await useBaseFetch(`user/${auth.value.user.id}/notifications`);
 
-    const types = [
-      ...new Set(
-        notifications
-          .filter((notification) => {
-            return showRead || !notification.read;
-          })
-          .map((notification) => notification.type),
-      ),
+    const typesInFeed = [
+      ...new Set(notifications.filter((n) => showRead || !n.read).map((n) => n.type)),
     ];
 
-    const filteredNotifications = notifications.filter(
-      (notification) =>
-        (selectedType.value === "all" || notification.type === selectedType.value) &&
-        (showRead || !notification.read),
+    const filtered = notifications.filter(
+      (n) =>
+        (selectedType.value === "all" || n.type === selectedType.value) && (showRead || !n.read),
     );
-    const pages = Math.ceil(filteredNotifications.length / perPage.value);
+
+    const pages = Math.max(1, Math.ceil(filtered.length / perPage.value));
 
     return fetchExtraNotificationData(
-      filteredNotifications.slice(pageNum * perPage.value, perPage.value + pageNum * perPage.value),
-    ).then((notifications) => {
-      return {
-        notifications,
-        types: types.length > 1 ? ["all", ...types] : types,
-        pages,
-        hasRead,
-      };
-    });
+      filtered.slice(pageNum * perPage.value, pageNum * perPage.value + perPage.value),
+    ).then((notifs) => ({
+      notifications: notifs,
+      notifTypes: typesInFeed.length > 1 ? ["all", ...typesInFeed] : typesInFeed,
+      pages,
+      hasRead: notifications.some((n) => n.read),
+    }));
   },
   { watch: [page, history, selectedType] },
 );
 
-const notifications = computed(() => {
-  if (data.value === null) {
-    return [];
-  }
-  return groupNotifications(data.value.notifications, history.value);
-});
-const notifTypes = computed(() => data.value.types);
-const pages = computed(() => data.value.pages);
-const hasRead = computed(() => data.value.hasRead);
+const notifications = computed(() =>
+  data.value ? groupNotifications(data.value.notifications, history.value) : [],
+);
+
+const notifTypes = computed(() => data.value?.notifTypes || []);
+const pages = computed(() => data.value?.pages ?? 1);
 
 function updateRoute() {
-  if (history.value) {
-    router.push("/dashboard/notifications");
-  } else {
-    router.push("/dashboard/notifications/history");
-  }
+  router.push(history.value ? "/dashboard/notifications" : "/dashboard/notifications/history");
   selectedType.value = "all";
   page.value = 1;
 }
 
 async function readAll() {
-  const ids = notifications.value.flatMap((notification) => [
-    notification.id,
-    ...(notification.grouped_notifs ? notification.grouped_notifs.map((notif) => notif.id) : []),
+  const ids = notifications.value.flatMap((n) => [
+    n.id,
+    ...(n.grouped_notifs ? n.grouped_notifs.map((g) => g.id) : []),
   ]);
 
-  const updateNotifs = await markAsRead(ids);
-  allNotifs.value = updateNotifs(allNotifs.value);
+  await markAsRead(ids);
+  await refresh();
 }
 
 function changePage(newPage) {
   page.value = newPage;
-  if (import.meta.client) {
-    window.scrollTo({ top: 0, behavior: "smooth" });
-  }
+  if (import.meta.client) window.scrollTo({ top: 0, behavior: "smooth" });
 }
 </script>
 <style lang="scss" scoped>
diff --git a/apps/frontend/src/pages/frog.vue b/apps/frontend/src/pages/frog.vue
index 1c2369b2..e91b221c 100644
--- a/apps/frontend/src/pages/frog.vue
+++ b/apps/frontend/src/pages/frog.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { useRelativeTime } from "@modrinth/ui";
+
 const vintl = useVIntl();
 const { formatMessage } = vintl;
 
diff --git a/apps/frontend/src/pages/index.vue b/apps/frontend/src/pages/index.vue
index 7cbfecc0..5532ed42 100644
--- a/apps/frontend/src/pages/index.vue
+++ b/apps/frontend/src/pages/index.vue
@@ -185,7 +185,7 @@
                       <CalendarIcon aria-hidden="true" />
                       <span>
                         Received
-                        {{ fromNow(notification.date_modified) }}
+                        {{ formatRelativeTime(notification.date_modified) }}
                       </span>
                     </div>
                   </div>
@@ -527,7 +527,7 @@
 </template>
 <script setup>
 import { Multiselect } from "vue-multiselect";
-import { ButtonStyled } from "@modrinth/ui";
+import { ButtonStyled, useRelativeTime } from "@modrinth/ui";
 import {
   CompassIcon,
   LogInIcon,
@@ -544,6 +544,8 @@ import ProjectCard from "~/components/ui/ProjectCard.vue";
 
 import { homePageProjects, homePageSearch, homePageNotifs } from "~/generated/state.json";
 
+const formatRelativeTime = useRelativeTime();
+
 const searchQuery = ref("leave");
 const sortType = ref("relevance");
 
diff --git a/apps/frontend/src/pages/moderation/review.vue b/apps/frontend/src/pages/moderation/review.vue
index 5131132d..24eb15bf 100644
--- a/apps/frontend/src/pages/moderation/review.vue
+++ b/apps/frontend/src/pages/moderation/review.vue
@@ -52,10 +52,7 @@
     >
       <div class="project-title">
         <div class="mobile-row">
-          <nuxt-link
-            :to="`/${project.inferred_project_type}/${project.slug}`"
-            class="iconified-stacked-link"
-          >
+          <nuxt-link :to="`/project/${project.id}`" class="iconified-stacked-link">
             <Avatar :src="project.icon_url" size="xs" no-shadow raised />
             <span class="stacked">
               <span class="title">{{ project.name }}</span>
@@ -67,7 +64,7 @@
           by
           <nuxt-link
             v-if="project.owner"
-            :to="`/user/${project.owner.user.username}`"
+            :to="`/user/${project.owner.user.id}`"
             class="iconified-link"
           >
             <Avatar :src="project.owner.user.avatar_url" circle size="xxs" raised />
@@ -75,7 +72,7 @@
           </nuxt-link>
           <nuxt-link
             v-else-if="project.org"
-            :to="`/organization/${project.org.slug}`"
+            :to="`/organization/${project.org.id}`"
             class="iconified-link"
           >
             <Avatar :src="project.org.icon_url" circle size="xxs" raised />
@@ -88,10 +85,7 @@
         </div>
       </div>
       <div class="input-group">
-        <nuxt-link
-          :to="`/${project.inferred_project_type}/${project.slug}`"
-          class="iconified-button raised-button"
-        >
+        <nuxt-link :to="`/project/${project.id}`" class="iconified-button raised-button">
           <EyeIcon />
           View project
         </nuxt-link>
@@ -100,7 +94,7 @@
         <IssuesIcon v-if="project.age_warning" />
         Submitted
         <span v-tooltip="$dayjs(project.queued).format('MMMM D, YYYY [at] h:mm A')">{{
-          fromNow(project.queued)
+          formatRelativeTime(project.queued)
         }}</span>
       </span>
       <span v-else class="submitter-info"><UnknownIcon /> Unknown queue date</span>
@@ -109,7 +103,7 @@
 </template>
 
 <script setup>
-import { Chips } from "@modrinth/ui";
+import { Chips, useRelativeTime } from "@modrinth/ui";
 import {
   UnknownIcon,
   EyeIcon,
@@ -134,6 +128,8 @@ const now = app.$dayjs();
 const TIME_24H = 86400000;
 const TIME_48H = TIME_24H * 2;
 
+const formatRelativeTime = useRelativeTime();
+
 const { data: projects } = await useAsyncData("moderation/projects?count=1000", () =>
   useBaseFetch("moderation/projects?count=1000", { internal: true }),
 );
diff --git a/apps/frontend/src/pages/news/changelog/[product]/[date].vue b/apps/frontend/src/pages/news/changelog/[product]/[date].vue
index 39482b97..8190671a 100644
--- a/apps/frontend/src/pages/news/changelog/[product]/[date].vue
+++ b/apps/frontend/src/pages/news/changelog/[product]/[date].vue
@@ -39,13 +39,8 @@ if (!changelogEntry.value) {
     >
       <ChevronLeftIcon /> View full changelog
     </nuxt-link>
-    <Timeline fade-out-end :fade-out-start="!isFirst" :class="{ '-mt-8': !isFirst }">
-      <ChangelogEntry
-        :entry="changelogEntry"
-        :first="isFirst"
-        show-type
-        :class="{ 'mt-8': !isFirst }"
-      />
+    <Timeline fade-out-end :fade-out-start="!isFirst">
+      <ChangelogEntry :entry="changelogEntry" :first="isFirst" show-type />
     </Timeline>
   </div>
 </template>
diff --git a/apps/frontend/src/pages/organization/[id].vue b/apps/frontend/src/pages/organization/[id].vue
index 506f3b8d..c0c2ed70 100644
--- a/apps/frontend/src/pages/organization/[id].vue
+++ b/apps/frontend/src/pages/organization/[id].vue
@@ -123,6 +123,7 @@
                   },
                   { divider: true, shown: auth.user && currentMember },
                   { id: 'copy-id', action: () => copyId() },
+                  { id: 'copy-permalink', action: () => copyPermalink() },
                 ]"
                 aria-label="More options"
               >
@@ -135,6 +136,10 @@
                   <ClipboardCopyIcon aria-hidden="true" />
                   {{ formatMessage(commonMessages.copyIdButton) }}
                 </template>
+                <template #copy-permalink>
+                  <ClipboardCopyIcon aria-hidden="true" />
+                  {{ formatMessage(commonMessages.copyPermalinkButton) }}
+                </template>
               </OverflowMenu>
             </ButtonStyled>
           </template>
@@ -287,6 +292,7 @@ const cosmetics = useCosmetics();
 const route = useNativeRoute();
 const tags = useTags();
 const flags = useFeatureFlags();
+const config = useRuntimeConfig();
 
 let orgId = useRouteId();
 
@@ -502,6 +508,12 @@ const navLinks = computed(() => [
 async function copyId() {
   await navigator.clipboard.writeText(organization.value.id);
 }
+
+async function copyPermalink() {
+  await navigator.clipboard.writeText(
+    `${config.public.siteUrl}/organization/${organization.value.id}`,
+  );
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/apps/frontend/src/pages/report.vue b/apps/frontend/src/pages/report.vue
index 7ce690a2..9da7b5ec 100644
--- a/apps/frontend/src/pages/report.vue
+++ b/apps/frontend/src/pages/report.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <div class="experimental-styles-within flex flex-col gap-2">
-      <RadialHeader class="top-box mb-2 text-center" color="orange">
+      <RadialHeader class="top-box mb-2 flex flex-col items-center justify-center" color="orange">
         <ScaleIcon class="h-12 w-12 text-brand-orange" />
         <h1 class="m-3 gap-2 text-3xl font-extrabold">
           {{
diff --git a/apps/frontend/src/pages/servers/index.vue b/apps/frontend/src/pages/servers/index.vue
index 695bed55..e96a8c8f 100644
--- a/apps/frontend/src/pages/servers/index.vue
+++ b/apps/frontend/src/pages/servers/index.vue
@@ -303,7 +303,7 @@
               </svg>
               <h2 class="m-0 text-lg font-bold">Backups included</h2>
               <h3 class="m-0 text-base font-normal text-secondary">
-                Every server comes with 15 backups stored securely off-site with Backblaze.
+                Every server comes with 15 backups stored securely off-site.
               </h3>
             </div>
           </div>
@@ -399,7 +399,7 @@
               </summary>
               <p class="m-0 ml-6 leading-[160%]">
                 Modrinth Servers are powered by AMD Ryzen 7900 and 7950X3D equivalent CPUs at 5+
-                GHz, paired with with DDR5 memory.
+                GHz, paired with DDR5 memory.
               </p>
             </details>
             <details pyro-hash="cpu-burst" class="group" :open="$route.hash === '#cpu-burst'">
@@ -480,6 +480,18 @@
                 plan for the content you're running on the server.
               </p>
             </details>
+
+            <details pyro-hash="players" class="group" :open="$route.hash === '#prices'">
+              <summary class="flex cursor-pointer items-center py-3 font-medium text-contrast">
+                <span class="mr-2 transition-transform duration-200 group-open:rotate-90">
+                  <RightArrowIcon />
+                </span>
+                What currency are the prices in?
+              </summary>
+              <p class="m-0 ml-6 leading-[160%]">
+                All prices are listed in United States Dollars (USD).
+              </p>
+            </details>
           </div>
         </div>
       </div>
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 696788ce..14387c62 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -33,26 +33,7 @@
     </div>
   </div>
   <div
-    v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'support'"
-    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">We're working on your server</h1>
-        </div>
-        <p class="text-lg text-secondary">
-          You recently contacted Modrinth Support, and we're actively working on your server. It
-          will be back online shortly.
-        </p>
-      </div>
-    </div>
-  </div>
-  <div
-    v-else-if="serverData?.status === 'suspended' && serverData.suspension_reason !== 'upgrading'"
+    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">
@@ -72,7 +53,7 @@
                 : "Your server has been suspended."
           }}
           <br />
-          Contact Modrinth support if you believe this is an error.
+          Contact Modrinth Support if you believe this is an error.
         </p>
       </div>
       <ButtonStyled size="large" color="brand" @click="() => router.push('/settings/billing')">
@@ -97,7 +78,7 @@
         </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.
+          is an error, please contact Modrinth Support.
         </p>
       </div>
       <UiCopyCode :text="JSON.stringify(server.general?.error)" />
@@ -289,7 +270,7 @@
                     can change the loader by clicking the "Change Loader" button.
                   </li>
                   <li>
-                    If you're stuck, please contact Modrinth support with the information below:
+                    If you're stuck, please contact Modrinth Support with the information below:
                   </li>
                 </ul>
                 <ButtonStyled>
@@ -309,7 +290,7 @@
                 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.
+                contact Modrinth Support with your server's debug information.
               </div>
 
               <div
@@ -787,6 +768,40 @@ const handleWebSocketMessage = (data: WSEvent) => {
 
       break;
     }
+    case "filesystem-ops": {
+      if (!server.fs) {
+        console.error("FilesystemOps received, but server.fs is not available", data.all);
+        break;
+      }
+      if (JSON.stringify(server.fs.ops) !== JSON.stringify(data.all)) {
+        server.fs.ops = data.all;
+      }
+
+      server.fs.queuedOps = server.fs.queuedOps.filter(
+        (queuedOp) => !data.all.some((x) => x.src === queuedOp.src),
+      );
+
+      const cancelled = data.all.filter((x) => x.state === "cancelled");
+      Promise.all(cancelled.map((x) => server.fs?.modifyOp(x.id, "dismiss")));
+
+      const completed = data.all.filter((x) => x.state === "done");
+      if (completed.length > 0) {
+        setTimeout(
+          async () =>
+            await Promise.all(
+              completed.map((x) => {
+                if (!server.fs?.opsQueuedForModification.includes(x.id)) {
+                  server.fs?.opsQueuedForModification.push(x.id);
+                  return server.fs?.modifyOp(x.id, "dismiss");
+                }
+                return Promise.resolve();
+              }),
+            ),
+          3000,
+        );
+      }
+      break;
+    }
     default:
       console.warn("Unhandled WebSocket event:", data);
   }
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 9210cc65..906ab702 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -56,8 +56,7 @@
           </TagItem>
         </div>
         <p class="m-0">
-          You can have up to {{ data.backup_quota }} backups at once, securely off-site with
-          Backblaze.
+          You can have up to {{ data.backup_quota }} backups at once, stored securely off-site.
         </p>
       </div>
       <div
diff --git a/apps/frontend/src/pages/servers/manage/[id]/files.vue b/apps/frontend/src/pages/servers/manage/[id]/files.vue
index fa537bc7..633d29f4 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/files.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/files.vue
@@ -5,6 +5,8 @@
       :type="newItemType"
       @create="handleCreateNewItem"
     />
+    <FilesUploadZipUrlModal ref="uploadZipModal" :server="server" />
+    <FilesUploadConflictModal ref="uploadConflictModal" @proceed="extractItem" />
 
     <LazyUiServersFilesRenameItemModal
       ref="renameItemModal"
@@ -35,9 +37,12 @@
             :breadcrumb-segments="breadcrumbSegments"
             :search-query="searchQuery"
             :current-filter="viewFilter"
+            :base-id="`browse-navbar-${baseId}`"
             @navigate="navigateToSegment"
             @create="showCreateModal"
             @upload="initiateFileUpload"
+            @upload-zip="() => {}"
+            @unzip-from-url="showUnzipFromUrlModal"
             @filter="handleFilter"
             @update:search-query="searchQuery = $event"
           />
@@ -46,6 +51,110 @@
             :sort-desc="sortDesc"
             @sort="handleSort"
           />
+          <div
+            v-for="op in ops"
+            :key="`fs-op-${op.op}-${op.src}`"
+            class="sticky top-20 z-20 grid grid-cols-[auto_1fr_auto] items-center gap-2 border-0 border-b-[1px] border-solid border-button-bg bg-table-alternateRow px-4 py-2 md:grid-cols-[auto_1fr_1fr_2fr_auto]"
+          >
+            <div>
+              <PackageOpenIcon class="h-5 w-5 text-secondary" />
+            </div>
+            <div class="flex flex-wrap gap-x-4 gap-y-1 md:contents">
+              <div class="flex items-center text-wrap break-all text-sm font-bold text-contrast">
+                Extracting {{ op.src.includes("https://") ? "modpack from URL" : op.src }}
+              </div>
+              <span
+                class="flex items-center gap-2 text-sm font-semibold"
+                :class="{
+                  'text-green': op.state === 'done',
+                  'text-red': op.state?.startsWith('fail'),
+                  'text-orange': !op.state?.startsWith('fail') && op.state !== 'done',
+                }"
+              >
+                <template v-if="op.state === 'done'">
+                  Done
+                  <CheckIcon style="stroke-width: 3px" />
+                </template>
+                <template v-else-if="op.state?.startsWith('fail')">
+                  Failed
+                  <XIcon style="stroke-width: 3px" />
+                </template>
+                <template v-else-if="op.state === 'cancelled'">
+                  <SpinnerIcon class="animate-spin" />
+                  Cancelling
+                </template>
+                <template v-else-if="op.state === 'queued'">
+                  <SpinnerIcon class="animate-spin" />
+                  Queued...
+                </template>
+                <template v-else-if="op.state === 'ongoing'">
+                  <SpinnerIcon class="animate-spin" />
+                  Extracting...
+                </template>
+                <template v-else>
+                  <UnknownIcon />
+                  Unknown state: {{ op.state }}
+                </template>
+              </span>
+              <div class="col-span-2 flex grow flex-col gap-1 md:col-span-1 md:items-end">
+                <div class="text-xs font-semibold text-contrast opacity-80">
+                  <span :class="{ invisible: 'current_file' in op && !op.current_file }">
+                    {{
+                      "current_file" in op
+                        ? op.current_file?.split("/")?.pop() ?? "unknown"
+                        : "unknown"
+                    }}
+                  </span>
+                </div>
+                <ProgressBar
+                  :progress="'progress' in op ? op.progress : 0"
+                  :max="1"
+                  :color="
+                    op.state === 'done'
+                      ? 'green'
+                      : op.state?.startsWith('fail')
+                        ? 'red'
+                        : op.state === 'cancelled'
+                          ? 'gray'
+                          : 'orange'
+                  "
+                  :waiting="op.state === 'queued' || !op.progress || op.progress === 0"
+                />
+                <div
+                  class="text-xs text-secondary opacity-80"
+                  :class="{ invisible: 'bytes_processed' in op && !op.bytes_processed }"
+                >
+                  {{ "bytes_processed" in op ? formatBytes(op.bytes_processed) : "0 B" }} extracted
+                </div>
+              </div>
+            </div>
+
+            <div>
+              <ButtonStyled circular>
+                <button
+                  :disabled="!('id' in op) || !op.id"
+                  class="radial-progress-animation-overlay"
+                  :class="{ active: op.state === 'done' }"
+                  @click="
+                    () => {
+                      op.state === 'done'
+                        ? server.fs?.modifyOp(op.id, 'dismiss')
+                        : 'id' in op
+                          ? server.fs?.modifyOp(op.id, 'cancel')
+                          : () => {};
+                    }
+                  "
+                >
+                  <XIcon />
+                </button>
+              </ButtonStyled>
+            </div>
+            <pre
+              v-if="flags.advancedDebugInfo"
+              class="markdown-body col-span-full m-0 rounded-xl bg-button-bg text-xs"
+              >{{ op }}</pre
+            >
+          </div>
           <FilesUploadDropdown
             v-if="props.server.fs"
             ref="uploadDropdownRef"
@@ -55,7 +164,6 @@
             @upload-complete="refreshList()"
           />
         </div>
-
         <UiServersFilesEditingNavbar
           v-else
           :file-name="editingFile?.name"
@@ -97,10 +205,10 @@
           />
           <UiServersFilesImageViewer v-else :image-blob="imagePreview" />
         </div>
-
         <div v-else-if="items.length > 0" class="h-full w-full overflow-hidden rounded-b-2xl">
           <UiServersFileVirtualList
             :items="filteredItems"
+            @extract="handleExtractItem"
             @delete="showDeleteModal"
             @rename="showRenameModal"
             @download="downloadFile"
@@ -159,10 +267,32 @@
 
 <script setup lang="ts">
 import { useInfiniteScroll } from "@vueuse/core";
-import { UploadIcon, FolderOpenIcon } from "@modrinth/assets";
-import type { DirectoryResponse, DirectoryItem, Server } from "~/composables/pyroServers";
+import {
+  UnknownIcon,
+  XIcon,
+  SpinnerIcon,
+  PackageOpenIcon,
+  CheckIcon,
+  UploadIcon,
+  FolderOpenIcon,
+} 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 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";
+
+const flags = useFeatureFlags();
+const baseId = useId();
 
 interface BaseOperation {
   type: "move" | "rename";
@@ -217,6 +347,8 @@ const createItemModal = ref();
 const renameItemModal = ref();
 const moveItemModal = ref();
 const deleteItemModal = ref();
+const uploadZipModal = ref();
+const uploadConflictModal = ref();
 
 const newItemType = ref<"file" | "directory">("file");
 const selectedItem = ref<any>(null);
@@ -449,6 +581,33 @@ const handleRenameItem = async (newName: string) => {
   }
 };
 
+const extractItem = async (path: string) => {
+  try {
+    await props.server.fs?.extractFile(path, true, false);
+  } catch (error) {
+    console.error("Error extracting item:", error);
+    handleError(error);
+  }
+};
+
+const handleExtractItem = async (item: { name: string; type: string; path: string }) => {
+  try {
+    const dry = await props.server.fs?.extractFile(item.path, true, true, true);
+    if (dry) {
+      if (dry.conflicting_files.length === 0) {
+        await extractItem(item.path);
+      } else {
+        uploadConflictModal.value.show(item.path, dry.conflicting_files);
+      }
+    } else {
+      handleError(new Error("Error running dry run"));
+    }
+  } catch (error) {
+    console.error("Error extracting item:", error);
+    handleError(error);
+  }
+};
+
 const handleMoveItem = async (destination: string) => {
   try {
     const itemType = selectedItem.value.type;
@@ -536,6 +695,10 @@ const showCreateModal = (type: "file" | "directory") => {
   createItemModal.value?.show();
 };
 
+const showUnzipFromUrlModal = (cf: boolean) => {
+  uploadZipModal.value?.show(cf);
+};
+
 const showRenameModal = (item: any) => {
   selectedItem.value = item;
   renameItemModal.value?.show(item);
@@ -760,6 +923,8 @@ onMounted(async () => {
       redoLastOperation();
     }
   });
+
+  props.server.fs?.clearQueuedOps();
 });
 
 onUnmounted(() => {
@@ -768,6 +933,22 @@ onUnmounted(() => {
   document.removeEventListener("keydown", () => {});
 });
 
+const clientSideQueued = computed<FSQueuedOp[]>(() => props.server.fs?.queuedOps ?? []);
+
+type QueuedOpWithState = FSQueuedOp & { state: "queued" };
+
+const ops = computed<(QueuedOpWithState | FilesystemOp)[]>(() => [
+  ...clientSideQueued.value.map((x) => ({ ...x, state: "queued" }) satisfies QueuedOpWithState),
+  ...(props.server.fs?.ops ?? []),
+]);
+
+watch(
+  () => props.server.fs?.ops,
+  () => {
+    refreshList();
+  },
+);
+
 watch(
   () => route.query,
   async (newQuery) => {
@@ -984,4 +1165,43 @@ const onScroll = () => {
   transform: scale(1);
   opacity: 1;
 }
+
+.radial-progress-animation-overlay {
+  position: relative;
+}
+
+@property --_radial-percentage {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 0%;
+}
+
+.radial-progress-animation-overlay.active::before {
+  animation: radial-progress 3s linear forwards;
+}
+
+.radial-progress-animation-overlay::before {
+  content: "";
+  inset: -2px;
+  position: absolute;
+  border-radius: 50%;
+  box-sizing: content-box;
+  border: 2px solid var(--color-button-bg);
+  filter: brightness(var(--hover-brightness));
+  mask-image: conic-gradient(
+    black 0%,
+    black var(--_radial-percentage),
+    transparent var(--_radial-percentage),
+    transparent 100%
+  );
+}
+
+@keyframes radial-progress {
+  from {
+    --_radial-percentage: 0%;
+  }
+  to {
+    --_radial-percentage: 100%;
+  }
+}
 </style>
diff --git a/apps/frontend/src/pages/settings/account.vue b/apps/frontend/src/pages/settings/account.vue
index a4c535b8..10c153f3 100644
--- a/apps/frontend/src/pages/settings/account.vue
+++ b/apps/frontend/src/pages/settings/account.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ModalConfirm
+    <ConfirmModal
       ref="modal_confirm"
       title="Are you sure you want to delete your account?"
       description="This will **immediately delete all of your user data and follows**. This will not delete your projects. Deleting your account cannot be reversed.<br><br>If you need help with your account, get support on the [Modrinth Discord](https://discord.modrinth.com)."
@@ -421,6 +421,7 @@ import {
   DownloadIcon,
 } from "@modrinth/assets";
 import QrcodeVue from "qrcode.vue";
+import { ConfirmModal } from "@modrinth/ui";
 import GitHubIcon from "assets/icons/auth/sso-github.svg";
 import MicrosoftIcon from "assets/icons/auth/sso-microsoft.svg";
 import GoogleIcon from "assets/icons/auth/sso-google.svg";
@@ -428,7 +429,6 @@ import SteamIcon from "assets/icons/auth/sso-steam.svg";
 import DiscordIcon from "assets/icons/auth/sso-discord.svg";
 import KeyIcon from "assets/icons/auth/key.svg";
 import GitLabIcon from "assets/icons/auth/sso-gitlab.svg";
-import ModalConfirm from "~/components/ui/ModalConfirm.vue";
 import Modal from "~/components/ui/Modal.vue";
 
 useHead({
diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue
index 893721eb..4b3fc7a8 100644
--- a/apps/frontend/src/pages/settings/billing/index.vue
+++ b/apps/frontend/src/pages/settings/billing/index.vue
@@ -64,6 +64,21 @@
               </template>
             </span>
             <template v-if="midasCharge">
+              <span
+                v-if="
+                  midasCharge.status === 'open' && midasCharge.subscription_interval === 'monthly'
+                "
+                class="text-sm text-purple"
+              >
+                Save
+                {{
+                  formatPrice(
+                    vintl.locale,
+                    midasCharge.amount * 12 - oppositePrice,
+                    midasCharge.currency_code,
+                  )
+                }}/year by switching to yearly billing!
+              </span>
               <span class="text-sm text-secondary">
                 Since {{ $dayjs(midasSubscription.created).format("MMMM D, YYYY") }}
               </span>
@@ -118,19 +133,46 @@
               </OverflowMenu>
             </ButtonStyled>
           </div>
-          <ButtonStyled v-else-if="midasCharge && midasCharge.status !== 'cancelled'">
-            <button
-              class="ml-auto"
-              @click="
-                () => {
-                  cancelSubscriptionId = midasSubscription.id;
-                  $refs.modalCancel.show();
-                }
-              "
+          <div
+            v-else-if="midasCharge && midasCharge.status !== 'cancelled'"
+            class="ml-auto flex gap-2"
+          >
+            <ButtonStyled>
+              <button
+                :disabled="changingInterval"
+                @click="
+                  () => {
+                    cancelSubscriptionId = midasSubscription.id;
+                    $refs.modalCancel.show();
+                  }
+                "
+              >
+                <XIcon /> Cancel
+              </button>
+            </ButtonStyled>
+            <ButtonStyled
+              :color="midasCharge.subscription_interval === 'yearly' ? 'standard' : 'purple'"
+              color-fill="text"
             >
-              <XIcon /> Cancel
-            </button>
-          </ButtonStyled>
+              <button
+                v-tooltip="
+                  midasCharge.subscription_interval === 'yearly'
+                    ? `Monthly billing will cost you an additional ${formatPrice(
+                        vintl.locale,
+                        oppositePrice * 12 - midasCharge.amount,
+                        midasCharge.currency_code,
+                      )} per year`
+                    : undefined
+                "
+                :disabled="changingInterval"
+                @click="switchMidasInterval(oppositeInterval)"
+              >
+                <SpinnerIcon v-if="changingInterval" class="animate-spin" />
+                <TransferIcon v-else /> {{ changingInterval ? "Switching" : "Switch" }} to
+                {{ oppositeInterval }}
+              </button>
+            </ButtonStyled>
+          </div>
           <ButtonStyled
             v-else-if="midasCharge && midasCharge.status === 'cancelled'"
             color="purple"
@@ -178,8 +220,12 @@
               />
               <div v-else class="w-fit">
                 <p>
-                  A linked server couldn't be found with this subscription. It may have been deleted
-                  or suspended. Please contact Modrinth support with the following information:
+                  A linked server couldn't be found for this subscription. There are a few possible
+                  explanations for this. If you just purchased your server, this is normal. It could
+                  take up to an hour for your server to be provisioned. Otherwise, if you purchased
+                  this server a while ago, it has likely since been suspended. If this is not what
+                  you were expecting, please contact Modrinth Support with the following
+                  information:
                 </p>
                 <div class="flex w-full flex-col gap-2">
                   <CopyCode
@@ -288,7 +334,7 @@
                         getPyroCharge(subscription).status !== 'failed'
                       "
                     >
-                      <button @click="showPyroCancelModal(subscription.id)">
+                      <button @click="showCancellationSurvey(subscription)">
                         <XIcon />
                         Cancel
                       </button>
@@ -315,7 +361,14 @@
                       "
                       color="green"
                     >
-                      <button @click="resubscribePyro(subscription.id)">
+                      <button
+                        @click="
+                          resubscribePyro(
+                            subscription.id,
+                            $dayjs(getPyroCharge(subscription).due).isBefore($dayjs()),
+                          )
+                        "
+                      >
                         Resubscribe <RightArrowIcon />
                       </button>
                     </ButtonStyled>
@@ -547,6 +600,8 @@ import {
 } from "@modrinth/ui";
 import {
   PlusIcon,
+  TransferIcon,
+  SpinnerIcon,
   ArrowBigUpDashIcon,
   XIcon,
   CardIcon,
@@ -750,6 +805,13 @@ const midasCharge = computed(() =>
     : null,
 );
 
+const oppositePrice = computed(() =>
+  midasSubscription.value
+    ? midasProduct.value?.prices?.find((price) => price.id === midasSubscription.value.price_id)
+        ?.prices?.intervals?.[oppositeInterval.value]
+    : undefined,
+);
+
 const pyroSubscriptions = computed(() => {
   const pyroSubs = subscriptions.value?.filter((s) => s?.metadata?.type === "pyro") || [];
   const servers = serversData.value?.servers || [];
@@ -847,6 +909,31 @@ async function submit() {
 
 const removePaymentMethodIndex = ref();
 
+const changingInterval = ref(false);
+
+const oppositeInterval = computed(() =>
+  midasCharge.value?.subscription_interval === "yearly" ? "monthly" : "yearly",
+);
+
+async function switchMidasInterval(interval) {
+  changingInterval.value = true;
+  startLoading();
+  try {
+    await useBaseFetch(`billing/subscription/${midasSubscription.value.id}`, {
+      internal: true,
+      method: "PATCH",
+      body: {
+        interval,
+      },
+    });
+    await refresh();
+  } catch (error) {
+    console.error("Error switching Modrinth+ payment interval:", error);
+  }
+  stopLoading();
+  changingInterval.value = false;
+}
+
 async function editPaymentMethod(index, primary) {
   startLoading();
   try {
@@ -946,15 +1033,6 @@ const getProductPrice = (product, interval) => {
 
 const modalCancel = ref(null);
 
-const showPyroCancelModal = (subscriptionId) => {
-  cancelSubscriptionId.value = subscriptionId;
-  if (modalCancel.value) {
-    modalCancel.value.show();
-  } else {
-    console.error("modalCancel ref is undefined");
-  }
-};
-
 const pyroPurchaseModal = ref();
 const currentSubscription = ref(null);
 const currentProduct = ref(null);
@@ -1027,7 +1105,7 @@ async function fetchCapacityStatuses(serverId, product) {
   }
 }
 
-const resubscribePyro = async (subscriptionId) => {
+const resubscribePyro = async (subscriptionId, wasSuspended) => {
   try {
     await useBaseFetch(`billing/subscription/${subscriptionId}`, {
       internal: true,
@@ -1037,6 +1115,21 @@ const resubscribePyro = async (subscriptionId) => {
       },
     });
     await refresh();
+    if (wasSuspended) {
+      data.$notify({
+        group: "main",
+        title: "Resubscription request submitted",
+        text: "If the server is currently suspended, it may take up to 10 minutes for another charge attempt to be made.",
+        type: "success",
+      });
+    } else {
+      data.$notify({
+        group: "main",
+        title: "Success",
+        text: "Server subscription resubscribed successfully",
+        type: "success",
+      });
+    }
   } catch {
     data.$notify({
       group: "main",
@@ -1057,4 +1150,66 @@ const refresh = async () => {
     refreshServers(),
   ]);
 };
+
+function showCancellationSurvey(subscription) {
+  if (!subscription) {
+    console.warn("No survey notice to open");
+    return;
+  }
+
+  const product = getPyroProduct(subscription);
+  const priceObj = product?.prices?.find((x) => x.id === subscription.price_id);
+  const price = priceObj?.prices?.intervals?.[subscription.interval];
+  const currency = priceObj?.currency_code;
+
+  const popupOptions = {
+    layout: "modal",
+    width: 700,
+    autoClose: 2000,
+    hideTitle: true,
+    hiddenFields: {
+      username: auth.value?.user?.username,
+      user_id: auth.value?.user?.id,
+      user_email: auth.value?.user?.email,
+      subscription_id: subscription.id,
+      price_id: subscription.price_id,
+      interval: subscription.interval,
+      started: subscription.created,
+      plan_ram: product?.metadata.ram / 1024,
+      plan_cpu: product?.metadata.cpu,
+      price: price ? `${price / 100}` : "unknown",
+      currency: currency ?? "unknown",
+    },
+    onOpen: () => console.log(`Opened cancellation survey for: ${subscription.id}`),
+    onClose: () => console.log(`Closed cancellation survey for: ${subscription.id}`),
+    onSubmit: (payload) => {
+      console.log("Form submitted, cancelling server.", payload);
+      cancelSubscription(subscription.id, true);
+    },
+  };
+
+  const formId = "mOr7lM";
+
+  try {
+    if (window.Tally?.openPopup) {
+      console.log(
+        `Opening Tally popup for servers subscription ${subscription.id} (form ID: ${formId})`,
+      );
+      window.Tally.openPopup(formId, popupOptions);
+    } else {
+      console.warn("Tally script not yet loaded");
+    }
+  } catch (e) {
+    console.error("Error opening Tally popup:", e);
+  }
+}
+
+useHead({
+  script: [
+    {
+      src: "https://tally.so/widgets/embed.js",
+      defer: true,
+    },
+  ],
+});
 </script>
diff --git a/apps/frontend/src/pages/settings/pats.vue b/apps/frontend/src/pages/settings/pats.vue
index f7938dc0..a8f67019 100644
--- a/apps/frontend/src/pages/settings/pats.vue
+++ b/apps/frontend/src/pages/settings/pats.vue
@@ -203,7 +203,13 @@
 </template>
 <script setup>
 import { PlusIcon, XIcon, TrashIcon, EditIcon, SaveIcon } from "@modrinth/assets";
-import { Checkbox, ConfirmModal, commonSettingsMessages, commonMessages } from "@modrinth/ui";
+import {
+  Checkbox,
+  ConfirmModal,
+  commonSettingsMessages,
+  commonMessages,
+  useRelativeTime,
+} from "@modrinth/ui";
 
 import {
   hasScope,
diff --git a/apps/frontend/src/pages/settings/sessions.vue b/apps/frontend/src/pages/settings/sessions.vue
index 804256f6..8a1d161c 100644
--- a/apps/frontend/src/pages/settings/sessions.vue
+++ b/apps/frontend/src/pages/settings/sessions.vue
@@ -57,7 +57,7 @@
 </template>
 <script setup>
 import { XIcon } from "@modrinth/assets";
-import { commonMessages, commonSettingsMessages } from "@modrinth/ui";
+import { commonMessages, commonSettingsMessages, useRelativeTime } from "@modrinth/ui";
 
 definePageMeta({
   middleware: "auth",
diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue
index 204c3f74..89b859de 100644
--- a/apps/frontend/src/pages/user/[id].vue
+++ b/apps/frontend/src/pages/user/[id].vue
@@ -125,6 +125,7 @@
                     shown: auth.user?.id !== user.id,
                   },
                   { id: 'copy-id', action: () => copyId() },
+                  { id: 'copy-permalink', action: () => copyPermalink() },
                   {
                     id: 'open-billing',
                     action: () => navigateTo(`/admin/billing/${user.id}`),
@@ -151,6 +152,10 @@
                   <ClipboardCopyIcon aria-hidden="true" />
                   {{ formatMessage(commonMessages.copyIdButton) }}
                 </template>
+                <template #copy-permalink>
+                  <ClipboardCopyIcon aria-hidden="true" />
+                  {{ formatMessage(commonMessages.copyPermalinkButton) }}
+                </template>
                 <template #open-billing>
                   <CurrencyIcon aria-hidden="true" />
                   {{ formatMessage(messages.billingButton) }}
@@ -355,6 +360,7 @@ import {
   ContentPageHeader,
   commonMessages,
   NewModal,
+  useRelativeTime,
 } from "@modrinth/ui";
 import { isStaff } from "~/helpers/users.js";
 import NavTabs from "~/components/ui/NavTabs.vue";
@@ -381,6 +387,7 @@ const auth = await useAuth();
 const cosmetics = useCosmetics();
 const tags = useTags();
 const flags = useFeatureFlags();
+const config = useRuntimeConfig();
 
 const vintl = useVIntl();
 const { formatMessage } = vintl;
@@ -616,6 +623,10 @@ async function copyId() {
   await navigator.clipboard.writeText(user.value.id);
 }
 
+async function copyPermalink() {
+  await navigator.clipboard.writeText(`${config.public.siteUrl}/user/${user.value.id}`);
+}
+
 const navLinks = computed(() => [
   {
     label: formatMessage(commonMessages.allProjectType),
diff --git a/apps/frontend/src/public/Monocraft.ttf b/apps/frontend/src/public/Monocraft.ttf
deleted file mode 100644
index 4066b0a9..00000000
Binary files a/apps/frontend/src/public/Monocraft.ttf and /dev/null differ
diff --git a/apps/frontend/src/public/earth-outline.png b/apps/frontend/src/public/earth-outline.png
index fd9a7128..39bab33a 100644
Binary files a/apps/frontend/src/public/earth-outline.png and b/apps/frontend/src/public/earth-outline.png differ
diff --git a/apps/frontend/src/server/routes/loader-versions.ts b/apps/frontend/src/server/routes/loader-versions.ts
deleted file mode 100644
index 989bac2b..00000000
--- a/apps/frontend/src/server/routes/loader-versions.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-const getLoaderVersions = async (loader: string) => {
-  const loaderVersions = await fetch(
-    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/manifest.json`,
-  );
-  return loaderVersions.json();
-};
-
-const getLoaderVersion = async (loader: string, version: string) => {
-  const loaderVersion = await fetch(
-    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/versions/${version}.json`,
-  );
-  return loaderVersion.json();
-};
-
-export default defineEventHandler(async (e) => {
-  const params = new URLSearchParams(e._path?.split("?")[1] ?? "");
-  if (!params.has("loader"))
-    return new Response(
-      JSON.stringify({
-        error: "Missing loader",
-      }),
-      { status: 400, headers: { "Content-Type": "application/json" } },
-    );
-  const loader = params.get("loader");
-  const version = params.get("version");
-  if (version) {
-    const loaderVersion = await getLoaderVersion(loader!, version);
-    return new Response(JSON.stringify(loaderVersion), {
-      headers: { "Content-Type": "application/json" },
-    });
-  }
-  const loaderVersions = await getLoaderVersions(loader!);
-  return new Response(JSON.stringify(loaderVersions), {
-    headers: { "Content-Type": "application/json" },
-  });
-});
diff --git a/apps/frontend/src/types/servers.ts b/apps/frontend/src/types/servers.ts
index eb94f6bd..6131b6ac 100644
--- a/apps/frontend/src/types/servers.ts
+++ b/apps/frontend/src/types/servers.ts
@@ -224,6 +224,45 @@ export interface WSBackupProgressEvent {
   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
@@ -234,7 +273,8 @@ export type WSEvent =
   | WSAuthOkEvent
   | WSUptimeEvent
   | WSNewModEvent
-  | WSBackupProgressEvent;
+  | WSBackupProgressEvent
+  | WSFilesystemOpsEvent;
 
 export interface Servers {
   servers: Server[];
diff --git a/apps/frontend/src/utils/analytics.js b/apps/frontend/src/utils/analytics.js
index 7963ffad..bc1acaf5 100644
--- a/apps/frontend/src/utils/analytics.js
+++ b/apps/frontend/src/utils/analytics.js
@@ -262,8 +262,9 @@ export const processAnalyticsByCountry = (category, projects, sortFn) => {
 
   loadedProjectData.forEach((data) => {
     Object.entries(data).forEach(([country, value]) => {
-      const current = countrySums.get(country) || 0;
-      countrySums.set(country, current + value);
+      const countryCode = country || "XX";
+      const current = countrySums.get(countryCode) || 0;
+      countrySums.set(countryCode, current + value);
     });
   });
 
diff --git a/apps/frontend/tailwind.config.js b/apps/frontend/tailwind.config.ts
similarity index 89%
rename from apps/frontend/tailwind.config.js
rename to apps/frontend/tailwind.config.ts
index 6efbe1fb..9c9a5167 100644
--- a/apps/frontend/tailwind.config.js
+++ b/apps/frontend/tailwind.config.ts
@@ -1,5 +1,6 @@
-/** @type {import('tailwindcss').Config} */
-const config = {
+import type { Config } from "tailwindcss";
+
+const config: Config = {
   content: [
     "./src/components/**/*.{js,vue,ts}",
     "./src/layouts/**/*.vue",
@@ -36,6 +37,23 @@ const config = {
           purple: "var(--color-purple-bg)",
           raised: "var(--color-raised-bg)",
         },
+        banners: {
+          error: {
+            bg: "var(--banner-error-bg)",
+            text: "var(--banner-error-text)",
+            border: "var(--banner-error-border)",
+          },
+          warning: {
+            bg: "var(--banner-warning-bg)",
+            text: "var(--banner-warning-text)",
+            border: "var(--banner-warning-border)",
+          },
+          info: {
+            bg: "var(--banner-info-bg)",
+            text: "var(--banner-info-text)",
+            border: "var(--banner-info-border)",
+          },
+        },
         highlight: {
           DEFAULT: "var(--color-brand-highlight)",
           red: "var(--color-red-highlight)",
@@ -126,6 +144,7 @@ const config = {
       backgroundImage: {
         mazeBg: "var(--landing-maze-bg)",
         mazeGradientBg: "var(--landing-maze-gradient-bg)",
+        // @ts-ignore
         landing: {
           mazeOuterBg: "var(--landing-maze-outer-bg)",
           colorHeading: "var(--landing-color-heading)",
diff --git a/apps/labrinth/.env b/apps/labrinth/.env.example
similarity index 97%
rename from apps/labrinth/.env
rename to apps/labrinth/.env.example
index 1a335918..1fbb8eeb 100644
--- a/apps/labrinth/.env
+++ b/apps/labrinth/.env.example
@@ -84,6 +84,8 @@ HCAPTCHA_SECRET=none
 SMTP_USERNAME=none
 SMTP_PASSWORD=none
 SMTP_HOST=none
+SMTP_PORT=465
+SMTP_TLS=tls
 
 SITE_VERIFY_EMAIL_PATH=none
 SITE_RESET_PASSWORD_PATH=none
@@ -98,7 +100,7 @@ ANALYTICS_ALLOWED_ORIGINS='["http://127.0.0.1:3000", "http://localhost:3000", "h
 CLICKHOUSE_REPLICATED=false
 CLICKHOUSE_URL=http://localhost:8123
 CLICKHOUSE_USER=default
-CLICKHOUSE_PASSWORD=
+CLICKHOUSE_PASSWORD=default
 CLICKHOUSE_DATABASE=staging_ariadne
 
 MAXMIND_LICENSE_KEY=none
@@ -118,4 +120,4 @@ BREX_API_KEY=none
 DELPHI_URL=none
 DELPHI_SLACK_WEBHOOK=none
 
-ARCHON_URL=none
\ No newline at end of file
+ARCHON_URL=none
diff --git a/apps/labrinth/.sqlx/query-06bf1b34b70f5e61bf619c4d7706d07d6db413751ecab86896a708c8539e38b6.json b/apps/labrinth/.sqlx/query-0fcbb92442bdab97fd1b44a0eecb28c05a4c6d482b3fa7874902ee8e846d20b0.json
similarity index 80%
rename from apps/labrinth/.sqlx/query-06bf1b34b70f5e61bf619c4d7706d07d6db413751ecab86896a708c8539e38b6.json
rename to apps/labrinth/.sqlx/query-0fcbb92442bdab97fd1b44a0eecb28c05a4c6d482b3fa7874902ee8e846d20b0.json
index 24575023..7e43235f 100644
--- a/apps/labrinth/.sqlx/query-06bf1b34b70f5e61bf619c4d7706d07d6db413751ecab86896a708c8539e38b6.json
+++ b/apps/labrinth/.sqlx/query-0fcbb92442bdab97fd1b44a0eecb28c05a4c6d482b3fa7874902ee8e846d20b0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT tm.id, tm.team_id, tm.user_id, tm.role, tm.is_owner, tm.permissions, tm.organization_permissions, tm.accepted, tm.payouts_split, tm.ordering, v.mod_id \n            FROM versions v\n            INNER JOIN mods m ON m.id = v.mod_id\n            INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.user_id = $2 AND tm.accepted = TRUE\n            WHERE v.id = $1\n            ",
+  "query": "\n            SELECT tm.id, tm.team_id, tm.user_id, tm.role, tm.is_owner, tm.permissions, tm.organization_permissions, tm.accepted, tm.payouts_split, tm.ordering, v.mod_id\n            FROM versions v\n            INNER JOIN mods m ON m.id = v.mod_id\n            INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.user_id = $2 AND tm.accepted = TRUE\n            WHERE v.id = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -79,5 +79,5 @@
       false
     ]
   },
-  "hash": "06bf1b34b70f5e61bf619c4d7706d07d6db413751ecab86896a708c8539e38b6"
+  "hash": "0fcbb92442bdab97fd1b44a0eecb28c05a4c6d482b3fa7874902ee8e846d20b0"
 }
diff --git a/apps/labrinth/.sqlx/query-1243d13d622a9970240c8f26b5031b4c68d08607f7a0142b662b53eb05b4723a.json b/apps/labrinth/.sqlx/query-282ec0ee4a4ef739fc24af40d2c9be2a335ea9a32a1d19a450aef02f1c58334e.json
similarity index 74%
rename from apps/labrinth/.sqlx/query-1243d13d622a9970240c8f26b5031b4c68d08607f7a0142b662b53eb05b4723a.json
rename to apps/labrinth/.sqlx/query-282ec0ee4a4ef739fc24af40d2c9be2a335ea9a32a1d19a450aef02f1c58334e.json
index 0d9a9e0e..3d7252d4 100644
--- a/apps/labrinth/.sqlx/query-1243d13d622a9970240c8f26b5031b4c68d08607f7a0142b662b53eb05b4723a.json
+++ b/apps/labrinth/.sqlx/query-282ec0ee4a4ef739fc24af40d2c9be2a335ea9a32a1d19a450aef02f1c58334e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT lfe.id, lfe.enum_name, lfe.ordering, lfe.hidable \n            FROM loader_field_enums lfe\n            WHERE lfe.enum_name = $1\n            ORDER BY lfe.ordering ASC\n            ",
+  "query": "\n            SELECT lfe.id, lfe.enum_name, lfe.ordering, lfe.hidable\n            FROM loader_field_enums lfe\n            WHERE lfe.enum_name = $1\n            ORDER BY lfe.ordering ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -36,5 +36,5 @@
       false
     ]
   },
-  "hash": "1243d13d622a9970240c8f26b5031b4c68d08607f7a0142b662b53eb05b4723a"
+  "hash": "282ec0ee4a4ef739fc24af40d2c9be2a335ea9a32a1d19a450aef02f1c58334e"
 }
diff --git a/apps/labrinth/.sqlx/query-9abdd9a2018e7bfe26836dd5463ba0923ef0a76c32ca258faf55fc3301c567bf.json b/apps/labrinth/.sqlx/query-2d2cb03a63c4692080dd58f88f34ac63b20f89c9e7d6f520865133de60b9e911.json
similarity index 87%
rename from apps/labrinth/.sqlx/query-9abdd9a2018e7bfe26836dd5463ba0923ef0a76c32ca258faf55fc3301c567bf.json
rename to apps/labrinth/.sqlx/query-2d2cb03a63c4692080dd58f88f34ac63b20f89c9e7d6f520865133de60b9e911.json
index 92195b68..5bc576cd 100644
--- a/apps/labrinth/.sqlx/query-9abdd9a2018e7bfe26836dd5463ba0923ef0a76c32ca258faf55fc3301c567bf.json
+++ b/apps/labrinth/.sqlx/query-2d2cb03a63c4692080dd58f88f34ac63b20f89c9e7d6f520865133de60b9e911.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT id, team_id, role AS member_role, is_owner, permissions, organization_permissions,\n                accepted, payouts_split, role,\n                ordering, user_id\n                \n            FROM team_members\n            WHERE (team_id = $1 AND user_id = $2)\n            ORDER BY ordering\n            ",
+  "query": "\n            SELECT id, team_id, role AS member_role, is_owner, permissions, organization_permissions,\n                accepted, payouts_split, role,\n                ordering, user_id\n\n            FROM team_members\n            WHERE (team_id = $1 AND user_id = $2)\n            ORDER BY ordering\n            ",
   "describe": {
     "columns": [
       {
@@ -79,5 +79,5 @@
       false
     ]
   },
-  "hash": "9abdd9a2018e7bfe26836dd5463ba0923ef0a76c32ca258faf55fc3301c567bf"
+  "hash": "2d2cb03a63c4692080dd58f88f34ac63b20f89c9e7d6f520865133de60b9e911"
 }
diff --git a/apps/labrinth/.sqlx/query-33893ae0a7d244c33b489e4d4fa444fa17a6bb5b7a834794a5482f4dc85c6ce0.json b/apps/labrinth/.sqlx/query-33893ae0a7d244c33b489e4d4fa444fa17a6bb5b7a834794a5482f4dc85c6ce0.json
new file mode 100644
index 00000000..dbc44c23
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-33893ae0a7d244c33b489e4d4fa444fa17a6bb5b7a834794a5482f4dc85c6ce0.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE payouts\n        SET status = $1\n        WHERE status = $2 AND created < NOW() - INTERVAL '30 days'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "33893ae0a7d244c33b489e4d4fa444fa17a6bb5b7a834794a5482f4dc85c6ce0"
+}
diff --git a/apps/labrinth/.sqlx/query-46c32719ad68b667e816f58f55b5b4829bff8f0fbb039a0eda7bf08a430ba466.json b/apps/labrinth/.sqlx/query-46c32719ad68b667e816f58f55b5b4829bff8f0fbb039a0eda7bf08a430ba466.json
new file mode 100644
index 00000000..be7f9fae
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-46c32719ad68b667e816f58f55b5b4829bff8f0fbb039a0eda7bf08a430ba466.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM payouts WHERE id=$1)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "46c32719ad68b667e816f58f55b5b4829bff8f0fbb039a0eda7bf08a430ba466"
+}
diff --git a/apps/labrinth/.sqlx/query-c7c400d74c478b4194f478f6d732a92c0b9a72e1cb6147009018b2712398c24f.json b/apps/labrinth/.sqlx/query-5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763.json
similarity index 71%
rename from apps/labrinth/.sqlx/query-c7c400d74c478b4194f478f6d732a92c0b9a72e1cb6147009018b2712398c24f.json
rename to apps/labrinth/.sqlx/query-5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763.json
index 4e4a0ac6..53b08532 100644
--- a/apps/labrinth/.sqlx/query-c7c400d74c478b4194f478f6d732a92c0b9a72e1cb6147009018b2712398c24f.json
+++ b/apps/labrinth/.sqlx/query-5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763.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.updated updated, 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                    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": [
       {
@@ -50,91 +50,86 @@
       },
       {
         "ordinal": 9,
-        "name": "updated",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 10,
         "name": "approved",
         "type_info": "Timestamptz"
       },
       {
-        "ordinal": 11,
+        "ordinal": 10,
         "name": "queued",
         "type_info": "Timestamptz"
       },
       {
-        "ordinal": 12,
+        "ordinal": 11,
         "name": "status",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 13,
+        "ordinal": 12,
         "name": "requested_status",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 14,
+        "ordinal": 13,
         "name": "license_url",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 15,
+        "ordinal": 14,
         "name": "team_id",
         "type_info": "Int8"
       },
       {
-        "ordinal": 16,
+        "ordinal": 15,
         "name": "organization_id",
         "type_info": "Int8"
       },
       {
-        "ordinal": 17,
+        "ordinal": 16,
         "name": "license",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 18,
+        "ordinal": 17,
         "name": "slug",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 19,
+        "ordinal": 18,
         "name": "moderation_message",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 20,
+        "ordinal": 19,
         "name": "moderation_message_body",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 21,
+        "ordinal": 20,
         "name": "webhook_sent",
         "type_info": "Bool"
       },
       {
-        "ordinal": 22,
+        "ordinal": 21,
         "name": "color",
         "type_info": "Int4"
       },
       {
-        "ordinal": 23,
+        "ordinal": 22,
         "name": "thread_id",
         "type_info": "Int8"
       },
       {
-        "ordinal": 24,
+        "ordinal": 23,
         "name": "monetization_status",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 25,
+        "ordinal": 24,
         "name": "categories",
         "type_info": "VarcharArray"
       },
       {
-        "ordinal": 26,
+        "ordinal": 25,
         "name": "additional_categories",
         "type_info": "VarcharArray"
       }
@@ -155,7 +150,6 @@
       true,
       false,
       false,
-      false,
       true,
       true,
       false,
@@ -175,5 +169,5 @@
       null
     ]
   },
-  "hash": "c7c400d74c478b4194f478f6d732a92c0b9a72e1cb6147009018b2712398c24f"
+  "hash": "5f75c0c48083de27f853ee877aac070567fd2ed2be4a9a038821b790dd7cb763"
 }
diff --git a/apps/labrinth/.sqlx/query-a3448f22ec82f75ab2f3769b7d0a653a7d7315fb5e4696c26c6a96e6fc11e907.json b/apps/labrinth/.sqlx/query-a3448f22ec82f75ab2f3769b7d0a653a7d7315fb5e4696c26c6a96e6fc11e907.json
deleted file mode 100644
index d1a96415..00000000
--- a/apps/labrinth/.sqlx/query-a3448f22ec82f75ab2f3769b7d0a653a7d7315fb5e4696c26c6a96e6fc11e907.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT m.id FROM organizations o\n        INNER JOIN mods m ON m.organization_id = o.id\n        WHERE (o.id = $1 AND $1 IS NOT NULL) OR (o.slug = $2 AND $2 IS NOT NULL)\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "a3448f22ec82f75ab2f3769b7d0a653a7d7315fb5e4696c26c6a96e6fc11e907"
-}
diff --git a/apps/labrinth/.sqlx/query-a3e25b24e1364fb6cecd33797923b24948050c0974bc267d938f05c893beed00.json b/apps/labrinth/.sqlx/query-a3e25b24e1364fb6cecd33797923b24948050c0974bc267d938f05c893beed00.json
new file mode 100644
index 00000000..d25a766b
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-a3e25b24e1364fb6cecd33797923b24948050c0974bc267d938f05c893beed00.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT m.id FROM organizations o\n            INNER JOIN mods m ON m.organization_id = o.id\n            WHERE o.id = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "a3e25b24e1364fb6cecd33797923b24948050c0974bc267d938f05c893beed00"
+}
diff --git a/apps/labrinth/.sqlx/query-061a3e43df9464263aaf1555a27c1f4b6a0f381282f4fa75cc13b1d354857578.json b/apps/labrinth/.sqlx/query-a91d793778d92844cfe338007e8f25daca0d711e0569b99f14d820ddb1685405.json
similarity index 57%
rename from apps/labrinth/.sqlx/query-061a3e43df9464263aaf1555a27c1f4b6a0f381282f4fa75cc13b1d354857578.json
rename to apps/labrinth/.sqlx/query-a91d793778d92844cfe338007e8f25daca0d711e0569b99f14d820ddb1685405.json
index 5cc54d4d..0043efd9 100644
--- a/apps/labrinth/.sqlx/query-061a3e43df9464263aaf1555a27c1f4b6a0f381282f4fa75cc13b1d354857578.json
+++ b/apps/labrinth/.sqlx/query-a91d793778d92844cfe338007e8f25daca0d711e0569b99f14d820ddb1685405.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT m.id AS pid, NULL AS oid\n            FROM mods m\n            WHERE m.team_id = $1\n            \n            UNION ALL\n             \n            SELECT NULL AS pid, o.id AS oid\n            FROM organizations o\n            WHERE o.team_id = $1    \n            ",
+  "query": "\n            SELECT m.id AS pid, NULL AS oid\n            FROM mods m\n            WHERE m.team_id = $1\n\n            UNION ALL\n\n            SELECT NULL AS pid, o.id AS oid\n            FROM organizations o\n            WHERE o.team_id = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       null
     ]
   },
-  "hash": "061a3e43df9464263aaf1555a27c1f4b6a0f381282f4fa75cc13b1d354857578"
+  "hash": "a91d793778d92844cfe338007e8f25daca0d711e0569b99f14d820ddb1685405"
 }
diff --git a/apps/labrinth/.sqlx/query-cdb2f18f826097f0f17a1f7295d7c45eb1987b63c1a21666c6ca60c52217ba4d.json b/apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json
similarity index 65%
rename from apps/labrinth/.sqlx/query-cdb2f18f826097f0f17a1f7295d7c45eb1987b63c1a21666c6ca60c52217ba4d.json
rename to apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json
index e7f4eb17..340549e5 100644
--- a/apps/labrinth/.sqlx/query-cdb2f18f826097f0f17a1f7295d7c45eb1987b63c1a21666c6ca60c52217ba4d.json
+++ b/apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT l.id id, l.loader loader, l.icon icon, l.metadata metadata,\n            ARRAY_AGG(DISTINCT pt.name) filter (where pt.name is not null) project_types,\n            ARRAY_AGG(DISTINCT g.slug) filter (where g.slug is not null) games\n            FROM loaders l            \n            LEFT OUTER JOIN loaders_project_types lpt ON joining_loader_id = l.id\n            LEFT OUTER JOIN project_types pt ON lpt.joining_project_type_id = pt.id\n            LEFT OUTER JOIN loaders_project_types_games lptg ON lptg.loader_id = lpt.joining_loader_id AND lptg.project_type_id = lpt.joining_project_type_id\n            LEFT OUTER JOIN games g ON lptg.game_id = g.id\n            GROUP BY l.id;\n            ",
+  "query": "\n            SELECT l.id id, l.loader loader, l.icon icon, l.metadata metadata,\n            ARRAY_AGG(DISTINCT pt.name) filter (where pt.name is not null) project_types,\n            ARRAY_AGG(DISTINCT g.slug) filter (where g.slug is not null) games\n            FROM loaders l\n            LEFT OUTER JOIN loaders_project_types lpt ON joining_loader_id = l.id\n            LEFT OUTER JOIN project_types pt ON lpt.joining_project_type_id = pt.id\n            LEFT OUTER JOIN loaders_project_types_games lptg ON lptg.loader_id = lpt.joining_loader_id AND lptg.project_type_id = lpt.joining_project_type_id\n            LEFT OUTER JOIN games g ON lptg.game_id = g.id\n            GROUP BY l.id;\n            ",
   "describe": {
     "columns": [
       {
@@ -46,5 +46,5 @@
       null
     ]
   },
-  "hash": "cdb2f18f826097f0f17a1f7295d7c45eb1987b63c1a21666c6ca60c52217ba4d"
+  "hash": "ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9"
 }
diff --git a/apps/labrinth/.sqlx/query-d4d17b6a06c2f607206373b18a1f4c367f03f076e5e264ec8f5e744877c6d362.json b/apps/labrinth/.sqlx/query-d4d17b6a06c2f607206373b18a1f4c367f03f076e5e264ec8f5e744877c6d362.json
new file mode 100644
index 00000000..677dd811
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-d4d17b6a06c2f607206373b18a1f4c367f03f076e5e264ec8f5e744877c6d362.json
@@ -0,0 +1,106 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n                charge_type, subscription_id,\n                -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n                subscription_interval AS \"subscription_interval?\",\n                payment_platform,\n                payment_platform_id AS \"payment_platform_id?\",\n                parent_charge_id AS \"parent_charge_id?\",\n                net AS \"net?\"\n            FROM charges\n            \n            WHERE\n                charge_type = $1 AND\n                status = 'failed' AND due < NOW() - INTERVAL '30 days'\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "user_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "price_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "amount",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 4,
+        "name": "currency_code",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 5,
+        "name": "status",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "due",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 7,
+        "name": "last_attempt",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 8,
+        "name": "charge_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 9,
+        "name": "subscription_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 10,
+        "name": "subscription_interval?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 11,
+        "name": "payment_platform",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 12,
+        "name": "payment_platform_id?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 13,
+        "name": "parent_charge_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 14,
+        "name": "net?",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "d4d17b6a06c2f607206373b18a1f4c367f03f076e5e264ec8f5e744877c6d362"
+}
diff --git a/apps/labrinth/.sqlx/query-8d7746fedec4c2339352a3acd934b13c351b8a1fdb05bf982bab1a5b7ed17f3b.json b/apps/labrinth/.sqlx/query-e5c4275ebfa60938505ef8b32b54efa569c6b516b547faec9a10943ddef6266e.json
similarity index 53%
rename from apps/labrinth/.sqlx/query-8d7746fedec4c2339352a3acd934b13c351b8a1fdb05bf982bab1a5b7ed17f3b.json
rename to apps/labrinth/.sqlx/query-e5c4275ebfa60938505ef8b32b54efa569c6b516b547faec9a10943ddef6266e.json
index d621218c..dabf2562 100644
--- a/apps/labrinth/.sqlx/query-8d7746fedec4c2339352a3acd934b13c351b8a1fdb05bf982bab1a5b7ed17f3b.json
+++ b/apps/labrinth/.sqlx/query-e5c4275ebfa60938505ef8b32b54efa569c6b516b547faec9a10943ddef6266e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO collections (\n                id, user_id, name, description, \n                created, icon_url, raw_icon_url, status\n            )\n            VALUES (\n                $1, $2, $3, $4, \n                $5, $6, $7, $8\n            )\n            ",
+  "query": "\n            INSERT INTO collections (\n                id, user_id, name, description,\n                created, icon_url, raw_icon_url, status\n            )\n            VALUES (\n                $1, $2, $3, $4,\n                $5, $6, $7, $8\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -17,5 +17,5 @@
     },
     "nullable": []
   },
-  "hash": "8d7746fedec4c2339352a3acd934b13c351b8a1fdb05bf982bab1a5b7ed17f3b"
+  "hash": "e5c4275ebfa60938505ef8b32b54efa569c6b516b547faec9a10943ddef6266e"
 }
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 663f0ab2..53f30a27 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 = "2018"
+edition = "2024"
 license = "AGPL-3.0"
 
 # This seems redundant, but it's necessary for Docker to work
@@ -11,73 +11,73 @@ name = "labrinth"
 path = "src/main.rs"
 
 [dependencies]
-actix-web = "4.4.1"
-actix-rt = "2.9.0"
-actix-multipart = "0.6.1"
-actix-cors = "0.7.0"
-actix-ws = "0.3.0"
-actix-files = "0.6.5"
-prometheus = "0.13.4"
-actix-web-prom = { version = "0.9.0", features = ["process"] }
+actix-web.workspace = true
+actix-rt.workspace = true
+actix-multipart.workspace = true
+actix-cors.workspace = true
+actix-ws.workspace = true
+actix-files.workspace = true
+prometheus.workspace = true
+actix-web-prom = { workspace = true, features = ["process"] }
 
-tracing = "0.1.41"
-tracing-actix-web = "0.7.16"
-console-subscriber = "0.4.1"
+tracing.workspace = true
+tracing-actix-web.workspace = true
+console-subscriber.workspace = true
 
-tokio = { version = "1.35.1", features = ["sync", "rt-multi-thread"] }
-tokio-stream = "0.1.14"
+tokio = { workspace = true, features = ["sync", "rt-multi-thread"] }
+tokio-stream.workspace = true
 
-futures = "0.3.30"
-futures-util = "0.3.30"
-async-trait = "0.1.70"
-dashmap = "5.4.0"
-lazy_static = "1.4.0"
+futures.workspace = true
+futures-util.workspace = true
+async-trait.workspace = true
+dashmap.workspace = true
+paste.workspace = true
 
-meilisearch-sdk = "0.27.1"
-rust-s3 = "0.33.0"
-reqwest = { version = "0.11.18", features = ["json", "multipart"] }
-hyper = { version = "0.14", features = ["full"] }
-hyper-tls = "0.5.0"
+meilisearch-sdk = { workspace = true, features = ["reqwest"] }
+rust-s3.workspace = true
+reqwest = { workspace = true, features = ["http2", "rustls-tls-webpki-roots", "json", "multipart"] }
+hyper-tls.workspace = true
+hyper-util.workspace = true
 
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde_with = "3.0.0"
-chrono = { version = "0.4.26", features = ["serde"] }
-yaserde = "0.12.0"
-yaserde_derive = "0.12.0"
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+serde_with.workspace = true
+chrono = { workspace = true, features = ["serde"] }
+yaserde = { workspace = true, features = ["derive"] }
 
-rand = "0.8.5"
-rand_chacha = "0.3.1"
-bytes = "1.4.0"
-base64 = "0.21.7"
-sha1 = { version = "0.6.1", features = ["std"] }
-sha2 = "0.9.9"
-hmac = "0.11.0"
-argon2 = { version = "0.5.0", features = ["std"] }
-murmur2 = "0.1.0"
-bitflags = "2.4.0"
-hex = "0.4.3"
-zxcvbn = "2.2.2"
-totp-rs = { version = "5.0.2", features = ["gen_secret"] }
+rand.workspace = true
+rand_chacha.workspace = true
+bytes.workspace = true
+base64.workspace = true
+sha1.workspace = true
+sha2.workspace = true
+hmac.workspace = true
+argon2.workspace = true
+murmur2.workspace = true
+bitflags.workspace = true
+hex.workspace = true
+zxcvbn.workspace = true
+totp-rs = { workspace = true, features = ["gen_secret"] }
 
-url = "2.4.0"
-urlencoding = "2.1.2"
+url.workspace = true
+urlencoding.workspace = true
 
-zip = "0.6.6"
+zip.workspace = true
 
-itertools = "0.12.0"
+itertools.workspace = true
 
-validator = { version = "0.16.1", features = ["derive", "phone"] }
-regex = "1.10.2"
-censor = "0.3.0"
-spdx = { version = "0.10.3", features = ["text"] }
+validator = { workspace = true, features = ["derive"] }
+regex.workspace = true
+censor.workspace = true
+spdx = { workspace = true, features = ["text"] }
 
-dotenvy = "0.15.7"
-thiserror = "1.0.56"
-either = "1.13"
+dotenvy.workspace = true
+thiserror.workspace = true
+either.workspace = true
 
-sqlx = { version = "0.8.2", features = [
-    "runtime-tokio-rustls",
+sqlx = { workspace = true, features = [
+    "runtime-tokio",
+    "tls-rustls-ring",
     "postgres",
     "chrono",
     "macros",
@@ -85,58 +85,49 @@ sqlx = { version = "0.8.2", features = [
     "rust_decimal",
     "json",
 ] }
-rust_decimal = { version = "1.33.1", features = [
+rust_decimal = { workspace = true, features = [
     "serde-with-float",
     "serde-with-str",
 ] }
-redis = { version = "0.27.5", features = ["tokio-comp", "ahash", "r2d2"] }
-deadpool-redis = "0.18.0"
-clickhouse = { version = "0.11.2", features = ["uuid", "time"] }
-uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] }
+redis = { workspace = true, features = ["tokio-comp", "ahash", "r2d2"] }
+deadpool-redis.workspace = true
+clickhouse = { workspace = true, features = ["uuid", "time"] }
+uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
 
-maxminddb = "0.24.0"
-flate2 = "1.0.25"
-tar = "0.4.38"
+maxminddb.workspace = true
+flate2.workspace = true
+tar.workspace = true
 
-sentry = { version = "0.34.0", default-features = false, features = [
-    "backtrace",
-    "contexts",
-    "debug-images",
-    "panic",
-    "rustls",
-    "reqwest",
-] }
-sentry-actix = "0.34.0"
+sentry.workspace = true
+sentry-actix.workspace = true
 
-image = "0.24.6"
-color-thief = "0.2.2"
-webp = "0.3.0"
+image = { workspace = true, features = ["avif", "bmp", "dds", "exr", "ff", "gif", "hdr", "ico", "jpeg", "png", "pnm", "qoi", "tga", "tiff", "webp"] }
+color-thief.workspace = true
+webp.workspace = true
 
-woothee = "0.13.0"
+woothee.workspace = true
 
-lettre = "0.11.3"
+lettre.workspace = true
 
-derive-new = "0.6.0"
-rust_iso3166 = "0.1.11"
+rust_iso3166.workspace = true
 
-async-stripe = { version = "0.39.1", features = ["runtime-tokio-hyper-rustls"] }
-rusty-money = "0.4.1"
-json-patch = "*"
+async-stripe = { workspace = true, features = ["billing", "checkout", "connect", "webhook-events"] }
+rusty-money.workspace = true
+json-patch.workspace = true
 
-ariadne = { path = "../../packages/ariadne" }
+ariadne.workspace = true
 
-clap = { version = "4.5", features = ["derive"] }
-iana-time-zone = "0.1.61"
+clap = { workspace = true, features = ["derive"] }
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemallocator = { version = "0.6.0", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
-tikv-jemalloc-ctl = { version = "0.6.0", features = ["stats"] }
-jemalloc_pprof = { version = "0.7.0", features = ["flamegraph"] }
+[target.'cfg(target_os = "linux")'.dependencies]
+tikv-jemallocator = { workspace = true, features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
+tikv-jemalloc-ctl = { workspace = true, features = ["stats"] }
+jemalloc_pprof = { workspace = true, features = ["flamegraph"] }
 
 [dev-dependencies]
-actix-http = "3.4.0"
+actix-http.workspace = true
 
 [build-dependencies]
-dotenv-build = "0.1.1"
-chrono = "0.4.38"
-iana-time-zone = "0.1.60"
+dotenv-build.workspace = true
+chrono.workspace = true
+iana-time-zone.workspace = true
diff --git a/apps/labrinth/Dockerfile b/apps/labrinth/Dockerfile
index 688b3492..8ed142c9 100644
--- a/apps/labrinth/Dockerfile
+++ b/apps/labrinth/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.84.0 as build
+FROM rust:1.86.0 AS build
 ENV PKG_CONFIG_ALLOW_CROSS=1
 
 WORKDIR /usr/src/labrinth
diff --git a/apps/labrinth/migrations/20240115052708_base62-helper-functions.sql b/apps/labrinth/migrations/20240115052708_base62-helper-functions.sql
new file mode 100644
index 00000000..02dcec1c
--- /dev/null
+++ b/apps/labrinth/migrations/20240115052708_base62-helper-functions.sql
@@ -0,0 +1,40 @@
+CREATE OR REPLACE FUNCTION from_base62(input VARCHAR)
+RETURNS BIGINT AS $$
+DECLARE
+    base INT := 62;
+    chars VARCHAR := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+    result BIGINT := 0;
+    i INT;
+    char VARCHAR;
+    index INT;
+BEGIN
+    FOR i IN 1..LENGTH(input) LOOP
+        char := SUBSTRING(input FROM i FOR 1);
+        index := POSITION(char IN chars) - 1;
+        IF index < 0 THEN
+            RAISE EXCEPTION 'Error: Invalid character in input string';
+        END IF;
+        result := result * base + index;
+    END LOOP;
+
+    RETURN result;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION to_base62(input BIGINT)
+RETURNS VARCHAR AS $$
+DECLARE
+    base INT := 62;
+    chars VARCHAR := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+    result VARCHAR := '';
+    remainder INT;
+BEGIN
+    WHILE input > 0 LOOP
+        remainder := input % base;
+        result := SUBSTRING(chars FROM remainder + 1 FOR 1) || result;
+        input := input / base;
+    END LOOP;
+
+    RETURN result;
+END;
+$$ LANGUAGE plpgsql;
diff --git a/apps/labrinth/src/auth/checks.rs b/apps/labrinth/src/auth/checks.rs
index 34a61296..07c6e436 100644
--- a/apps/labrinth/src/auth/checks.rs
+++ b/apps/labrinth/src/auth/checks.rs
@@ -1,9 +1,9 @@
 use crate::database;
-use crate::database::models::project_item::QueryProject;
-use crate::database::models::version_item::QueryVersion;
-use crate::database::models::Collection;
+use crate::database::models::DBCollection;
+use crate::database::models::project_item::ProjectQueryResult;
+use crate::database::models::version_item::VersionQueryResult;
 use crate::database::redis::RedisPool;
-use crate::database::{models, Project, Version};
+use crate::database::{DBProject, DBVersion, models};
 use crate::models::users::User;
 use crate::routes::ApiError;
 use itertools::Itertools;
@@ -38,7 +38,7 @@ where
 }
 
 pub async fn is_visible_project(
-    project_data: &Project,
+    project_data: &DBProject,
     user_option: &Option<User>,
     pool: &PgPool,
     hide_unlisted: bool,
@@ -54,7 +54,7 @@ pub async fn is_visible_project(
 }
 
 pub async fn is_team_member_project(
-    project_data: &Project,
+    project_data: &DBProject,
     user_option: &Option<User>,
     pool: &PgPool,
 ) -> Result<bool, ApiError> {
@@ -64,7 +64,7 @@ pub async fn is_team_member_project(
 }
 
 pub async fn filter_visible_projects(
-    mut projects: Vec<QueryProject>,
+    mut projects: Vec<ProjectQueryResult>,
     user_option: &Option<User>,
     pool: &PgPool,
     hide_unlisted: bool,
@@ -86,11 +86,11 @@ pub async fn filter_visible_projects(
 // - the user is a mod
 // This is essentially whether you can know of the project's existence
 pub async fn filter_visible_project_ids(
-    projects: Vec<&Project>,
+    projects: Vec<&DBProject>,
     user_option: &Option<User>,
     pool: &PgPool,
     hide_unlisted: bool,
-) -> Result<Vec<crate::database::models::ProjectId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBProjectId>, ApiError> {
     let mut return_projects = Vec::new();
     let mut check_projects = Vec::new();
 
@@ -126,14 +126,14 @@ pub async fn filter_visible_project_ids(
 // These are projects we have internal access to and can potentially see even if they are hidden
 // This is useful for getting visibility of versions, or seeing analytics or sensitive team-restricted data of a project
 pub async fn filter_enlisted_projects_ids(
-    projects: Vec<&Project>,
+    projects: Vec<&DBProject>,
     user_option: &Option<User>,
     pool: &PgPool,
-) -> Result<Vec<crate::database::models::ProjectId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBProjectId>, ApiError> {
     let mut return_projects = vec![];
 
     if let Some(user) = user_option {
-        let user_id: models::ids::UserId = user.id.into();
+        let user_id: models::ids::DBUserId = user.id.into();
 
         use futures::TryStreamExt;
 
@@ -154,7 +154,7 @@ pub async fn filter_enlisted_projects_ids(
                 .iter()
                 .filter_map(|x| x.organization_id.map(|x| x.0))
                 .collect::<Vec<_>>(),
-            user_id as database::models::ids::UserId,
+            user_id as database::models::ids::DBUserId,
         )
         .fetch(pool)
         .map_ok(|row| {
@@ -173,7 +173,7 @@ pub async fn filter_enlisted_projects_ids(
 }
 
 pub async fn is_visible_version(
-    version_data: &Version,
+    version_data: &DBVersion,
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
@@ -184,7 +184,7 @@ pub async fn is_visible_version(
 }
 
 pub async fn is_team_member_version(
-    version_data: &Version,
+    version_data: &DBVersion,
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
@@ -195,7 +195,7 @@ pub async fn is_team_member_version(
 }
 
 pub async fn filter_visible_versions(
-    mut versions: Vec<QueryVersion>,
+    mut versions: Vec<VersionQueryResult>,
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
@@ -211,7 +211,7 @@ pub async fn filter_visible_versions(
     Ok(versions.into_iter().map(|x| x.into()).collect())
 }
 
-impl ValidateAuthorized for models::OAuthClient {
+impl ValidateAuthorized for models::DBOAuthClient {
     fn validate_authorized(
         &self,
         user_option: Option<&User>,
@@ -232,11 +232,11 @@ impl ValidateAuthorized for models::OAuthClient {
 }
 
 pub async fn filter_visible_version_ids(
-    versions: Vec<&Version>,
+    versions: Vec<&DBVersion>,
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
-) -> Result<Vec<crate::database::models::VersionId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBVersionId>, ApiError> {
     let mut return_versions = Vec::new();
     let mut check_versions = Vec::new();
 
@@ -247,7 +247,7 @@ pub async fn filter_visible_version_ids(
 
     // Get visible projects- ones we are allowed to see public versions for.
     let visible_project_ids = filter_visible_project_ids(
-        Project::get_many_ids(&project_ids, pool, redis)
+        DBProject::get_many_ids(&project_ids, pool, redis)
             .await?
             .iter()
             .map(|x| &x.inner)
@@ -287,11 +287,11 @@ pub async fn filter_visible_version_ids(
 }
 
 pub async fn filter_enlisted_version_ids(
-    versions: Vec<&Version>,
+    versions: Vec<&DBVersion>,
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
-) -> Result<Vec<crate::database::models::VersionId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBVersionId>, ApiError> {
     let mut return_versions = Vec::new();
 
     // Get project ids of versions
@@ -299,7 +299,7 @@ pub async fn filter_enlisted_version_ids(
 
     // Get enlisted projects- ones we are allowed to see hidden versions for.
     let authorized_project_ids = filter_enlisted_projects_ids(
-        Project::get_many_ids(&project_ids, pool, redis)
+        DBProject::get_many_ids(&project_ids, pool, redis)
             .await?
             .iter()
             .map(|x| &x.inner)
@@ -325,7 +325,7 @@ pub async fn filter_enlisted_version_ids(
 }
 
 pub async fn is_visible_collection(
-    collection_data: &Collection,
+    collection_data: &DBCollection,
     user_option: &Option<User>,
 ) -> Result<bool, ApiError> {
     let mut authorized = !collection_data.status.is_hidden()
@@ -341,7 +341,7 @@ pub async fn is_visible_collection(
 }
 
 pub async fn filter_visible_collections(
-    collections: Vec<Collection>,
+    collections: Vec<DBCollection>,
     user_option: &Option<User>,
 ) -> Result<Vec<crate::models::collections::Collection>, ApiError> {
     let mut return_collections = Vec::new();
diff --git a/apps/labrinth/src/auth/email/auth_notif.html b/apps/labrinth/src/auth/email/auth_notif.html
index 2d504876..45a9e95a 100644
--- a/apps/labrinth/src/auth/email/auth_notif.html
+++ b/apps/labrinth/src/auth/email/auth_notif.html
@@ -381,8 +381,7 @@
         overflow: hidden;
       "
     >
-      {{ email_description
-      }}&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;
+      {{ email_description }}&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;
     </div>
     <div class="bg" style="background-color: #1e1e1e" lang="en">
       <!--[if mso | IE]>
diff --git a/apps/labrinth/src/auth/email/button_notif.html b/apps/labrinth/src/auth/email/button_notif.html
index d06b62d2..2c7e9d56 100644
--- a/apps/labrinth/src/auth/email/button_notif.html
+++ b/apps/labrinth/src/auth/email/button_notif.html
@@ -361,8 +361,7 @@
         overflow: hidden;
       "
     >
-      {{ email_description
-      }}&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;
+      {{ email_description }}&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;&#847;&nbsp;
     </div>
     <div class="bg" style="background-color: #1e1e1e" lang="en">
       <!--[if mso | IE]>
diff --git a/apps/labrinth/src/auth/email/mod.rs b/apps/labrinth/src/auth/email/mod.rs
index 80c8bb8e..269578db 100644
--- a/apps/labrinth/src/auth/email/mod.rs
+++ b/apps/labrinth/src/auth/email/mod.rs
@@ -1,8 +1,10 @@
-use lettre::message::header::ContentType;
 use lettre::message::Mailbox;
+use lettre::message::header::ContentType;
 use lettre::transport::smtp::authentication::Credentials;
+use lettre::transport::smtp::client::{Tls, TlsParameters};
 use lettre::{Address, Message, SmtpTransport, Transport};
 use thiserror::Error;
+use tracing::warn;
 
 #[derive(Error, Debug)]
 pub enum MailError {
@@ -34,9 +36,28 @@ pub fn send_email_raw(
     let username = dotenvy::var("SMTP_USERNAME")?;
     let password = dotenvy::var("SMTP_PASSWORD")?;
     let host = dotenvy::var("SMTP_HOST")?;
+    let port = dotenvy::var("SMTP_PORT")?.parse::<u16>().unwrap_or(465);
     let creds = Credentials::new(username, password);
+    let tls_setting = match dotenvy::var("SMTP_TLS")?.as_str() {
+        "none" => Tls::None,
+        "opportunistic_start_tls" => {
+            Tls::Opportunistic(TlsParameters::new(host.to_string())?)
+        }
+        "requires_start_tls" => {
+            Tls::Required(TlsParameters::new(host.to_string())?)
+        }
+        "tls" => Tls::Wrapper(TlsParameters::new(host.to_string())?),
+        _ => {
+            warn!("Unrecognized SMTP TLS setting. Defaulting to TLS.");
+            Tls::Wrapper(TlsParameters::new(host.to_string())?)
+        }
+    };
 
-    let mailer = SmtpTransport::relay(&host)?.credentials(creds).build();
+    let mailer = SmtpTransport::relay(&host)?
+        .port(port)
+        .tls(tls_setting)
+        .credentials(creds)
+        .build();
 
     mailer.send(&email)?;
 
diff --git a/apps/labrinth/src/auth/mod.rs b/apps/labrinth/src/auth/mod.rs
index 9b969caa..e2dc16ff 100644
--- a/apps/labrinth/src/auth/mod.rs
+++ b/apps/labrinth/src/auth/mod.rs
@@ -15,8 +15,8 @@ pub use validate::{check_is_moderator_from_headers, get_user_from_headers};
 
 use crate::file_hosting::FileHostingError;
 use crate::models::error::ApiError;
-use actix_web::http::StatusCode;
 use actix_web::HttpResponse;
+use actix_web::http::StatusCode;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
diff --git a/apps/labrinth/src/auth/oauth/errors.rs b/apps/labrinth/src/auth/oauth/errors.rs
index af1d253e..ad23bf74 100644
--- a/apps/labrinth/src/auth/oauth/errors.rs
+++ b/apps/labrinth/src/auth/oauth/errors.rs
@@ -1,8 +1,8 @@
 use super::ValidatedRedirectUri;
 use crate::auth::AuthenticationError;
 use crate::models::error::ApiError;
-use actix_web::http::{header::LOCATION, StatusCode};
 use actix_web::HttpResponse;
+use actix_web::http::{StatusCode, header::LOCATION};
 use ariadne::ids::DecodingError;
 
 #[derive(thiserror::Error, Debug)]
@@ -95,7 +95,7 @@ impl actix_web::ResponseError for OAuthError {
             );
 
             if let Some(state) = self.state.as_ref() {
-                redirect_uri = format!("{}&state={}", redirect_uri, state);
+                redirect_uri = format!("{redirect_uri}&state={state}");
             }
 
             HttpResponse::Ok()
@@ -116,13 +116,15 @@ pub enum OAuthErrorType {
     AuthenticationError(#[from] AuthenticationError),
     #[error("Client {} has no redirect URIs specified", .client_id.0)]
     ClientMissingRedirectURI {
-        client_id: crate::database::models::OAuthClientId,
+        client_id: crate::database::models::DBOAuthClientId,
     },
     #[error(
         "The provided redirect URI did not match any configured in the client"
     )]
     RedirectUriNotConfigured(String),
-    #[error("The provided scope was malformed or did not correspond to known scopes ({0})")]
+    #[error(
+        "The provided scope was malformed or did not correspond to known scopes ({0})"
+    )]
     FailedScopeParse(bitflags::parser::ParseError),
     #[error(
         "The provided scope requested scopes broader than the developer app is configured with"
@@ -131,16 +133,20 @@ pub enum OAuthErrorType {
     #[error("The provided flow id was invalid")]
     InvalidAcceptFlowId,
     #[error("The provided client id was invalid")]
-    InvalidClientId(crate::database::models::OAuthClientId),
+    InvalidClientId(crate::database::models::DBOAuthClientId),
     #[error("The provided ID could not be decoded: {0}")]
     MalformedId(#[from] DecodingError),
     #[error("Failed to authenticate client")]
     ClientAuthenticationFailed,
     #[error("The provided authorization grant code was invalid")]
     InvalidAuthCode,
-    #[error("The provided client id did not match the id this authorization code was granted to")]
+    #[error(
+        "The provided client id did not match the id this authorization code was granted to"
+    )]
     UnauthorizedClient,
-    #[error("The provided redirect URI did not exactly match the uri originally provided when this flow began")]
+    #[error(
+        "The provided redirect URI did not exactly match the uri originally provided when this flow began"
+    )]
     RedirectUriChanged(Option<String>),
     #[error("The provided grant type ({0}) must be \"authorization_code\"")]
     OnlySupportsAuthorizationCodeGrant(String),
diff --git a/apps/labrinth/src/auth/oauth/mod.rs b/apps/labrinth/src/auth/oauth/mod.rs
index bc0a5388..488b0ae2 100644
--- a/apps/labrinth/src/auth/oauth/mod.rs
+++ b/apps/labrinth/src/auth/oauth/mod.rs
@@ -1,27 +1,26 @@
 use crate::auth::get_user_from_headers;
 use crate::auth::oauth::uris::{OAuthRedirectUris, ValidatedRedirectUri};
 use crate::auth::validate::extract_authorization_header;
-use crate::database::models::flow_item::Flow;
-use crate::database::models::oauth_client_authorization_item::OAuthClientAuthorization;
-use crate::database::models::oauth_client_item::OAuthClient as DBOAuthClient;
-use crate::database::models::oauth_token_item::OAuthAccessToken;
+use crate::database::models::flow_item::DBFlow;
+use crate::database::models::oauth_client_authorization_item::DBOAuthClientAuthorization;
+use crate::database::models::oauth_client_item::DBOAuthClient;
+use crate::database::models::oauth_token_item::DBOAuthAccessToken;
 use crate::database::models::{
-    generate_oauth_access_token_id, generate_oauth_client_authorization_id,
-    OAuthClientAuthorizationId,
+    DBOAuthClientAuthorizationId, generate_oauth_access_token_id,
+    generate_oauth_client_authorization_id,
 };
 use crate::database::redis::RedisPool;
 use crate::models;
 use crate::models::ids::OAuthClientId;
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
-use actix_web::http::header::LOCATION;
+use actix_web::http::header::{CACHE_CONTROL, LOCATION, PRAGMA};
 use actix_web::web::{Data, Query, ServiceConfig};
-use actix_web::{get, post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, get, post, web};
 use chrono::Duration;
 use rand::distributions::Alphanumeric;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha20Rng;
-use reqwest::header::{CACHE_CONTROL, PRAGMA};
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgPool;
 
@@ -107,15 +106,15 @@ pub async fn init_oauth(
         }
 
         let existing_authorization =
-            OAuthClientAuthorization::get(client.id, user.id.into(), &**pool)
+            DBOAuthClientAuthorization::get(client.id, user.id.into(), &**pool)
                 .await
                 .map_err(|e| {
                     OAuthError::redirect(e, &oauth_info.state, &redirect_uri)
                 })?;
-        let redirect_uris = OAuthRedirectUris::new(
-            oauth_info.redirect_uri.clone(),
-            redirect_uri.clone(),
-        );
+        let redirect_uris = OAuthRedirectUris {
+            original: oauth_info.redirect_uri.clone(),
+            validated: redirect_uri.clone(),
+        };
         match existing_authorization {
             Some(existing_authorization)
                 if existing_authorization.scopes.contains(requested_scopes) =>
@@ -132,7 +131,7 @@ pub async fn init_oauth(
                 .await
             }
             _ => {
-                let flow_id = Flow::InitOAuthAppApproval {
+                let flow_id = DBFlow::InitOAuthAppApproval {
                     user_id: user.id.into(),
                     client_id: client.id,
                     existing_authorization_id: existing_authorization
@@ -232,13 +231,13 @@ pub async fn request_token(
 
         // Ensure auth code is single use
         // per IETF RFC6749 Section 10.5 (https://datatracker.ietf.org/doc/html/rfc6749#section-10.5)
-        let flow = Flow::take_if(
+        let flow = DBFlow::take_if(
             &req_params.code,
-            |f| matches!(f, Flow::OAuthAuthorizationCodeSupplied { .. }),
+            |f| matches!(f, DBFlow::OAuthAuthorizationCodeSupplied { .. }),
             &redis,
         )
         .await?;
-        if let Some(Flow::OAuthAuthorizationCodeSupplied {
+        if let Some(DBFlow::OAuthAuthorizationCodeSupplied {
             user_id,
             client_id,
             authorization_id,
@@ -275,8 +274,8 @@ pub async fn request_token(
             let token_id =
                 generate_oauth_access_token_id(&mut transaction).await?;
             let token = generate_access_token();
-            let token_hash = OAuthAccessToken::hash_token(&token);
-            let time_until_expiration = OAuthAccessToken {
+            let token_hash = DBOAuthAccessToken::hash_token(&token);
+            let time_until_expiration = DBOAuthAccessToken {
                 id: token_id,
                 authorization_id,
                 token_hash,
@@ -329,13 +328,13 @@ pub async fn accept_or_reject_client_scopes(
     .await?
     .1;
 
-    let flow = Flow::take_if(
+    let flow = DBFlow::take_if(
         &body.flow,
-        |f| matches!(f, Flow::InitOAuthAppApproval { .. }),
+        |f| matches!(f, DBFlow::InitOAuthAppApproval { .. }),
         &redis,
     )
     .await?;
-    if let Some(Flow::InitOAuthAppApproval {
+    if let Some(DBFlow::InitOAuthAppApproval {
         user_id,
         client_id,
         existing_authorization_id,
@@ -360,7 +359,7 @@ pub async fn accept_or_reject_client_scopes(
                         .await?
                 }
             };
-            OAuthClientAuthorization::upsert(
+            DBOAuthClientAuthorization::upsert(
                 auth_id,
                 client_id,
                 user_id,
@@ -414,19 +413,19 @@ fn generate_access_token() -> String {
         .take(60)
         .map(char::from)
         .collect::<String>();
-    format!("mro_{}", random)
+    format!("mro_{random}")
 }
 
 async fn init_oauth_code_flow(
-    user_id: crate::database::models::UserId,
+    user_id: crate::database::models::DBUserId,
     client_id: OAuthClientId,
-    authorization_id: OAuthClientAuthorizationId,
+    authorization_id: DBOAuthClientAuthorizationId,
     scopes: Scopes,
     redirect_uris: OAuthRedirectUris,
     state: Option<String>,
     redis: &RedisPool,
 ) -> Result<HttpResponse, OAuthError> {
-    let code = Flow::OAuthAuthorizationCodeSupplied {
+    let code = DBFlow::OAuthAuthorizationCodeSupplied {
         user_id,
         client_id: client_id.into(),
         authorization_id,
diff --git a/apps/labrinth/src/auth/oauth/uris.rs b/apps/labrinth/src/auth/oauth/uris.rs
index edef0c9d..a3600dc7 100644
--- a/apps/labrinth/src/auth/oauth/uris.rs
+++ b/apps/labrinth/src/auth/oauth/uris.rs
@@ -1,9 +1,9 @@
 use super::errors::OAuthError;
 use crate::auth::oauth::OAuthErrorType;
-use crate::database::models::OAuthClientId;
+use crate::database::models::DBOAuthClientId;
 use serde::{Deserialize, Serialize};
 
-#[derive(derive_new::new, Serialize, Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct OAuthRedirectUris {
     pub original: Option<String>,
     pub validated: ValidatedRedirectUri,
@@ -16,7 +16,7 @@ impl ValidatedRedirectUri {
     pub fn validate<'a>(
         to_validate: &Option<String>,
         validate_against: impl IntoIterator<Item = &'a str> + Clone,
-        client_id: OAuthClientId,
+        client_id: DBOAuthClientId,
     ) -> Result<Self, OAuthError> {
         if let Some(first_client_redirect_uri) =
             validate_against.clone().into_iter().next()
@@ -61,7 +61,7 @@ mod tests {
         let validated = ValidatedRedirectUri::validate(
             &None,
             validate_against.clone(),
-            OAuthClientId(0),
+            DBOAuthClientId(0),
         )
         .unwrap();
 
@@ -82,7 +82,7 @@ mod tests {
         let validated = ValidatedRedirectUri::validate(
             &Some(to_validate.clone()),
             validate_against,
-            OAuthClientId(0),
+            DBOAuthClientId(0),
         )
         .unwrap();
 
@@ -97,7 +97,7 @@ mod tests {
         let validated = ValidatedRedirectUri::validate(
             &Some(to_validate),
             validate_against,
-            OAuthClientId(0),
+            DBOAuthClientId(0),
         );
 
         assert!(validated.is_err_and(|e| matches!(
diff --git a/apps/labrinth/src/auth/templates/mod.rs b/apps/labrinth/src/auth/templates/mod.rs
index f731fa2b..f4e34587 100644
--- a/apps/labrinth/src/auth/templates/mod.rs
+++ b/apps/labrinth/src/auth/templates/mod.rs
@@ -32,7 +32,7 @@ impl Display for ErrorPage {
         let html = include_str!("error.html")
             .replace("{{ code }}", &self.code.to_string())
             .replace("{{ message }}", &self.message);
-        write!(f, "{}", html)?;
+        write!(f, "{html}")?;
 
         Ok(())
     }
diff --git a/apps/labrinth/src/auth/validate.rs b/apps/labrinth/src/auth/validate.rs
index 3f94a9a4..fd88eb9e 100644
--- a/apps/labrinth/src/auth/validate.rs
+++ b/apps/labrinth/src/auth/validate.rs
@@ -6,8 +6,8 @@ use crate::models::pats::Scopes;
 use crate::models::users::User;
 use crate::queue::session::AuthQueue;
 use crate::routes::internal::session::get_session_metadata;
-use actix_web::http::header::{HeaderValue, AUTHORIZATION};
 use actix_web::HttpRequest;
+use actix_web::http::header::{AUTHORIZATION, HeaderValue};
 use chrono::Utc;
 
 pub async fn get_user_from_headers<'a, E>(
@@ -50,7 +50,7 @@ pub async fn get_user_record_from_bearer_token<'a, 'b, E>(
     executor: E,
     redis: &RedisPool,
     session_queue: &AuthQueue,
-) -> Result<Option<(Scopes, user_item::User)>, AuthenticationError>
+) -> Result<Option<(Scopes, user_item::DBUser)>, AuthenticationError>
 where
     E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
 {
@@ -63,7 +63,7 @@ where
     let possible_user = match token.split_once('_') {
         Some(("mrp", _)) => {
             let pat =
-                crate::database::models::pat_item::PersonalAccessToken::get(
+                crate::database::models::pat_item::DBPersonalAccessToken::get(
                     token, executor, redis,
                 )
                 .await?
@@ -74,25 +74,26 @@ where
             }
 
             let user =
-                user_item::User::get_id(pat.user_id, executor, redis).await?;
+                user_item::DBUser::get_id(pat.user_id, executor, redis).await?;
 
             session_queue.add_pat(pat.id).await;
 
             user.map(|x| (pat.scopes, x))
         }
         Some(("mra", _)) => {
-            let session = crate::database::models::session_item::Session::get(
-                token, executor, redis,
-            )
-            .await?
-            .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+            let session =
+                crate::database::models::session_item::DBSession::get(
+                    token, executor, redis,
+                )
+                .await?
+                .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
             if session.expires < Utc::now() {
                 return Err(AuthenticationError::InvalidCredentials);
             }
 
             let user =
-                user_item::User::get_id(session.user_id, executor, redis)
+                user_item::DBUser::get_id(session.user_id, executor, redis)
                     .await?;
 
             let rate_limit_ignore = dotenvy::var("RATE_LIMIT_IGNORE_KEY")?;
@@ -110,11 +111,11 @@ where
             user.map(|x| (Scopes::all(), x))
         }
         Some(("mro", _)) => {
-            use crate::database::models::oauth_token_item::OAuthAccessToken;
+            use crate::database::models::oauth_token_item::DBOAuthAccessToken;
 
-            let hash = OAuthAccessToken::hash_token(token);
+            let hash = DBOAuthAccessToken::hash_token(token);
             let access_token =
-                crate::database::models::oauth_token_item::OAuthAccessToken::get(hash, executor)
+                crate::database::models::oauth_token_item::DBOAuthAccessToken::get(hash, executor)
                     .await?
                     .ok_or(AuthenticationError::InvalidCredentials)?;
 
@@ -122,9 +123,12 @@ where
                 return Err(AuthenticationError::InvalidCredentials);
             }
 
-            let user =
-                user_item::User::get_id(access_token.user_id, executor, redis)
-                    .await?;
+            let user = user_item::DBUser::get_id(
+                access_token.user_id,
+                executor,
+                redis,
+            )
+            .await?;
 
             session_queue.add_oauth_access_token(access_token.id).await;
 
@@ -135,7 +139,7 @@ where
             let id =
                 AuthProvider::GitHub.get_user_id(&user.id, executor).await?;
 
-            let user = user_item::User::get_id(
+            let user = user_item::DBUser::get_id(
                 id.ok_or_else(|| AuthenticationError::InvalidCredentials)?,
                 executor,
                 redis,
diff --git a/apps/labrinth/src/background_task.rs b/apps/labrinth/src/background_task.rs
index be3ebd67..35d8531b 100644
--- a/apps/labrinth/src/background_task.rs
+++ b/apps/labrinth/src/background_task.rs
@@ -132,6 +132,8 @@ pub async fn payouts(
 }
 
 mod version_updater {
+    use std::sync::LazyLock;
+
     use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
     use crate::database::redis::RedisPool;
     use chrono::{DateTime, Utc};
@@ -197,36 +199,45 @@ mod version_updater {
             ("3D Shareware v1.34", "3D-Shareware-v1.34"),
         ];
 
-        lazy_static::lazy_static! {
-            /// Mojank for some reason has versions released at the same DateTime. This hardcodes them to fix this,
-            /// as most of our ordering logic is with DateTime
-            static ref HALL_OF_SHAME_2: [(&'static str, DateTime<Utc>); 4] = [
-                (
-                    "1.4.5",
-                    chrono::DateTime::parse_from_rfc3339("2012-12-19T22:00:00+00:00")
+        /// Mojank for some reason has versions released at the same DateTime. This hardcodes them to fix this,
+        /// as most of our ordering logic is with DateTime
+        static HALL_OF_SHAME_2: LazyLock<[(&'static str, DateTime<Utc>); 4]> =
+            LazyLock::new(|| {
+                [
+                    (
+                        "1.4.5",
+                        chrono::DateTime::parse_from_rfc3339(
+                            "2012-12-19T22:00:00+00:00",
+                        )
                         .unwrap()
                         .into(),
-                ),
-                (
-                    "1.4.6",
-                    chrono::DateTime::parse_from_rfc3339("2012-12-19T22:00:01+00:00")
+                    ),
+                    (
+                        "1.4.6",
+                        chrono::DateTime::parse_from_rfc3339(
+                            "2012-12-19T22:00:01+00:00",
+                        )
                         .unwrap()
                         .into(),
-                ),
-                (
-                    "1.6.3",
-                    chrono::DateTime::parse_from_rfc3339("2013-09-13T10:54:41+00:00")
+                    ),
+                    (
+                        "1.6.3",
+                        chrono::DateTime::parse_from_rfc3339(
+                            "2013-09-13T10:54:41+00:00",
+                        )
                         .unwrap()
                         .into(),
-                ),
-                (
-                    "13w37b",
-                    chrono::DateTime::parse_from_rfc3339("2013-09-13T10:54:42+00:00")
+                    ),
+                    (
+                        "13w37b",
+                        chrono::DateTime::parse_from_rfc3339(
+                            "2013-09-13T10:54:42+00:00",
+                        )
                         .unwrap()
                         .into(),
-                ),
-            ];
-        }
+                    ),
+                ]
+            });
 
         for version in input.versions.into_iter() {
             let mut name = version.id;
diff --git a/apps/labrinth/src/clickhouse/mod.rs b/apps/labrinth/src/clickhouse/mod.rs
index c896a126..fe1ffe6e 100644
--- a/apps/labrinth/src/clickhouse/mod.rs
+++ b/apps/labrinth/src/clickhouse/mod.rs
@@ -1,5 +1,6 @@
-use hyper::client::HttpConnector;
-use hyper_tls::{native_tls, HttpsConnector};
+use hyper_tls::{HttpsConnector, native_tls};
+use hyper_util::client::legacy::connect::HttpConnector;
+use hyper_util::rt::TokioExecutor;
 
 mod fetch;
 
@@ -22,7 +23,8 @@ pub async fn init_client_with_database(
         let https_connector =
             HttpsConnector::from((http_connector, tls_connector));
         let hyper_client =
-            hyper::client::Client::builder().build(https_connector);
+            hyper_util::client::legacy::Client::builder(TokioExecutor::new())
+                .build(https_connector);
 
         clickhouse::Client::with_http_client(hyper_client)
             .with_url(dotenvy::var("CLICKHOUSE_URL").unwrap())
diff --git a/apps/labrinth/src/database/mod.rs b/apps/labrinth/src/database/mod.rs
index a1c51f2a..cd84e4e2 100644
--- a/apps/labrinth/src/database/mod.rs
+++ b/apps/labrinth/src/database/mod.rs
@@ -1,9 +1,9 @@
 pub mod models;
 mod postgres_database;
 pub mod redis;
-pub use models::Image;
-pub use models::Project;
-pub use models::Version;
+pub use models::DBImage;
+pub use models::DBProject;
+pub use models::DBVersion;
 pub use postgres_database::check_for_migrations;
 pub use postgres_database::connect;
 pub use postgres_database::register_and_set_metrics;
diff --git a/apps/labrinth/src/database/models/categories.rs b/apps/labrinth/src/database/models/categories.rs
index 90abf1ad..05666793 100644
--- a/apps/labrinth/src/database/models/categories.rs
+++ b/apps/labrinth/src/database/models/categories.rs
@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::database::redis::RedisPool;
 
-use super::ids::*;
 use super::DatabaseError;
+use super::ids::*;
 use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
 
diff --git a/apps/labrinth/src/database/models/charge_item.rs b/apps/labrinth/src/database/models/charge_item.rs
index 8a988407..5acf4c69 100644
--- a/apps/labrinth/src/database/models/charge_item.rs
+++ b/apps/labrinth/src/database/models/charge_item.rs
@@ -1,5 +1,5 @@
 use crate::database::models::{
-    ChargeId, DatabaseError, ProductPriceId, UserId, UserSubscriptionId,
+    DBChargeId, DBProductPriceId, DBUserId, DBUserSubscriptionId, DatabaseError,
 };
 use crate::models::billing::{
     ChargeStatus, ChargeType, PaymentPlatform, PriceDuration,
@@ -7,10 +7,10 @@ use crate::models::billing::{
 use chrono::{DateTime, Utc};
 use std::convert::{TryFrom, TryInto};
 
-pub struct ChargeItem {
-    pub id: ChargeId,
-    pub user_id: UserId,
-    pub price_id: ProductPriceId,
+pub struct DBCharge {
+    pub id: DBChargeId,
+    pub user_id: DBUserId,
+    pub price_id: DBProductPriceId,
     pub amount: i64,
     pub currency_code: String,
     pub status: ChargeStatus,
@@ -18,19 +18,19 @@ pub struct ChargeItem {
     pub last_attempt: Option<DateTime<Utc>>,
 
     pub type_: ChargeType,
-    pub subscription_id: Option<UserSubscriptionId>,
+    pub subscription_id: Option<DBUserSubscriptionId>,
     pub subscription_interval: Option<PriceDuration>,
 
     pub payment_platform: PaymentPlatform,
     pub payment_platform_id: Option<String>,
 
-    pub parent_charge_id: Option<ChargeId>,
+    pub parent_charge_id: Option<DBChargeId>,
 
     // Net is always in USD
     pub net: Option<i64>,
 }
 
-struct ChargeResult {
+struct ChargeQueryResult {
     id: i64,
     user_id: i64,
     price_id: i64,
@@ -48,27 +48,27 @@ struct ChargeResult {
     net: Option<i64>,
 }
 
-impl TryFrom<ChargeResult> for ChargeItem {
+impl TryFrom<ChargeQueryResult> for DBCharge {
     type Error = serde_json::Error;
 
-    fn try_from(r: ChargeResult) -> Result<Self, Self::Error> {
-        Ok(ChargeItem {
-            id: ChargeId(r.id),
-            user_id: UserId(r.user_id),
-            price_id: ProductPriceId(r.price_id),
+    fn try_from(r: ChargeQueryResult) -> Result<Self, Self::Error> {
+        Ok(DBCharge {
+            id: DBChargeId(r.id),
+            user_id: DBUserId(r.user_id),
+            price_id: DBProductPriceId(r.price_id),
             amount: r.amount,
             currency_code: r.currency_code,
             status: ChargeStatus::from_string(&r.status),
             due: r.due,
             last_attempt: r.last_attempt,
             type_: ChargeType::from_string(&r.charge_type),
-            subscription_id: r.subscription_id.map(UserSubscriptionId),
+            subscription_id: r.subscription_id.map(DBUserSubscriptionId),
             subscription_interval: r
                 .subscription_interval
                 .map(|x| PriceDuration::from_string(&x)),
             payment_platform: PaymentPlatform::from_string(&r.payment_platform),
             payment_platform_id: r.payment_platform_id,
-            parent_charge_id: r.parent_charge_id.map(ChargeId),
+            parent_charge_id: r.parent_charge_id.map(DBChargeId),
             net: r.net,
         })
     }
@@ -77,7 +77,7 @@ impl TryFrom<ChargeResult> for ChargeItem {
 macro_rules! select_charges_with_predicate {
     ($predicate:tt, $param:ident) => {
         sqlx::query_as!(
-            ChargeResult,
+            ChargeQueryResult,
             r#"
             SELECT
                 id, user_id, price_id, amount, currency_code, status, due, last_attempt,
@@ -96,11 +96,11 @@ macro_rules! select_charges_with_predicate {
     };
 }
 
-impl ChargeItem {
+impl DBCharge {
     pub async fn upsert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<ChargeId, DatabaseError> {
+    ) -> Result<DBChargeId, DatabaseError> {
         sqlx::query!(
             r#"
             INSERT INTO charges (id, user_id, price_id, amount, currency_code, charge_type, status, due, last_attempt, subscription_id, subscription_interval, payment_platform, payment_platform_id, parent_charge_id, net)
@@ -144,9 +144,9 @@ impl ChargeItem {
     }
 
     pub async fn get(
-        id: ChargeId,
+        id: DBChargeId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<ChargeItem>, DatabaseError> {
+    ) -> Result<Option<DBCharge>, DatabaseError> {
         let id = id.0;
         let res = select_charges_with_predicate!("WHERE id = $1", id)
             .fetch_optional(exec)
@@ -156,9 +156,9 @@ impl ChargeItem {
     }
 
     pub async fn get_from_user(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ChargeItem>, DatabaseError> {
+    ) -> Result<Vec<DBCharge>, DatabaseError> {
         let user_id = user_id.0;
         let res = select_charges_with_predicate!(
             "WHERE user_id = $1 ORDER BY due DESC",
@@ -174,9 +174,9 @@ impl ChargeItem {
     }
 
     pub async fn get_children(
-        charge_id: ChargeId,
+        charge_id: DBChargeId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ChargeItem>, DatabaseError> {
+    ) -> Result<Vec<DBCharge>, DatabaseError> {
         let charge_id = charge_id.0;
         let res = select_charges_with_predicate!(
             "WHERE parent_charge_id = $1",
@@ -192,9 +192,9 @@ impl ChargeItem {
     }
 
     pub async fn get_open_subscription(
-        user_subscription_id: UserSubscriptionId,
+        user_subscription_id: DBUserSubscriptionId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<ChargeItem>, DatabaseError> {
+    ) -> Result<Option<DBCharge>, DatabaseError> {
         let user_subscription_id = user_subscription_id.0;
         let res = select_charges_with_predicate!(
             "WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled')",
@@ -208,7 +208,7 @@ impl ChargeItem {
 
     pub async fn get_chargeable(
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ChargeItem>, DatabaseError> {
+    ) -> Result<Vec<DBCharge>, DatabaseError> {
         let charge_type = ChargeType::Subscription.as_str();
         let res = select_charges_with_predicate!(
             r#"
@@ -232,7 +232,7 @@ impl ChargeItem {
 
     pub async fn get_unprovision(
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ChargeItem>, DatabaseError> {
+    ) -> Result<Vec<DBCharge>, DatabaseError> {
         let charge_type = ChargeType::Subscription.as_str();
         let res = select_charges_with_predicate!(
             r#"
@@ -254,8 +254,29 @@ impl ChargeItem {
             .collect::<Result<Vec<_>, serde_json::Error>>()?)
     }
 
+    pub async fn get_cancellable(
+        exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
+    ) -> Result<Vec<DBCharge>, DatabaseError> {
+        let charge_type = ChargeType::Subscription.as_str();
+        let res = select_charges_with_predicate!(
+            r#"
+            WHERE
+                charge_type = $1 AND
+                status = 'failed' AND due < NOW() - INTERVAL '30 days'
+            "#,
+            charge_type
+        )
+        .fetch_all(exec)
+        .await?;
+
+        Ok(res
+            .into_iter()
+            .map(|r| r.try_into())
+            .collect::<Result<Vec<_>, serde_json::Error>>()?)
+    }
+
     pub async fn remove(
-        id: ChargeId,
+        id: DBChargeId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         sqlx::query!(
diff --git a/apps/labrinth/src/database/models/collection_item.rs b/apps/labrinth/src/database/models/collection_item.rs
index 0a4c440b..d82a1ae2 100644
--- a/apps/labrinth/src/database/models/collection_item.rs
+++ b/apps/labrinth/src/database/models/collection_item.rs
@@ -12,20 +12,20 @@ const COLLECTIONS_NAMESPACE: &str = "collections";
 
 #[derive(Clone)]
 pub struct CollectionBuilder {
-    pub collection_id: CollectionId,
-    pub user_id: UserId,
+    pub collection_id: DBCollectionId,
+    pub user_id: DBUserId,
     pub name: String,
     pub description: Option<String>,
     pub status: CollectionStatus,
-    pub projects: Vec<ProjectId>,
+    pub projects: Vec<DBProjectId>,
 }
 
 impl CollectionBuilder {
     pub async fn insert(
         self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<CollectionId, DatabaseError> {
-        let collection_struct = Collection {
+    ) -> Result<DBCollectionId, DatabaseError> {
+        let collection_struct = DBCollection {
             id: self.collection_id,
             name: self.name,
             user_id: self.user_id,
@@ -44,9 +44,9 @@ impl CollectionBuilder {
     }
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Collection {
-    pub id: CollectionId,
-    pub user_id: UserId,
+pub struct DBCollection {
+    pub id: DBCollectionId,
+    pub user_id: DBUserId,
     pub name: String,
     pub description: Option<String>,
     pub created: DateTime<Utc>,
@@ -55,10 +55,10 @@ pub struct Collection {
     pub raw_icon_url: Option<String>,
     pub color: Option<u32>,
     pub status: CollectionStatus,
-    pub projects: Vec<ProjectId>,
+    pub projects: Vec<DBProjectId>,
 }
 
-impl Collection {
+impl DBCollection {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -66,16 +66,16 @@ impl Collection {
         sqlx::query!(
             "
             INSERT INTO collections (
-                id, user_id, name, description, 
+                id, user_id, name, description,
                 created, icon_url, raw_icon_url, status
             )
             VALUES (
-                $1, $2, $3, $4, 
+                $1, $2, $3, $4,
                 $5, $6, $7, $8
             )
             ",
-            self.id as CollectionId,
-            self.user_id as UserId,
+            self.id as DBCollectionId,
+            self.user_id as DBUserId,
             &self.name,
             self.description.as_ref(),
             self.created,
@@ -104,7 +104,7 @@ impl Collection {
     }
 
     pub async fn remove(
-        id: CollectionId,
+        id: DBCollectionId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
@@ -116,7 +116,7 @@ impl Collection {
                 DELETE FROM collections_mods
                 WHERE collection_id = $1
                 ",
-                id as CollectionId,
+                id as DBCollectionId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -126,12 +126,12 @@ impl Collection {
                 DELETE FROM collections
                 WHERE id = $1
                 ",
-                id as CollectionId,
+                id as DBCollectionId,
             )
             .execute(&mut **transaction)
             .await?;
 
-            models::Collection::clear_cache(collection.id, redis).await?;
+            models::DBCollection::clear_cache(collection.id, redis).await?;
 
             Ok(Some(()))
         } else {
@@ -140,23 +140,23 @@ impl Collection {
     }
 
     pub async fn get<'a, 'b, E>(
-        id: CollectionId,
+        id: DBCollectionId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<Collection>, DatabaseError>
+    ) -> Result<Option<DBCollection>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        Collection::get_many(&[id], executor, redis)
+        DBCollection::get_many(&[id], executor, redis)
             .await
             .map(|x| x.into_iter().next())
     }
 
     pub async fn get_many<'a, E>(
-        collection_ids: &[CollectionId],
+        collection_ids: &[DBCollectionId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<Collection>, DatabaseError>
+    ) -> Result<Vec<DBCollection>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -180,9 +180,9 @@ impl Collection {
                     )
                     .fetch(exec)
                     .try_fold(DashMap::new(), |acc, m| {
-                        let collection = Collection {
-                            id: CollectionId(m.id),
-                            user_id: UserId(m.user_id),
+                        let collection = DBCollection {
+                            id: DBCollectionId(m.id),
+                            user_id: DBUserId(m.user_id),
                             name: m.name.clone(),
                             description: m.description.clone(),
                             icon_url: m.icon_url.clone(),
@@ -195,7 +195,7 @@ impl Collection {
                                 .mods
                                 .unwrap_or_default()
                                 .into_iter()
-                                .map(ProjectId)
+                                .map(DBProjectId)
                                 .collect(),
                         };
 
@@ -213,7 +213,7 @@ impl Collection {
     }
 
     pub async fn clear_cache(
-        id: CollectionId,
+        id: DBCollectionId,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
diff --git a/apps/labrinth/src/database/models/flow_item.rs b/apps/labrinth/src/database/models/flow_item.rs
index a6ba026c..53bd379c 100644
--- a/apps/labrinth/src/database/models/flow_item.rs
+++ b/apps/labrinth/src/database/models/flow_item.rs
@@ -1,59 +1,59 @@
 use super::ids::*;
-use crate::auth::oauth::uris::OAuthRedirectUris;
 use crate::auth::AuthProvider;
+use crate::auth::oauth::uris::OAuthRedirectUris;
 use crate::database::models::DatabaseError;
 use crate::database::redis::RedisPool;
 use crate::models::pats::Scopes;
 use chrono::Duration;
-use rand::distributions::Alphanumeric;
 use rand::Rng;
-use rand_chacha::rand_core::SeedableRng;
+use rand::distributions::Alphanumeric;
 use rand_chacha::ChaCha20Rng;
+use rand_chacha::rand_core::SeedableRng;
 use serde::{Deserialize, Serialize};
 
 const FLOWS_NAMESPACE: &str = "flows";
 
 #[derive(Deserialize, Serialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
-pub enum Flow {
+pub enum DBFlow {
     OAuth {
-        user_id: Option<UserId>,
+        user_id: Option<DBUserId>,
         url: String,
         provider: AuthProvider,
     },
     Login2FA {
-        user_id: UserId,
+        user_id: DBUserId,
     },
     Initialize2FA {
-        user_id: UserId,
+        user_id: DBUserId,
         secret: String,
     },
     ForgotPassword {
-        user_id: UserId,
+        user_id: DBUserId,
     },
     ConfirmEmail {
-        user_id: UserId,
+        user_id: DBUserId,
         confirm_email: String,
     },
     MinecraftAuth,
     InitOAuthAppApproval {
-        user_id: UserId,
-        client_id: OAuthClientId,
-        existing_authorization_id: Option<OAuthClientAuthorizationId>,
+        user_id: DBUserId,
+        client_id: DBOAuthClientId,
+        existing_authorization_id: Option<DBOAuthClientAuthorizationId>,
         scopes: Scopes,
         redirect_uris: OAuthRedirectUris,
         state: Option<String>,
     },
     OAuthAuthorizationCodeSupplied {
-        user_id: UserId,
-        client_id: OAuthClientId,
-        authorization_id: OAuthClientAuthorizationId,
+        user_id: DBUserId,
+        client_id: DBOAuthClientId,
+        authorization_id: DBOAuthClientAuthorizationId,
         scopes: Scopes,
         original_redirect_uri: Option<String>, // Needed for https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.3
     },
 }
 
-impl Flow {
+impl DBFlow {
     pub async fn insert(
         &self,
         expires: Duration,
@@ -81,7 +81,7 @@ impl Flow {
     pub async fn get(
         id: &str,
         redis: &RedisPool,
-    ) -> Result<Option<Flow>, DatabaseError> {
+    ) -> Result<Option<DBFlow>, DatabaseError> {
         let mut redis = redis.connect().await?;
 
         redis.get_deserialized_from_json(FLOWS_NAMESPACE, id).await
@@ -91,9 +91,9 @@ impl Flow {
     /// The predicate should validate that the flow being removed is the correct one, as a security measure
     pub async fn take_if(
         id: &str,
-        predicate: impl FnOnce(&Flow) -> bool,
+        predicate: impl FnOnce(&DBFlow) -> bool,
         redis: &RedisPool,
-    ) -> Result<Option<Flow>, DatabaseError> {
+    ) -> Result<Option<DBFlow>, DatabaseError> {
         let flow = Self::get(id, redis).await?;
         if let Some(flow) = flow.as_ref() {
             if predicate(flow) {
diff --git a/apps/labrinth/src/database/models/friend_item.rs b/apps/labrinth/src/database/models/friend_item.rs
index 55be0a89..d39d627e 100644
--- a/apps/labrinth/src/database/models/friend_item.rs
+++ b/apps/labrinth/src/database/models/friend_item.rs
@@ -1,14 +1,14 @@
-use crate::database::models::UserId;
+use crate::database::models::DBUserId;
 use chrono::{DateTime, Utc};
 
-pub struct FriendItem {
-    pub user_id: UserId,
-    pub friend_id: UserId,
+pub struct DBFriend {
+    pub user_id: DBUserId,
+    pub friend_id: DBUserId,
     pub created: DateTime<Utc>,
     pub accepted: bool,
 }
 
-impl FriendItem {
+impl DBFriend {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -30,10 +30,10 @@ impl FriendItem {
     }
 
     pub async fn get_friend<'a, E>(
-        user_id: UserId,
-        friend_id: UserId,
+        user_id: DBUserId,
+        friend_id: DBUserId,
         exec: E,
-    ) -> Result<Option<FriendItem>, sqlx::Error>
+    ) -> Result<Option<DBFriend>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -48,9 +48,9 @@ impl FriendItem {
         )
         .fetch_optional(exec)
         .await?
-            .map(|row| FriendItem {
-                user_id: UserId(row.user_id),
-                friend_id: UserId(row.friend_id),
+            .map(|row| DBFriend {
+                user_id: DBUserId(row.user_id),
+                friend_id: DBUserId(row.friend_id),
                 created: row.created,
                 accepted: row.accepted,
             });
@@ -59,8 +59,8 @@ impl FriendItem {
     }
 
     pub async fn update_friend(
-        user_id: UserId,
-        friend_id: UserId,
+        user_id: DBUserId,
+        friend_id: DBUserId,
         accepted: bool,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), sqlx::Error> {
@@ -81,10 +81,10 @@ impl FriendItem {
     }
 
     pub async fn get_user_friends<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         accepted: Option<bool>,
         exec: E,
-    ) -> Result<Vec<FriendItem>, sqlx::Error>
+    ) -> Result<Vec<DBFriend>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -99,9 +99,9 @@ impl FriendItem {
         .fetch_all(exec)
         .await?
         .into_iter()
-        .map(|row| FriendItem {
-            user_id: UserId(row.user_id),
-            friend_id: UserId(row.friend_id),
+        .map(|row| DBFriend {
+            user_id: DBUserId(row.user_id),
+            friend_id: DBUserId(row.friend_id),
             created: row.created,
             accepted: row.accepted,
         })
@@ -112,8 +112,8 @@ impl FriendItem {
     }
 
     pub async fn remove(
-        user_id: UserId,
-        friend_id: UserId,
+        user_id: DBUserId,
+        friend_id: DBUserId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), sqlx::Error> {
         sqlx::query!(
diff --git a/apps/labrinth/src/database/models/ids.rs b/apps/labrinth/src/database/models/ids.rs
index 9c730a71..a7efc85c 100644
--- a/apps/labrinth/src/database/models/ids.rs
+++ b/apps/labrinth/src/database/models/ids.rs
@@ -1,7 +1,15 @@
 use super::DatabaseError;
+use crate::models::ids::{
+    ChargeId, CollectionId, FileId, ImageId, NotificationId,
+    OAuthAccessTokenId, OAuthClientAuthorizationId, OAuthClientId,
+    OAuthRedirectUriId, OrganizationId, PatId, PayoutId, ProductId,
+    ProductPriceId, ProjectId, ReportId, SessionId, TeamId, TeamMemberId,
+    ThreadId, ThreadMessageId, UserSubscriptionId, VersionId,
+};
 use ariadne::ids::base62_impl::to_base62;
-use ariadne::ids::{random_base62_rng, random_base62_rng_range};
+use ariadne::ids::{UserId, random_base62_rng, random_base62_rng_range};
 use censor::Censor;
+use paste::paste;
 use rand::SeedableRng;
 use rand_chacha::ChaCha20Rng;
 use serde::{Deserialize, Serialize};
@@ -10,12 +18,12 @@ use sqlx::sqlx_macros::Type;
 const ID_RETRY_COUNT: usize = 20;
 
 macro_rules! generate_ids {
-    ($vis:vis $function_name:ident, $return_type:ty, $id_length:expr, $select_stmnt:literal, $id_function:expr) => {
-        $vis async fn $function_name(
+    ($function_name:ident, $return_type:ident, $select_stmnt:expr) => {
+        pub async fn $function_name(
             con: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         ) -> Result<$return_type, DatabaseError> {
             let mut rng = ChaCha20Rng::from_entropy();
-            let length = $id_length;
+            let length = 8;
             let mut id = random_base62_rng(&mut rng, length);
             let mut retry_count = 0;
             let censor = Censor::Standard + Censor::Sex;
@@ -26,7 +34,9 @@ macro_rules! generate_ids {
                     .fetch_one(&mut **con)
                     .await?;
 
-                if results.exists.unwrap_or(true) || censor.check(&*to_base62(id)) {
+                if results.exists.unwrap_or(true)
+                    || censor.check(&*to_base62(id))
+                {
                     id = random_base62_rng(&mut rng, length);
                 } else {
                     break;
@@ -38,14 +48,14 @@ macro_rules! generate_ids {
                 }
             }
 
-            Ok($id_function(id as i64))
+            Ok($return_type(id as i64))
         }
     };
 }
 
 macro_rules! generate_bulk_ids {
-    ($vis:vis $function_name:ident, $return_type:ty, $select_stmnt:literal, $id_function:expr) => {
-        $vis async fn $function_name(
+    ($function_name:ident, $return_type:ident, $select_stmnt:expr) => {
+        pub async fn $function_name(
             count: usize,
             con: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         ) -> Result<Vec<$return_type>, DatabaseError> {
@@ -55,14 +65,18 @@ macro_rules! generate_bulk_ids {
             // Check if ID is unique
             loop {
                 let base = random_base62_rng_range(&mut rng, 1, 10) as i64;
-                let ids = (0..count).map(|x| base + x as i64).collect::<Vec<_>>();
+                let ids =
+                    (0..count).map(|x| base + x as i64).collect::<Vec<_>>();
 
                 let results = sqlx::query!($select_stmnt, &ids)
                     .fetch_one(&mut **con)
                     .await?;
 
                 if !results.exists.unwrap_or(true) {
-                    return Ok(ids.into_iter().map(|x| $id_function(x)).collect());
+                    return Ok(ids
+                        .into_iter()
+                        .map(|x| $return_type(x))
+                        .collect());
                 }
 
                 retry_count += 1;
@@ -74,589 +88,167 @@ macro_rules! generate_bulk_ids {
     };
 }
 
-generate_ids!(
-    pub generate_project_id,
-    ProjectId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM mods WHERE id=$1)",
-    ProjectId
-);
-generate_ids!(
-    pub generate_version_id,
-    VersionId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM versions WHERE id=$1)",
-    VersionId
-);
-generate_ids!(
-    pub generate_team_id,
-    TeamId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM teams WHERE id=$1)",
-    TeamId
-);
-generate_ids!(
-    pub generate_organization_id,
-    OrganizationId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM organizations WHERE id=$1)",
-    OrganizationId
-);
-generate_ids!(
-    pub generate_collection_id,
-    CollectionId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM collections WHERE id=$1)",
-    CollectionId
-);
-generate_ids!(
-    pub generate_file_id,
-    FileId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM files WHERE id=$1)",
-    FileId
-);
-generate_ids!(
-    pub generate_team_member_id,
-    TeamMemberId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM team_members WHERE id=$1)",
-    TeamMemberId
-);
-generate_ids!(
-    pub generate_pat_id,
-    PatId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM pats WHERE id=$1)",
-    PatId
-);
+macro_rules! db_id_interface {
+    ($id_struct:ident $(, generator: $generator_function:ident @ $db_table:expr, $(bulk_generator: $bulk_generator_function:ident,)?)?) => {
+        paste! {
+            #[derive(Copy, Clone, Debug, Type, Serialize, Deserialize, PartialEq, Eq, Hash)]
+            #[sqlx(transparent)]
+            pub struct [< DB $id_struct >](pub i64);
 
-generate_ids!(
-    pub generate_user_id,
-    UserId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM users WHERE id=$1)",
-    UserId
-);
-generate_ids!(
-    pub generate_report_id,
-    ReportId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM reports WHERE id=$1)",
-    ReportId
-);
+            impl From<$id_struct> for [< DB $id_struct >] {
+                fn from(id: $id_struct) -> Self {
+                    Self(id.0 as i64)
+                }
+            }
+            impl From<[< DB $id_struct >]> for $id_struct {
+                fn from(id: [< DB $id_struct >]) -> Self {
+                    Self(id.0 as u64)
+                }
+            }
 
-generate_ids!(
-    pub generate_notification_id,
-    NotificationId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM notifications WHERE id=$1)",
-    NotificationId
-);
+            $(
+                generate_ids!(
+                    $generator_function,
+                    [< DB $id_struct >],
+                    "SELECT EXISTS(SELECT 1 FROM " + $db_table + " WHERE id=$1)"
+                );
 
-generate_bulk_ids!(
-    pub generate_many_notification_ids,
-    NotificationId,
-    "SELECT EXISTS(SELECT 1 FROM notifications WHERE id = ANY($1))",
-    NotificationId
-);
+                $(
+                    generate_bulk_ids!(
+                        $bulk_generator_function,
+                        [< DB $id_struct >],
+                        "SELECT EXISTS(SELECT 1 FROM " + $db_table + " WHERE id = ANY($1))"
+                    );
+                )?
+            )?
+        }
+    };
+}
 
-generate_ids!(
-    pub generate_thread_id,
-    ThreadId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM threads WHERE id=$1)",
-    ThreadId
-);
-generate_ids!(
-    pub generate_thread_message_id,
-    ThreadMessageId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM threads_messages WHERE id=$1)",
-    ThreadMessageId
-);
+macro_rules! short_id_type {
+    ($name:ident) => {
+        #[derive(
+            Copy,
+            Clone,
+            Debug,
+            Type,
+            Serialize,
+            Deserialize,
+            Eq,
+            PartialEq,
+            Hash,
+        )]
+        #[sqlx(transparent)]
+        pub struct $name(pub i32);
+    };
+}
 
-generate_ids!(
-    pub generate_session_id,
-    SessionId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM sessions WHERE id=$1)",
-    SessionId
-);
-
-generate_ids!(
-    pub generate_image_id,
-    ImageId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM uploaded_images WHERE id=$1)",
-    ImageId
-);
-
-generate_ids!(
-    pub generate_oauth_client_authorization_id,
-    OAuthClientAuthorizationId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM oauth_client_authorizations WHERE id=$1)",
-    OAuthClientAuthorizationId
-);
-
-generate_ids!(
-    pub generate_oauth_client_id,
-    OAuthClientId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM oauth_clients WHERE id=$1)",
-    OAuthClientId
-);
-
-generate_ids!(
-    pub generate_oauth_redirect_id,
-    OAuthRedirectUriId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM oauth_client_redirect_uris WHERE id=$1)",
-    OAuthRedirectUriId
-);
-
-generate_ids!(
-    pub generate_oauth_access_token_id,
-    OAuthAccessTokenId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM oauth_access_tokens WHERE id=$1)",
-    OAuthAccessTokenId
-);
-
-generate_ids!(
-    pub generate_payout_id,
-    PayoutId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM oauth_access_tokens WHERE id=$1)",
-    PayoutId
-);
-
-generate_ids!(
-    pub generate_product_id,
-    ProductId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM products WHERE id=$1)",
-    ProductId
-);
-
-generate_ids!(
-    pub generate_product_price_id,
-    ProductPriceId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM products_prices WHERE id=$1)",
-    ProductPriceId
-);
-
-generate_ids!(
-    pub generate_user_subscription_id,
-    UserSubscriptionId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM users_subscriptions WHERE id=$1)",
-    UserSubscriptionId
-);
-
-generate_ids!(
-    pub generate_charge_id,
+db_id_interface!(
     ChargeId,
-    8,
-    "SELECT EXISTS(SELECT 1 FROM charges WHERE id=$1)",
-    ChargeId
+    generator: generate_charge_id @ "charges",
+);
+db_id_interface!(
+    CollectionId,
+    generator: generate_collection_id @ "collections",
+);
+db_id_interface!(
+    FileId,
+    generator: generate_file_id @ "files",
+);
+db_id_interface!(
+    ImageId,
+    generator: generate_image_id @ "uploaded_images",
+);
+db_id_interface!(
+    NotificationId,
+    generator: generate_notification_id @ "notifications",
+    bulk_generator: generate_many_notification_ids,
+);
+db_id_interface!(
+    OAuthAccessTokenId,
+    generator: generate_oauth_access_token_id @ "oauth_access_tokens",
+);
+db_id_interface!(
+    OAuthClientAuthorizationId,
+    generator: generate_oauth_client_authorization_id @ "oauth_client_authorizations",
+);
+db_id_interface!(
+    OAuthClientId,
+    generator: generate_oauth_client_id @ "oauth_clients",
+);
+db_id_interface!(
+    OAuthRedirectUriId,
+    generator: generate_oauth_redirect_id @ "oauth_client_redirect_uris",
+);
+db_id_interface!(
+    OrganizationId,
+    generator: generate_organization_id @ "organizations",
+);
+db_id_interface!(
+    PatId,
+    generator: generate_pat_id @ "pats",
+);
+db_id_interface!(
+    PayoutId,
+    generator: generate_payout_id @ "payouts",
+);
+db_id_interface!(
+    ProductId,
+    generator: generate_product_id @ "products",
+);
+db_id_interface!(
+    ProductPriceId,
+    generator: generate_product_price_id @ "products_prices",
+);
+db_id_interface!(
+    ProjectId,
+    generator: generate_project_id @ "mods",
+);
+db_id_interface!(
+    ReportId,
+    generator: generate_report_id @ "reports",
+);
+db_id_interface!(
+    SessionId,
+    generator: generate_session_id @ "sessions",
+);
+db_id_interface!(
+    TeamId,
+    generator: generate_team_id @ "teams",
+);
+db_id_interface!(
+    TeamMemberId,
+    generator: generate_team_member_id @ "team_members",
+);
+db_id_interface!(
+    ThreadId,
+    generator: generate_thread_id @ "threads",
+);
+db_id_interface!(
+    ThreadMessageId,
+    generator: generate_thread_message_id @ "threads_messages",
+);
+db_id_interface!(
+    UserId,
+    generator: generate_user_id @ "users",
+);
+db_id_interface!(
+    UserSubscriptionId,
+    generator: generate_user_subscription_id @ "users_subscriptions",
+);
+db_id_interface!(
+    VersionId,
+    generator: generate_version_id @ "versions",
 );
 
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, Type, Hash, Serialize, Deserialize,
-)]
-#[sqlx(transparent)]
-pub struct UserId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Eq, Hash, PartialEq, Serialize, Deserialize,
-)]
-#[sqlx(transparent)]
-pub struct TeamId(pub i64);
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct TeamMemberId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, PartialEq, Eq, Hash, Serialize, Deserialize,
-)]
-#[sqlx(transparent)]
-pub struct OrganizationId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, PartialEq, Eq, Hash, Serialize, Deserialize,
-)]
-#[sqlx(transparent)]
-pub struct ProjectId(pub i64);
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, PartialEq, Eq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct ProjectTypeId(pub i32);
-
-#[derive(Copy, Clone, Debug, Type)]
-#[sqlx(transparent)]
-pub struct StatusId(pub i32);
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct GameId(pub i32);
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, PartialEq, Eq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct LinkPlatformId(pub i32);
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Type,
-    PartialEq,
-    Eq,
-    Hash,
-    Serialize,
-    Deserialize,
-    PartialOrd,
-    Ord,
-)]
-#[sqlx(transparent)]
-pub struct VersionId(pub i64);
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, PartialEq, Eq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct LoaderId(pub i32);
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct CategoryId(pub i32);
-
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct CollectionId(pub i64);
-
-#[derive(Copy, Clone, Debug, Type, Deserialize, Serialize)]
-#[sqlx(transparent)]
-pub struct ReportId(pub i64);
-#[derive(Copy, Clone, Debug, Type)]
-#[sqlx(transparent)]
-pub struct ReportTypeId(pub i32);
-
-#[derive(
-    Copy, Clone, Debug, Type, Hash, Eq, PartialEq, Deserialize, Serialize,
-)]
-#[sqlx(transparent)]
-pub struct FileId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Deserialize, Serialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct PatId(pub i64);
-
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct NotificationId(pub i64);
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct NotificationActionId(pub i32);
-
-#[derive(Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq)]
-#[sqlx(transparent)]
-pub struct ThreadId(pub i64);
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct ThreadMessageId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct SessionId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct ImageId(pub i64);
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Type,
-    Serialize,
-    Deserialize,
-    Eq,
-    PartialEq,
-    Hash,
-    PartialOrd,
-    Ord,
-)]
-#[sqlx(transparent)]
-pub struct LoaderFieldId(pub i32);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct LoaderFieldEnumId(pub i32);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct LoaderFieldEnumValueId(pub i32);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct OAuthClientId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct OAuthClientAuthorizationId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct OAuthRedirectUriId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct OAuthAccessTokenId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct PayoutId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct ProductId(pub i64);
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct ProductPriceId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct UserSubscriptionId(pub i64);
-
-#[derive(
-    Copy, Clone, Debug, Type, Serialize, Deserialize, Eq, PartialEq, Hash,
-)]
-#[sqlx(transparent)]
-pub struct ChargeId(pub i64);
-
-use crate::models::ids;
-
-impl From<ids::ProjectId> for ProjectId {
-    fn from(id: ids::ProjectId) -> Self {
-        ProjectId(id.0 as i64)
-    }
-}
-impl From<ProjectId> for ids::ProjectId {
-    fn from(id: ProjectId) -> Self {
-        ids::ProjectId(id.0 as u64)
-    }
-}
-impl From<ids::UserId> for UserId {
-    fn from(id: ids::UserId) -> Self {
-        UserId(id.0 as i64)
-    }
-}
-impl From<UserId> for ids::UserId {
-    fn from(id: UserId) -> Self {
-        ids::UserId(id.0 as u64)
-    }
-}
-impl From<ids::TeamId> for TeamId {
-    fn from(id: ids::TeamId) -> Self {
-        TeamId(id.0 as i64)
-    }
-}
-impl From<TeamId> for ids::TeamId {
-    fn from(id: TeamId) -> Self {
-        ids::TeamId(id.0 as u64)
-    }
-}
-impl From<ids::OrganizationId> for OrganizationId {
-    fn from(id: ids::OrganizationId) -> Self {
-        OrganizationId(id.0 as i64)
-    }
-}
-impl From<OrganizationId> for ids::OrganizationId {
-    fn from(id: OrganizationId) -> Self {
-        ids::OrganizationId(id.0 as u64)
-    }
-}
-impl From<ids::VersionId> for VersionId {
-    fn from(id: ids::VersionId) -> Self {
-        VersionId(id.0 as i64)
-    }
-}
-impl From<VersionId> for ids::VersionId {
-    fn from(id: VersionId) -> Self {
-        ids::VersionId(id.0 as u64)
-    }
-}
-impl From<ids::CollectionId> for CollectionId {
-    fn from(id: ids::CollectionId) -> Self {
-        CollectionId(id.0 as i64)
-    }
-}
-impl From<CollectionId> for ids::CollectionId {
-    fn from(id: CollectionId) -> Self {
-        ids::CollectionId(id.0 as u64)
-    }
-}
-impl From<ids::ReportId> for ReportId {
-    fn from(id: ids::ReportId) -> Self {
-        ReportId(id.0 as i64)
-    }
-}
-impl From<ReportId> for ids::ReportId {
-    fn from(id: ReportId) -> Self {
-        ids::ReportId(id.0 as u64)
-    }
-}
-impl From<ImageId> for ids::ImageId {
-    fn from(id: ImageId) -> Self {
-        ids::ImageId(id.0 as u64)
-    }
-}
-impl From<ids::ImageId> for ImageId {
-    fn from(id: ids::ImageId) -> Self {
-        ImageId(id.0 as i64)
-    }
-}
-impl From<ids::NotificationId> for NotificationId {
-    fn from(id: ids::NotificationId) -> Self {
-        NotificationId(id.0 as i64)
-    }
-}
-impl From<NotificationId> for ids::NotificationId {
-    fn from(id: NotificationId) -> Self {
-        ids::NotificationId(id.0 as u64)
-    }
-}
-impl From<ids::ThreadId> for ThreadId {
-    fn from(id: ids::ThreadId) -> Self {
-        ThreadId(id.0 as i64)
-    }
-}
-impl From<ThreadId> for ids::ThreadId {
-    fn from(id: ThreadId) -> Self {
-        ids::ThreadId(id.0 as u64)
-    }
-}
-impl From<ids::ThreadMessageId> for ThreadMessageId {
-    fn from(id: ids::ThreadMessageId) -> Self {
-        ThreadMessageId(id.0 as i64)
-    }
-}
-impl From<ThreadMessageId> for ids::ThreadMessageId {
-    fn from(id: ThreadMessageId) -> Self {
-        ids::ThreadMessageId(id.0 as u64)
-    }
-}
-impl From<SessionId> for ids::SessionId {
-    fn from(id: SessionId) -> Self {
-        ids::SessionId(id.0 as u64)
-    }
-}
-impl From<PatId> for ids::PatId {
-    fn from(id: PatId) -> Self {
-        ids::PatId(id.0 as u64)
-    }
-}
-impl From<OAuthClientId> for ids::OAuthClientId {
-    fn from(id: OAuthClientId) -> Self {
-        ids::OAuthClientId(id.0 as u64)
-    }
-}
-impl From<ids::OAuthClientId> for OAuthClientId {
-    fn from(id: ids::OAuthClientId) -> Self {
-        Self(id.0 as i64)
-    }
-}
-impl From<OAuthRedirectUriId> for ids::OAuthRedirectUriId {
-    fn from(id: OAuthRedirectUriId) -> Self {
-        ids::OAuthRedirectUriId(id.0 as u64)
-    }
-}
-impl From<OAuthClientAuthorizationId> for ids::OAuthClientAuthorizationId {
-    fn from(id: OAuthClientAuthorizationId) -> Self {
-        ids::OAuthClientAuthorizationId(id.0 as u64)
-    }
-}
-
-impl From<ids::PayoutId> for PayoutId {
-    fn from(id: ids::PayoutId) -> Self {
-        PayoutId(id.0 as i64)
-    }
-}
-impl From<PayoutId> for ids::PayoutId {
-    fn from(id: PayoutId) -> Self {
-        ids::PayoutId(id.0 as u64)
-    }
-}
-
-impl From<ids::ProductId> for ProductId {
-    fn from(id: ids::ProductId) -> Self {
-        ProductId(id.0 as i64)
-    }
-}
-impl From<ProductId> for ids::ProductId {
-    fn from(id: ProductId) -> Self {
-        ids::ProductId(id.0 as u64)
-    }
-}
-impl From<ids::ProductPriceId> for ProductPriceId {
-    fn from(id: ids::ProductPriceId) -> Self {
-        ProductPriceId(id.0 as i64)
-    }
-}
-impl From<ProductPriceId> for ids::ProductPriceId {
-    fn from(id: ProductPriceId) -> Self {
-        ids::ProductPriceId(id.0 as u64)
-    }
-}
-
-impl From<ids::UserSubscriptionId> for UserSubscriptionId {
-    fn from(id: ids::UserSubscriptionId) -> Self {
-        UserSubscriptionId(id.0 as i64)
-    }
-}
-impl From<UserSubscriptionId> for ids::UserSubscriptionId {
-    fn from(id: UserSubscriptionId) -> Self {
-        ids::UserSubscriptionId(id.0 as u64)
-    }
-}
-
-impl From<ids::ChargeId> for ChargeId {
-    fn from(id: ids::ChargeId) -> Self {
-        ChargeId(id.0 as i64)
-    }
-}
-impl From<ChargeId> for ids::ChargeId {
-    fn from(id: ChargeId) -> Self {
-        ids::ChargeId(id.0 as u64)
-    }
-}
+short_id_type!(CategoryId);
+short_id_type!(GameId);
+short_id_type!(LinkPlatformId);
+short_id_type!(LoaderFieldEnumId);
+short_id_type!(LoaderFieldEnumValueId);
+short_id_type!(LoaderFieldId);
+short_id_type!(LoaderId);
+short_id_type!(NotificationActionId);
+short_id_type!(ProjectTypeId);
+short_id_type!(ReportTypeId);
+short_id_type!(StatusId);
diff --git a/apps/labrinth/src/database/models/image_item.rs b/apps/labrinth/src/database/models/image_item.rs
index d0ef66ab..d85c0a2d 100644
--- a/apps/labrinth/src/database/models/image_item.rs
+++ b/apps/labrinth/src/database/models/image_item.rs
@@ -8,24 +8,24 @@ use serde::{Deserialize, Serialize};
 const IMAGES_NAMESPACE: &str = "images";
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Image {
-    pub id: ImageId,
+pub struct DBImage {
+    pub id: DBImageId,
     pub url: String,
     pub raw_url: String,
     pub size: u64,
     pub created: DateTime<Utc>,
-    pub owner_id: UserId,
+    pub owner_id: DBUserId,
 
     // context it is associated with
     pub context: String,
 
-    pub project_id: Option<ProjectId>,
-    pub version_id: Option<VersionId>,
-    pub thread_message_id: Option<ThreadMessageId>,
-    pub report_id: Option<ReportId>,
+    pub project_id: Option<DBProjectId>,
+    pub version_id: Option<DBVersionId>,
+    pub thread_message_id: Option<DBThreadMessageId>,
+    pub report_id: Option<DBReportId>,
 }
 
-impl Image {
+impl DBImage {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -39,12 +39,12 @@ impl Image {
                 $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11
             );
             ",
-            self.id as ImageId,
+            self.id as DBImageId,
             self.url,
             self.raw_url,
             self.size as i64,
             self.created,
-            self.owner_id as UserId,
+            self.owner_id as DBUserId,
             self.context,
             self.project_id.map(|x| x.0),
             self.version_id.map(|x| x.0),
@@ -58,7 +58,7 @@ impl Image {
     }
 
     pub async fn remove(
-        id: ImageId,
+        id: DBImageId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
@@ -70,12 +70,12 @@ impl Image {
                 DELETE FROM uploaded_images
                 WHERE id = $1
                 ",
-                id as ImageId,
+                id as DBImageId,
             )
             .execute(&mut **transaction)
             .await?;
 
-            Image::clear_cache(image.id, redis).await?;
+            DBImage::clear_cache(image.id, redis).await?;
 
             Ok(Some(()))
         } else {
@@ -86,7 +86,7 @@ impl Image {
     pub async fn get_many_contexted(
         context: ImageContext,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<Vec<Image>, sqlx::Error> {
+    ) -> Result<Vec<DBImage>, sqlx::Error> {
         // Set all of project_id, version_id, thread_message_id, report_id to None
         // Then set the one that is relevant to Some
 
@@ -98,22 +98,22 @@ impl Image {
             ImageContext::Project {
                 project_id: Some(id),
             } => {
-                project_id = Some(ProjectId::from(id));
+                project_id = Some(DBProjectId::from(id));
             }
             ImageContext::Version {
                 version_id: Some(id),
             } => {
-                version_id = Some(VersionId::from(id));
+                version_id = Some(DBVersionId::from(id));
             }
             ImageContext::ThreadMessage {
                 thread_message_id: Some(id),
             } => {
-                thread_message_id = Some(ThreadMessageId::from(id));
+                thread_message_id = Some(DBThreadMessageId::from(id));
             }
             ImageContext::Report {
                 report_id: Some(id),
             } => {
-                report_id = Some(ReportId::from(id));
+                report_id = Some(DBReportId::from(id));
             }
             _ => {}
         }
@@ -139,44 +139,44 @@ impl Image {
         )
         .fetch(&mut **transaction)
         .map_ok(|row| {
-            let id = ImageId(row.id);
+            let id = DBImageId(row.id);
 
-            Image {
+            DBImage {
                 id,
                 url: row.url,
                 raw_url: row.raw_url,
                 size: row.size as u64,
                 created: row.created,
-                owner_id: UserId(row.owner_id),
+                owner_id: DBUserId(row.owner_id),
                 context: row.context,
-                project_id: row.mod_id.map(ProjectId),
-                version_id: row.version_id.map(VersionId),
-                thread_message_id: row.thread_message_id.map(ThreadMessageId),
-                report_id: row.report_id.map(ReportId),
+                project_id: row.mod_id.map(DBProjectId),
+                version_id: row.version_id.map(DBVersionId),
+                thread_message_id: row.thread_message_id.map(DBThreadMessageId),
+                report_id: row.report_id.map(DBReportId),
             }
         })
-        .try_collect::<Vec<Image>>()
+        .try_collect::<Vec<DBImage>>()
         .await
     }
 
     pub async fn get<'a, 'b, E>(
-        id: ImageId,
+        id: DBImageId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<Image>, DatabaseError>
+    ) -> Result<Option<DBImage>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        Image::get_many(&[id], executor, redis)
+        DBImage::get_many(&[id], executor, redis)
             .await
             .map(|x| x.into_iter().next())
     }
 
     pub async fn get_many<'a, E>(
-        image_ids: &[ImageId],
+        image_ids: &[DBImageId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<Image>, DatabaseError>
+    ) -> Result<Vec<DBImage>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -197,18 +197,18 @@ impl Image {
                 )
                     .fetch(exec)
                     .try_fold(DashMap::new(), |acc, i| {
-                        let img = Image {
-                            id: ImageId(i.id),
+                        let img = DBImage {
+                            id: DBImageId(i.id),
                             url: i.url,
                             raw_url: i.raw_url,
                             size: i.size as u64,
                             created: i.created,
-                            owner_id: UserId(i.owner_id),
+                            owner_id: DBUserId(i.owner_id),
                             context: i.context,
-                            project_id: i.mod_id.map(ProjectId),
-                            version_id: i.version_id.map(VersionId),
-                            thread_message_id: i.thread_message_id.map(ThreadMessageId),
-                            report_id: i.report_id.map(ReportId),
+                            project_id: i.mod_id.map(DBProjectId),
+                            version_id: i.version_id.map(DBVersionId),
+                            thread_message_id: i.thread_message_id.map(DBThreadMessageId),
+                            report_id: i.report_id.map(DBReportId),
                         };
 
                         acc.insert(i.id, img);
@@ -224,7 +224,7 @@ impl Image {
     }
 
     pub async fn clear_cache(
-        id: ImageId,
+        id: DBImageId,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
diff --git a/apps/labrinth/src/database/models/legacy_loader_fields.rs b/apps/labrinth/src/database/models/legacy_loader_fields.rs
index e7fa7614..b2f8a5b2 100644
--- a/apps/labrinth/src/database/models/legacy_loader_fields.rs
+++ b/apps/labrinth/src/database/models/legacy_loader_fields.rs
@@ -12,10 +12,10 @@ use serde_json::json;
 use crate::database::redis::RedisPool;
 
 use super::{
+    DatabaseError, LoaderFieldEnumValueId,
     loader_fields::{
         LoaderFieldEnum, LoaderFieldEnumValue, VersionField, VersionFieldValue,
     },
-    DatabaseError, LoaderFieldEnumValueId,
 };
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
@@ -103,8 +103,7 @@ impl MinecraftGameVersion {
             }
             _ => {
                 return Err(DatabaseError::SchemaError(format!(
-                    "Game version requires field value to be an enum: {:?}",
-                    version_field
+                    "Game version requires field value to be an enum: {version_field:?}"
                 )));
             }
         };
diff --git a/apps/labrinth/src/database/models/loader_fields.rs b/apps/labrinth/src/database/models/loader_fields.rs
index 8d10dacb..fcfcd959 100644
--- a/apps/labrinth/src/database/models/loader_fields.rs
+++ b/apps/labrinth/src/database/models/loader_fields.rs
@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 use std::hash::Hasher;
 
-use super::ids::*;
 use super::DatabaseError;
+use super::ids::*;
 use crate::database::redis::RedisPool;
 use chrono::DateTime;
 use chrono::Utc;
@@ -153,7 +153,7 @@ impl Loader {
             SELECT l.id id, l.loader loader, l.icon icon, l.metadata metadata,
             ARRAY_AGG(DISTINCT pt.name) filter (where pt.name is not null) project_types,
             ARRAY_AGG(DISTINCT g.slug) filter (where g.slug is not null) games
-            FROM loaders l            
+            FROM loaders l
             LEFT OUTER JOIN loaders_project_types lpt ON joining_loader_id = l.id
             LEFT OUTER JOIN project_types pt ON lpt.joining_project_type_id = pt.id
             LEFT OUTER JOIN loaders_project_types_games lptg ON lptg.loader_id = lpt.joining_loader_id AND lptg.project_type_id = lpt.joining_project_type_id
@@ -293,7 +293,7 @@ impl std::hash::Hash for LoaderFieldEnumValue {
 
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Hash)]
 pub struct VersionField {
-    pub version_id: VersionId,
+    pub version_id: DBVersionId,
     pub field_id: LoaderFieldId,
     pub field_name: String,
     pub value: VersionFieldValue,
@@ -312,7 +312,7 @@ pub enum VersionFieldValue {
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct QueryVersionField {
-    pub version_id: VersionId,
+    pub version_id: DBVersionId,
     pub field_id: LoaderFieldId,
     pub int_value: Option<i32>,
     pub enum_value: Option<LoaderFieldEnumValueId>,
@@ -524,7 +524,7 @@ impl LoaderFieldEnum {
 
         let result = sqlx::query!(
             "
-            SELECT lfe.id, lfe.enum_name, lfe.ordering, lfe.hidable 
+            SELECT lfe.id, lfe.enum_name, lfe.ordering, lfe.hidable
             FROM loader_field_enums lfe
             WHERE lfe.enum_name = $1
             ORDER BY lfe.ordering ASC
@@ -781,7 +781,7 @@ impl VersionField {
     }
 
     pub fn check_parse(
-        version_id: VersionId,
+        version_id: DBVersionId,
         loader_field: LoaderField,
         value: serde_json::Value,
         enum_variants: Vec<LoaderFieldEnumValue>,
@@ -1016,8 +1016,8 @@ impl VersionFieldValue {
                             enum_values.push(ev.clone());
                         } else {
                             return Err(format!(
-                            "Provided value '{av}' is not a valid variant for {field_name}"
-                        ));
+                                "Provided value '{av}' is not a valid variant for {field_name}"
+                            ));
                         }
                     }
                     enum_values
@@ -1032,7 +1032,7 @@ impl VersionFieldValue {
         field_type: &LoaderFieldType,
         qvfs: Vec<QueryVersionField>,
         qlfev: &[QueryLoaderFieldEnumValue],
-    ) -> Result<(VersionId, VersionFieldValue), DatabaseError> {
+    ) -> Result<(DBVersionId, VersionFieldValue), DatabaseError> {
         match field_type {
             LoaderFieldType::Integer
             | LoaderFieldType::Text
@@ -1076,12 +1076,11 @@ impl VersionFieldValue {
         field_type: &LoaderFieldType,
         qvfs: Vec<QueryVersionField>,
         qlfev: &[QueryLoaderFieldEnumValue],
-    ) -> Result<Vec<(VersionId, VersionFieldValue)>, DatabaseError> {
+    ) -> Result<Vec<(DBVersionId, VersionFieldValue)>, DatabaseError> {
         let field_name = field_type.to_str();
         let did_not_exist_error = |field_name: &str, desired_field: &str| {
             DatabaseError::SchemaError(format!(
-                "Field name {} for field {} in does not exist",
-                desired_field, field_name
+                "Field name {desired_field} for field {field_name} in does not exist"
             ))
         };
 
@@ -1094,7 +1093,8 @@ impl VersionFieldValue {
         // 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(VersionId(0));
+        let version_id =
+            version_id.into_iter().next().unwrap_or(DBVersionId(0));
 
         let field_id = qvfs
             .iter()
@@ -1103,17 +1103,15 @@ impl VersionFieldValue {
             .collect::<Vec<_>>();
         if field_id.len() > 1 {
             return Err(DatabaseError::SchemaError(format!(
-                "Multiple field ids for field {}",
-                field_name
+                "Multiple field ids for field {field_name}"
             )));
         }
 
-        let mut value =
-            match field_type {
-                // Singleton fields
-                // If there are multiple, we assume multiple versions are being concatenated
-                LoaderFieldType::Integer => qvfs
-                    .into_iter()
+        let mut value = match field_type {
+            // Singleton fields
+            // If there are multiple, we assume multiple versions are being concatenated
+            LoaderFieldType::Integer => {
+                qvfs.into_iter()
                     .map(|qvf| {
                         Ok((
                             qvf.version_id,
@@ -1123,11 +1121,12 @@ impl VersionFieldValue {
                         ))
                     })
                     .collect::<Result<
-                        Vec<(VersionId, VersionFieldValue)>,
+                        Vec<(DBVersionId, VersionFieldValue)>,
                         DatabaseError,
-                    >>()?,
-                LoaderFieldType::Text => qvfs
-                    .into_iter()
+                    >>()?
+            }
+            LoaderFieldType::Text => {
+                qvfs.into_iter()
                     .map(|qvf| {
                         Ok((
                             qvf.version_id,
@@ -1137,11 +1136,12 @@ impl VersionFieldValue {
                         ))
                     })
                     .collect::<Result<
-                        Vec<(VersionId, VersionFieldValue)>,
+                        Vec<(DBVersionId, VersionFieldValue)>,
                         DatabaseError,
-                    >>()?,
-                LoaderFieldType::Boolean => qvfs
-                    .into_iter()
+                    >>()?
+            }
+            LoaderFieldType::Boolean => {
+                qvfs.into_iter()
                     .map(|qvf| {
                         Ok((
                             qvf.version_id,
@@ -1154,11 +1154,12 @@ impl VersionFieldValue {
                         ))
                     })
                     .collect::<Result<
-                        Vec<(VersionId, VersionFieldValue)>,
+                        Vec<(DBVersionId, VersionFieldValue)>,
                         DatabaseError,
-                    >>()?,
-                LoaderFieldType::Enum(id) => qvfs
-                    .into_iter()
+                    >>()?
+            }
+            LoaderFieldType::Enum(id) => {
+                qvfs.into_iter()
                     .map(|qvf| {
                         Ok((
                             qvf.version_id,
@@ -1191,90 +1192,86 @@ impl VersionFieldValue {
                         ))
                     })
                     .collect::<Result<
-                        Vec<(VersionId, VersionFieldValue)>,
+                        Vec<(DBVersionId, VersionFieldValue)>,
                         DatabaseError,
-                    >>()?,
+                    >>()?
+            }
 
-                // Array fields
-                // We concatenate into one array
-                LoaderFieldType::ArrayInteger => vec![(
-                    version_id,
-                    VersionFieldValue::ArrayInteger(
-                        qvfs.into_iter()
-                            .map(|qvf| {
+            // Array fields
+            // We concatenate into one array
+            LoaderFieldType::ArrayInteger => vec![(
+                version_id,
+                VersionFieldValue::ArrayInteger(
+                    qvfs.into_iter()
+                        .map(|qvf| {
+                            qvf.int_value.ok_or(did_not_exist_error(
+                                field_name,
+                                "int_value",
+                            ))
+                        })
+                        .collect::<Result<_, _>>()?,
+                ),
+            )],
+            LoaderFieldType::ArrayText => vec![(
+                version_id,
+                VersionFieldValue::ArrayText(
+                    qvfs.into_iter()
+                        .map(|qvf| {
+                            qvf.string_value.ok_or(did_not_exist_error(
+                                field_name,
+                                "string_value",
+                            ))
+                        })
+                        .collect::<Result<_, _>>()?,
+                ),
+            )],
+            LoaderFieldType::ArrayBoolean => vec![(
+                version_id,
+                VersionFieldValue::ArrayBoolean(
+                    qvfs.into_iter()
+                        .map(|qvf| {
+                            Ok::<bool, DatabaseError>(
                                 qvf.int_value.ok_or(did_not_exist_error(
                                     field_name,
                                     "int_value",
-                                ))
+                                ))? != 0,
+                            )
+                        })
+                        .collect::<Result<_, _>>()?,
+                ),
+            )],
+            LoaderFieldType::ArrayEnum(id) => vec![(
+                version_id,
+                VersionFieldValue::ArrayEnum(
+                    *id,
+                    qvfs.into_iter()
+                        .map(|qvf| {
+                            let enum_id = qvf.enum_value.ok_or(
+                                did_not_exist_error(field_name, "enum_value"),
+                            )?;
+                            let lfev = qlfev
+                                .iter()
+                                .find(|x| x.id == enum_id)
+                                .ok_or(did_not_exist_error(
+                                field_name,
+                                "enum_value",
+                            ))?;
+                            Ok::<_, DatabaseError>(LoaderFieldEnumValue {
+                                id: lfev.id,
+                                enum_id: lfev.enum_id,
+                                value: lfev.value.clone(),
+                                ordering: lfev.ordering,
+                                created: lfev.created,
+                                metadata: lfev
+                                    .metadata
+                                    .clone()
+                                    .unwrap_or_default(),
                             })
-                            .collect::<Result<_, _>>()?,
-                    ),
-                )],
-                LoaderFieldType::ArrayText => vec![(
-                    version_id,
-                    VersionFieldValue::ArrayText(
-                        qvfs.into_iter()
-                            .map(|qvf| {
-                                qvf.string_value.ok_or(did_not_exist_error(
-                                    field_name,
-                                    "string_value",
-                                ))
-                            })
-                            .collect::<Result<_, _>>()?,
-                    ),
-                )],
-                LoaderFieldType::ArrayBoolean => vec![(
-                    version_id,
-                    VersionFieldValue::ArrayBoolean(
-                        qvfs.into_iter()
-                            .map(|qvf| {
-                                Ok::<bool, DatabaseError>(
-                                    qvf.int_value.ok_or(
-                                        did_not_exist_error(
-                                            field_name,
-                                            "int_value",
-                                        ),
-                                    )? != 0,
-                                )
-                            })
-                            .collect::<Result<_, _>>()?,
-                    ),
-                )],
-                LoaderFieldType::ArrayEnum(id) => vec![(
-                    version_id,
-                    VersionFieldValue::ArrayEnum(
-                        *id,
-                        qvfs.into_iter()
-                            .map(|qvf| {
-                                let enum_id = qvf.enum_value.ok_or(
-                                    did_not_exist_error(
-                                        field_name,
-                                        "enum_value",
-                                    ),
-                                )?;
-                                let lfev = qlfev
-                                    .iter()
-                                    .find(|x| x.id == enum_id)
-                                    .ok_or(did_not_exist_error(
-                                        field_name,
-                                        "enum_value",
-                                    ))?;
-                                Ok::<_, DatabaseError>(LoaderFieldEnumValue {
-                                    id: lfev.id,
-                                    enum_id: lfev.enum_id,
-                                    value: lfev.value.clone(),
-                                    ordering: lfev.ordering,
-                                    created: lfev.created,
-                                    metadata: lfev
-                                        .metadata
-                                        .clone()
-                                        .unwrap_or_default(),
-                                })
-                            })
-                            .collect::<Result<_, _>>()?,
-                    ),
-                )],
-            };
+                        })
+                        .collect::<Result<_, _>>()?,
+                ),
+            )],
+        };
 
         // Sort arrayenums by ordering, then by created
         for (_, v) in value.iter_mut() {
diff --git a/apps/labrinth/src/database/models/mod.rs b/apps/labrinth/src/database/models/mod.rs
index 06bf3dc4..20dabaad 100644
--- a/apps/labrinth/src/database/models/mod.rs
+++ b/apps/labrinth/src/database/models/mod.rs
@@ -26,17 +26,17 @@ pub mod user_item;
 pub mod user_subscription_item;
 pub mod version_item;
 
-pub use collection_item::Collection;
+pub use collection_item::DBCollection;
 pub use ids::*;
-pub use image_item::Image;
-pub use oauth_client_item::OAuthClient;
-pub use organization_item::Organization;
-pub use project_item::Project;
-pub use team_item::Team;
-pub use team_item::TeamMember;
-pub use thread_item::{Thread, ThreadMessage};
-pub use user_item::User;
-pub use version_item::Version;
+pub use image_item::DBImage;
+pub use oauth_client_item::DBOAuthClient;
+pub use organization_item::DBOrganization;
+pub use project_item::DBProject;
+pub use team_item::DBTeam;
+pub use team_item::DBTeamMember;
+pub use thread_item::{DBThread, DBThreadMessage};
+pub use user_item::DBUser;
+pub use version_item::DBVersion;
 
 #[derive(Error, Debug)]
 pub enum DatabaseError {
diff --git a/apps/labrinth/src/database/models/notification_item.rs b/apps/labrinth/src/database/models/notification_item.rs
index 5fda4a80..e50f1ada 100644
--- a/apps/labrinth/src/database/models/notification_item.rs
+++ b/apps/labrinth/src/database/models/notification_item.rs
@@ -12,18 +12,18 @@ pub struct NotificationBuilder {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct Notification {
-    pub id: NotificationId,
-    pub user_id: UserId,
+pub struct DBNotification {
+    pub id: DBNotificationId,
+    pub user_id: DBUserId,
     pub body: NotificationBody,
     pub read: bool,
     pub created: DateTime<Utc>,
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct NotificationAction {
+pub struct DBNotificationAction {
     pub id: NotificationActionId,
-    pub notification_id: NotificationId,
+    pub notification_id: DBNotificationId,
     pub name: String,
     pub action_route_method: String,
     pub action_route: String,
@@ -32,7 +32,7 @@ pub struct NotificationAction {
 impl NotificationBuilder {
     pub async fn insert(
         &self,
-        user: UserId,
+        user: DBUserId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
@@ -41,7 +41,7 @@ impl NotificationBuilder {
 
     pub async fn insert_many(
         &self,
-        users: Vec<UserId>,
+        users: Vec<DBUserId>,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
@@ -72,15 +72,15 @@ impl NotificationBuilder {
         .execute(&mut **transaction)
         .await?;
 
-        Notification::clear_user_notifications_cache(&users, redis).await?;
+        DBNotification::clear_user_notifications_cache(&users, redis).await?;
 
         Ok(())
     }
 }
 
-impl Notification {
+impl DBNotification {
     pub async fn get<'a, 'b, E>(
-        id: NotificationId,
+        id: DBNotificationId,
         executor: E,
     ) -> Result<Option<Self>, sqlx::error::Error>
     where
@@ -92,9 +92,9 @@ impl Notification {
     }
 
     pub async fn get_many<'a, E>(
-        notification_ids: &[NotificationId],
+        notification_ids: &[DBNotificationId],
         exec: E,
-    ) -> Result<Vec<Notification>, sqlx::Error>
+    ) -> Result<Vec<DBNotification>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -114,11 +114,11 @@ impl Notification {
         )
             .fetch(exec)
             .map_ok(|row| {
-                let id = NotificationId(row.id);
+                let id = DBNotificationId(row.id);
 
-                Notification {
+                DBNotification {
                     id,
-                    user_id: UserId(row.user_id),
+                    user_id: DBUserId(row.user_id),
                     read: row.read,
                     created: row.created,
                     body: row.body.clone().and_then(|x| serde_json::from_value(x).ok()).unwrap_or_else(|| {
@@ -140,21 +140,21 @@ impl Notification {
                     }),
                 }
             })
-            .try_collect::<Vec<Notification>>()
+            .try_collect::<Vec<DBNotification>>()
             .await
     }
 
     pub async fn get_many_user<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<Notification>, DatabaseError>
+    ) -> Result<Vec<DBNotification>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
         let mut redis = redis.connect().await?;
 
-        let cached_notifications: Option<Vec<Notification>> = redis
+        let cached_notifications: Option<Vec<DBNotification>> = redis
             .get_deserialized_from_json(
                 USER_NOTIFICATIONS_NAMESPACE,
                 &user_id.0.to_string(),
@@ -174,15 +174,15 @@ impl Notification {
             WHERE n.user_id = $1
             GROUP BY n.id, n.user_id;
             ",
-            user_id as UserId
+            user_id as DBUserId
         )
             .fetch(exec)
             .map_ok(|row| {
-                let id = NotificationId(row.id);
+                let id = DBNotificationId(row.id);
 
-                Notification {
+                DBNotification {
                     id,
-                    user_id: UserId(row.user_id),
+                    user_id: DBUserId(row.user_id),
                     read: row.read,
                     created: row.created,
                     body: row.body.clone().and_then(|x| serde_json::from_value(x).ok()).unwrap_or_else(|| {
@@ -204,7 +204,7 @@ impl Notification {
                     }),
                 }
             })
-            .try_collect::<Vec<Notification>>()
+            .try_collect::<Vec<DBNotification>>()
             .await?;
 
         redis
@@ -220,7 +220,7 @@ impl Notification {
     }
 
     pub async fn read(
-        id: NotificationId,
+        id: DBNotificationId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
@@ -228,7 +228,7 @@ impl Notification {
     }
 
     pub async fn read_many(
-        notification_ids: &[NotificationId],
+        notification_ids: &[DBNotificationId],
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
@@ -245,11 +245,11 @@ impl Notification {
             &notification_ids_parsed
         )
         .fetch(&mut **transaction)
-        .map_ok(|x| UserId(x.user_id))
+        .map_ok(|x| DBUserId(x.user_id))
         .try_collect::<Vec<_>>()
         .await?;
 
-        Notification::clear_user_notifications_cache(
+        DBNotification::clear_user_notifications_cache(
             affected_users.iter(),
             redis,
         )
@@ -259,7 +259,7 @@ impl Notification {
     }
 
     pub async fn remove(
-        id: NotificationId,
+        id: DBNotificationId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
@@ -267,7 +267,7 @@ impl Notification {
     }
 
     pub async fn remove_many(
-        notification_ids: &[NotificationId],
+        notification_ids: &[DBNotificationId],
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
@@ -293,11 +293,11 @@ impl Notification {
             &notification_ids_parsed
         )
         .fetch(&mut **transaction)
-        .map_ok(|x| UserId(x.user_id))
+        .map_ok(|x| DBUserId(x.user_id))
         .try_collect::<Vec<_>>()
         .await?;
 
-        Notification::clear_user_notifications_cache(
+        DBNotification::clear_user_notifications_cache(
             affected_users.iter(),
             redis,
         )
@@ -307,7 +307,7 @@ impl Notification {
     }
 
     pub async fn clear_user_notifications_cache(
-        user_ids: impl IntoIterator<Item = &UserId>,
+        user_ids: impl IntoIterator<Item = &DBUserId>,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
diff --git a/apps/labrinth/src/database/models/oauth_client_authorization_item.rs b/apps/labrinth/src/database/models/oauth_client_authorization_item.rs
index 617e6fcd..cc47344f 100644
--- a/apps/labrinth/src/database/models/oauth_client_authorization_item.rs
+++ b/apps/labrinth/src/database/models/oauth_client_authorization_item.rs
@@ -4,18 +4,20 @@ use serde::{Deserialize, Serialize};
 
 use crate::models::pats::Scopes;
 
-use super::{DatabaseError, OAuthClientAuthorizationId, OAuthClientId, UserId};
+use super::{
+    DBOAuthClientAuthorizationId, DBOAuthClientId, DBUserId, DatabaseError,
+};
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct OAuthClientAuthorization {
-    pub id: OAuthClientAuthorizationId,
-    pub client_id: OAuthClientId,
-    pub user_id: UserId,
+pub struct DBOAuthClientAuthorization {
+    pub id: DBOAuthClientAuthorizationId,
+    pub client_id: DBOAuthClientId,
+    pub user_id: DBUserId,
     pub scopes: Scopes,
     pub created: DateTime<Utc>,
 }
 
-struct AuthorizationQueryResult {
+struct DBAuthClientAuthorizationQueryResult {
     id: i64,
     client_id: i64,
     user_id: i64,
@@ -23,26 +25,26 @@ struct AuthorizationQueryResult {
     created: DateTime<Utc>,
 }
 
-impl From<AuthorizationQueryResult> for OAuthClientAuthorization {
-    fn from(value: AuthorizationQueryResult) -> Self {
-        OAuthClientAuthorization {
-            id: OAuthClientAuthorizationId(value.id),
-            client_id: OAuthClientId(value.client_id),
-            user_id: UserId(value.user_id),
+impl From<DBAuthClientAuthorizationQueryResult> for DBOAuthClientAuthorization {
+    fn from(value: DBAuthClientAuthorizationQueryResult) -> Self {
+        DBOAuthClientAuthorization {
+            id: DBOAuthClientAuthorizationId(value.id),
+            client_id: DBOAuthClientId(value.client_id),
+            user_id: DBUserId(value.user_id),
             scopes: Scopes::from_postgres(value.scopes),
             created: value.created,
         }
     }
 }
 
-impl OAuthClientAuthorization {
+impl DBOAuthClientAuthorization {
     pub async fn get(
-        client_id: OAuthClientId,
-        user_id: UserId,
+        client_id: DBOAuthClientId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<OAuthClientAuthorization>, DatabaseError> {
+    ) -> Result<Option<DBOAuthClientAuthorization>, DatabaseError> {
         let value = sqlx::query_as!(
-            AuthorizationQueryResult,
+            DBAuthClientAuthorizationQueryResult,
             "
             SELECT id, client_id, user_id, scopes, created
             FROM oauth_client_authorizations
@@ -58,11 +60,11 @@ impl OAuthClientAuthorization {
     }
 
     pub async fn get_all_for_user(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<OAuthClientAuthorization>, DatabaseError> {
+    ) -> Result<Vec<DBOAuthClientAuthorization>, DatabaseError> {
         let results = sqlx::query_as!(
-            AuthorizationQueryResult,
+            DBAuthClientAuthorizationQueryResult,
             "
             SELECT id, client_id, user_id, scopes, created
             FROM oauth_client_authorizations
@@ -77,9 +79,9 @@ impl OAuthClientAuthorization {
     }
 
     pub async fn upsert(
-        id: OAuthClientAuthorizationId,
-        client_id: OAuthClientId,
-        user_id: UserId,
+        id: DBOAuthClientAuthorizationId,
+        client_id: DBOAuthClientId,
+        user_id: DBUserId,
         scopes: Scopes,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
@@ -106,8 +108,8 @@ impl OAuthClientAuthorization {
     }
 
     pub async fn remove(
-        client_id: OAuthClientId,
-        user_id: UserId,
+        client_id: DBOAuthClientId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         sqlx::query!(
diff --git a/apps/labrinth/src/database/models/oauth_client_item.rs b/apps/labrinth/src/database/models/oauth_client_item.rs
index 820f28ce..faaeb5ee 100644
--- a/apps/labrinth/src/database/models/oauth_client_item.rs
+++ b/apps/labrinth/src/database/models/oauth_client_item.rs
@@ -3,32 +3,32 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use sha2::Digest;
 
-use super::{DatabaseError, OAuthClientId, OAuthRedirectUriId, UserId};
+use super::{DBOAuthClientId, DBOAuthRedirectUriId, DBUserId, DatabaseError};
 use crate::models::pats::Scopes;
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct OAuthRedirectUri {
-    pub id: OAuthRedirectUriId,
-    pub client_id: OAuthClientId,
+pub struct DBOAuthRedirectUri {
+    pub id: DBOAuthRedirectUriId,
+    pub client_id: DBOAuthClientId,
     pub uri: String,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct OAuthClient {
-    pub id: OAuthClientId,
+pub struct DBOAuthClient {
+    pub id: DBOAuthClientId,
     pub name: String,
     pub icon_url: Option<String>,
     pub raw_icon_url: Option<String>,
     pub max_scopes: Scopes,
     pub secret_hash: String,
-    pub redirect_uris: Vec<OAuthRedirectUri>,
+    pub redirect_uris: Vec<DBOAuthRedirectUri>,
     pub created: DateTime<Utc>,
-    pub created_by: UserId,
+    pub created_by: DBUserId,
     pub url: Option<String>,
     pub description: Option<String>,
 }
 
-struct ClientQueryResult {
+struct OAuthClientQueryResult {
     id: i64,
     name: String,
     icon_url: Option<String>,
@@ -49,7 +49,7 @@ macro_rules! select_clients_with_predicate {
         // the combination of the JOIN and filter using ANY makes sqlx think all columns are nullable
         // https://docs.rs/sqlx/latest/sqlx/macro.query.html#force-nullable
         sqlx::query_as!(
-            ClientQueryResult,
+            OAuthClientQueryResult,
             r#"
             SELECT
                 clients.id as "id!",
@@ -77,18 +77,18 @@ macro_rules! select_clients_with_predicate {
     };
 }
 
-impl OAuthClient {
+impl DBOAuthClient {
     pub async fn get(
-        id: OAuthClientId,
+        id: DBOAuthClientId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<OAuthClient>, DatabaseError> {
+    ) -> Result<Option<DBOAuthClient>, DatabaseError> {
         Ok(Self::get_many(&[id], exec).await?.into_iter().next())
     }
 
     pub async fn get_many(
-        ids: &[OAuthClientId],
+        ids: &[DBOAuthClientId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<OAuthClient>, DatabaseError> {
+    ) -> Result<Vec<DBOAuthClient>, DatabaseError> {
         let ids = ids.iter().map(|id| id.0).collect_vec();
         let ids_ref: &[i64] = &ids;
         let results = select_clients_with_predicate!(
@@ -102,9 +102,9 @@ impl OAuthClient {
     }
 
     pub async fn get_all_user_clients(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<OAuthClient>, DatabaseError> {
+    ) -> Result<Vec<DBOAuthClient>, DatabaseError> {
         let user_id_param = user_id.0;
         let clients = select_clients_with_predicate!(
             "WHERE created_by = $1",
@@ -117,7 +117,7 @@ impl OAuthClient {
     }
 
     pub async fn remove(
-        id: OAuthClientId,
+        id: DBOAuthClientId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         // Cascades to oauth_client_redirect_uris, oauth_client_authorizations
@@ -189,7 +189,7 @@ impl OAuthClient {
     }
 
     pub async fn remove_redirect_uris(
-        ids: impl IntoIterator<Item = OAuthRedirectUriId>,
+        ids: impl IntoIterator<Item = DBOAuthRedirectUriId>,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         let ids = ids.into_iter().map(|id| id.0).collect_vec();
@@ -208,7 +208,7 @@ impl OAuthClient {
     }
 
     pub async fn insert_redirect_uris(
-        uris: &[OAuthRedirectUri],
+        uris: &[DBOAuthRedirectUri],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         let (ids, client_ids, uris): (Vec<_>, Vec<_>, Vec<_>) = uris
@@ -235,16 +235,16 @@ impl OAuthClient {
     }
 }
 
-impl From<ClientQueryResult> for OAuthClient {
-    fn from(r: ClientQueryResult) -> Self {
+impl From<OAuthClientQueryResult> for DBOAuthClient {
+    fn from(r: OAuthClientQueryResult) -> Self {
         let redirects = if let (Some(ids), Some(uris)) =
             (r.uri_ids.as_ref(), r.uri_vals.as_ref())
         {
             ids.iter()
                 .zip(uris.iter())
-                .map(|(id, uri)| OAuthRedirectUri {
-                    id: OAuthRedirectUriId(*id),
-                    client_id: OAuthClientId(r.id),
+                .map(|(id, uri)| DBOAuthRedirectUri {
+                    id: DBOAuthRedirectUriId(*id),
+                    client_id: DBOAuthClientId(r.id),
                     uri: uri.to_string(),
                 })
                 .collect()
@@ -252,8 +252,8 @@ impl From<ClientQueryResult> for OAuthClient {
             vec![]
         };
 
-        OAuthClient {
-            id: OAuthClientId(r.id),
+        DBOAuthClient {
+            id: DBOAuthClientId(r.id),
             name: r.name,
             icon_url: r.icon_url,
             raw_icon_url: r.raw_icon_url,
@@ -261,7 +261,7 @@ impl From<ClientQueryResult> for OAuthClient {
             secret_hash: r.secret_hash,
             redirect_uris: redirects,
             created: r.created,
-            created_by: UserId(r.created_by),
+            created_by: DBUserId(r.created_by),
             url: r.url,
             description: r.description,
         }
diff --git a/apps/labrinth/src/database/models/oauth_token_item.rs b/apps/labrinth/src/database/models/oauth_token_item.rs
index 9c35a590..2196cc8a 100644
--- a/apps/labrinth/src/database/models/oauth_token_item.rs
+++ b/apps/labrinth/src/database/models/oauth_token_item.rs
@@ -1,6 +1,6 @@
 use super::{
-    DatabaseError, OAuthAccessTokenId, OAuthClientAuthorizationId,
-    OAuthClientId, UserId,
+    DBOAuthAccessTokenId, DBOAuthClientAuthorizationId, DBOAuthClientId,
+    DBUserId, DatabaseError,
 };
 use crate::models::pats::Scopes;
 use chrono::{DateTime, Utc};
@@ -8,9 +8,9 @@ use serde::{Deserialize, Serialize};
 use sha2::Digest;
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct OAuthAccessToken {
-    pub id: OAuthAccessTokenId,
-    pub authorization_id: OAuthClientAuthorizationId,
+pub struct DBOAuthAccessToken {
+    pub id: DBOAuthAccessTokenId,
+    pub authorization_id: DBOAuthClientAuthorizationId,
     pub token_hash: String,
     pub scopes: Scopes,
     pub created: DateTime<Utc>,
@@ -18,15 +18,15 @@ pub struct OAuthAccessToken {
     pub last_used: Option<DateTime<Utc>>,
 
     // Stored separately inside oauth_client_authorizations table
-    pub client_id: OAuthClientId,
-    pub user_id: UserId,
+    pub client_id: DBOAuthClientId,
+    pub user_id: DBUserId,
 }
 
-impl OAuthAccessToken {
+impl DBOAuthAccessToken {
     pub async fn get(
         token_hash: String,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<OAuthAccessToken>, DatabaseError> {
+    ) -> Result<Option<DBOAuthAccessToken>, DatabaseError> {
         let value = sqlx::query!(
             "
             SELECT
@@ -49,16 +49,16 @@ impl OAuthAccessToken {
         .fetch_optional(exec)
         .await?;
 
-        Ok(value.map(|r| OAuthAccessToken {
-            id: OAuthAccessTokenId(r.id),
-            authorization_id: OAuthClientAuthorizationId(r.authorization_id),
+        Ok(value.map(|r| DBOAuthAccessToken {
+            id: DBOAuthAccessTokenId(r.id),
+            authorization_id: DBOAuthClientAuthorizationId(r.authorization_id),
             token_hash: r.token_hash,
             scopes: Scopes::from_postgres(r.scopes),
             created: r.created,
             expires: r.expires,
             last_used: r.last_used,
-            client_id: OAuthClientId(r.client_id),
-            user_id: UserId(r.user_id),
+            client_id: DBOAuthClientId(r.client_id),
+            user_id: DBUserId(r.user_id),
         }))
     }
 
diff --git a/apps/labrinth/src/database/models/organization_item.rs b/apps/labrinth/src/database/models/organization_item.rs
index 32c779f5..30922bf2 100644
--- a/apps/labrinth/src/database/models/organization_item.rs
+++ b/apps/labrinth/src/database/models/organization_item.rs
@@ -5,7 +5,7 @@ use futures::TryStreamExt;
 use std::fmt::{Debug, Display};
 use std::hash::Hash;
 
-use super::{ids::*, TeamMember};
+use super::{DBTeamMember, ids::*};
 use serde::{Deserialize, Serialize};
 
 const ORGANIZATIONS_NAMESPACE: &str = "organizations";
@@ -13,9 +13,9 @@ const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles";
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
 /// An organization of users who together control one or more projects and organizations.
-pub struct Organization {
+pub struct DBOrganization {
     /// The id of the organization
-    pub id: OrganizationId,
+    pub id: DBOrganizationId,
 
     /// The slug of the organization
     pub slug: String,
@@ -24,7 +24,7 @@ pub struct Organization {
     pub name: String,
 
     /// The associated team of the organization
-    pub team_id: TeamId,
+    pub team_id: DBTeamId,
 
     /// The description of the organization
     pub description: String,
@@ -35,7 +35,7 @@ pub struct Organization {
     pub color: Option<u32>,
 }
 
-impl Organization {
+impl DBOrganization {
     pub async fn insert(
         self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -48,7 +48,7 @@ impl Organization {
             self.id.0,
             self.slug,
             self.name,
-            self.team_id as TeamId,
+            self.team_id as DBTeamId,
             self.description,
             self.icon_url,
             self.raw_icon_url,
@@ -74,7 +74,7 @@ impl Organization {
     }
 
     pub async fn get_id<'a, 'b, E>(
-        id: OrganizationId,
+        id: DBOrganizationId,
         exec: E,
         redis: &RedisPool,
     ) -> Result<Option<Self>, super::DatabaseError>
@@ -87,7 +87,7 @@ impl Organization {
     }
 
     pub async fn get_many_ids<'a, 'b, E>(
-        organization_ids: &[OrganizationId],
+        organization_ids: &[DBOrganizationId],
         exec: E,
         redis: &RedisPool,
     ) -> Result<Vec<Self>, super::DatabaseError>
@@ -142,11 +142,11 @@ impl Organization {
                     )
                     .fetch(exec)
                     .try_fold(DashMap::new(), |acc, m| {
-                        let org = Organization {
-                            id: OrganizationId(m.id),
+                        let org = DBOrganization {
+                            id: DBOrganizationId(m.id),
                             slug: m.slug.clone(),
                             name: m.name,
-                            team_id: TeamId(m.team_id),
+                            team_id: DBTeamId(m.team_id),
                             description: m.description,
                             icon_url: m.icon_url,
                             raw_icon_url: m.raw_icon_url,
@@ -168,7 +168,7 @@ impl Organization {
 
     // Gets organization associated with a project ID, if it exists and there is one
     pub async fn get_associated_organization_project_id<'a, 'b, E>(
-        project_id: ProjectId,
+        project_id: DBProjectId,
         exec: E,
     ) -> Result<Option<Self>, super::DatabaseError>
     where
@@ -182,17 +182,17 @@ impl Organization {
             WHERE m.id = $1
             GROUP BY o.id;
             ",
-            project_id as ProjectId,
+            project_id as DBProjectId,
         )
         .fetch_optional(exec)
         .await?;
 
         if let Some(result) = result {
-            Ok(Some(Organization {
-                id: OrganizationId(result.id),
+            Ok(Some(DBOrganization {
+                id: DBOrganizationId(result.id),
                 slug: result.slug,
                 name: result.name,
-                team_id: TeamId(result.team_id),
+                team_id: DBTeamId(result.team_id),
                 description: result.description,
                 icon_url: result.icon_url,
                 raw_icon_url: result.raw_icon_url,
@@ -204,7 +204,7 @@ impl Organization {
     }
 
     pub async fn remove(
-        id: OrganizationId,
+        id: DBOrganizationId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, super::DatabaseError> {
@@ -216,19 +216,19 @@ impl Organization {
                 DELETE FROM organizations
                 WHERE id = $1
                 ",
-                id as OrganizationId,
+                id as DBOrganizationId,
             )
             .execute(&mut **transaction)
             .await?;
 
-            TeamMember::clear_cache(organization.team_id, redis).await?;
+            DBTeamMember::clear_cache(organization.team_id, redis).await?;
 
             sqlx::query!(
                 "
                 DELETE FROM team_members
                 WHERE team_id = $1
                 ",
-                organization.team_id as TeamId,
+                organization.team_id as DBTeamId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -238,7 +238,7 @@ impl Organization {
                 DELETE FROM teams
                 WHERE id = $1
                 ",
-                organization.team_id as TeamId,
+                organization.team_id as DBTeamId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -250,7 +250,7 @@ impl Organization {
     }
 
     pub async fn clear_cache(
-        id: OrganizationId,
+        id: DBOrganizationId,
         slug: Option<String>,
         redis: &RedisPool,
     ) -> Result<(), super::DatabaseError> {
diff --git a/apps/labrinth/src/database/models/pat_item.rs b/apps/labrinth/src/database/models/pat_item.rs
index f389cce9..6cf30821 100644
--- a/apps/labrinth/src/database/models/pat_item.rs
+++ b/apps/labrinth/src/database/models/pat_item.rs
@@ -15,18 +15,18 @@ const PATS_TOKENS_NAMESPACE: &str = "pats_tokens";
 const PATS_USERS_NAMESPACE: &str = "pats_users";
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct PersonalAccessToken {
-    pub id: PatId,
+pub struct DBPersonalAccessToken {
+    pub id: DBPatId,
     pub name: String,
     pub access_token: String,
     pub scopes: Scopes,
-    pub user_id: UserId,
+    pub user_id: DBUserId,
     pub created: DateTime<Utc>,
     pub expires: DateTime<Utc>,
     pub last_used: Option<DateTime<Utc>>,
 }
 
-impl PersonalAccessToken {
+impl DBPersonalAccessToken {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -42,11 +42,11 @@ impl PersonalAccessToken {
                 $6
             )
             ",
-            self.id as PatId,
+            self.id as DBPatId,
             self.name,
             self.access_token,
             self.scopes.bits() as i64,
-            self.user_id as UserId,
+            self.user_id as DBUserId,
             self.expires
         )
         .execute(&mut **transaction)
@@ -63,7 +63,7 @@ impl PersonalAccessToken {
         id: T,
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Option<PersonalAccessToken>, DatabaseError>
+    ) -> Result<Option<DBPersonalAccessToken>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -73,10 +73,10 @@ impl PersonalAccessToken {
     }
 
     pub async fn get_many_ids<'a, E>(
-        pat_ids: &[PatId],
+        pat_ids: &[DBPatId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<PersonalAccessToken>, DatabaseError>
+    ) -> Result<Vec<DBPersonalAccessToken>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -84,7 +84,7 @@ impl PersonalAccessToken {
             .iter()
             .map(|x| crate::models::ids::PatId::from(*x))
             .collect::<Vec<_>>();
-        PersonalAccessToken::get_many(&ids, exec, redis).await
+        DBPersonalAccessToken::get_many(&ids, exec, redis).await
     }
 
     pub async fn get_many<
@@ -95,7 +95,7 @@ impl PersonalAccessToken {
         pat_strings: &[T],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<PersonalAccessToken>, DatabaseError>
+    ) -> Result<Vec<DBPersonalAccessToken>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -125,12 +125,12 @@ impl PersonalAccessToken {
                     )
                     .fetch(exec)
                     .try_fold(DashMap::new(), |acc, x| {
-                        let pat = PersonalAccessToken {
-                            id: PatId(x.id),
+                        let pat = DBPersonalAccessToken {
+                            id: DBPatId(x.id),
                             name: x.name,
                             access_token: x.access_token.clone(),
                             scopes: Scopes::from_bits(x.scopes as u64).unwrap_or(Scopes::NONE),
-                            user_id: UserId(x.user_id),
+                            user_id: DBUserId(x.user_id),
                             created: x.created,
                             expires: x.expires,
                             last_used: x.last_used,
@@ -149,10 +149,10 @@ impl PersonalAccessToken {
     }
 
     pub async fn get_user_pats<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<PatId>, DatabaseError>
+    ) -> Result<Vec<DBPatId>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -166,10 +166,10 @@ impl PersonalAccessToken {
             .await?;
 
         if let Some(res) = res {
-            return Ok(res.into_iter().map(PatId).collect());
+            return Ok(res.into_iter().map(DBPatId).collect());
         }
 
-        let db_pats: Vec<PatId> = sqlx::query!(
+        let db_pats: Vec<DBPatId> = sqlx::query!(
             "
             SELECT id
             FROM pats
@@ -179,8 +179,8 @@ impl PersonalAccessToken {
             user_id.0,
         )
         .fetch(exec)
-        .map_ok(|x| PatId(x.id))
-        .try_collect::<Vec<PatId>>()
+        .map_ok(|x| DBPatId(x.id))
+        .try_collect::<Vec<DBPatId>>()
         .await?;
 
         redis
@@ -195,7 +195,7 @@ impl PersonalAccessToken {
     }
 
     pub async fn clear_cache(
-        clear_pats: Vec<(Option<PatId>, Option<String>, Option<UserId>)>,
+        clear_pats: Vec<(Option<DBPatId>, Option<String>, Option<DBUserId>)>,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
@@ -223,14 +223,14 @@ impl PersonalAccessToken {
     }
 
     pub async fn remove(
-        id: PatId,
+        id: DBPatId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<Option<()>, sqlx::error::Error> {
         sqlx::query!(
             "
             DELETE FROM pats WHERE id = $1
             ",
-            id as PatId,
+            id as DBPatId,
         )
         .execute(&mut **transaction)
         .await?;
diff --git a/apps/labrinth/src/database/models/payout_item.rs b/apps/labrinth/src/database/models/payout_item.rs
index 51ed85ab..0f0fbfc2 100644
--- a/apps/labrinth/src/database/models/payout_item.rs
+++ b/apps/labrinth/src/database/models/payout_item.rs
@@ -3,12 +3,12 @@ use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 
-use super::{DatabaseError, PayoutId, UserId};
+use super::{DBPayoutId, DBUserId, DatabaseError};
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct Payout {
-    pub id: PayoutId,
-    pub user_id: UserId,
+pub struct DBPayout {
+    pub id: DBPayoutId,
+    pub user_id: DBUserId,
     pub created: DateTime<Utc>,
     pub status: PayoutStatus,
     pub amount: Decimal,
@@ -19,7 +19,7 @@ pub struct Payout {
     pub platform_id: Option<String>,
 }
 
-impl Payout {
+impl DBPayout {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -49,21 +49,21 @@ impl Payout {
     }
 
     pub async fn get<'a, 'b, E>(
-        id: PayoutId,
+        id: DBPayoutId,
         executor: E,
-    ) -> Result<Option<Payout>, DatabaseError>
+    ) -> Result<Option<DBPayout>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        Payout::get_many(&[id], executor)
+        DBPayout::get_many(&[id], executor)
             .await
             .map(|x| x.into_iter().next())
     }
 
     pub async fn get_many<'a, E>(
-        payout_ids: &[PayoutId],
+        payout_ids: &[DBPayoutId],
         exec: E,
-    ) -> Result<Vec<Payout>, DatabaseError>
+    ) -> Result<Vec<DBPayout>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -78,9 +78,9 @@ impl Payout {
             &payout_ids.into_iter().map(|x| x.0).collect::<Vec<_>>()
         )
         .fetch(exec)
-        .map_ok(|r| Payout {
-            id: PayoutId(r.id),
-            user_id: UserId(r.user_id),
+        .map_ok(|r| DBPayout {
+            id: DBPayoutId(r.id),
+            user_id: DBUserId(r.user_id),
             created: r.created,
             status: PayoutStatus::from_string(&r.status),
             amount: r.amount,
@@ -89,16 +89,16 @@ impl Payout {
             platform_id: r.platform_id,
             fee: r.fee,
         })
-        .try_collect::<Vec<Payout>>()
+        .try_collect::<Vec<DBPayout>>()
         .await?;
 
         Ok(results)
     }
 
     pub async fn get_all_for_user(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<PayoutId>, DatabaseError> {
+    ) -> Result<Vec<DBPayoutId>, DatabaseError> {
         let results = sqlx::query!(
             "
             SELECT id
@@ -112,7 +112,7 @@ impl Payout {
 
         Ok(results
             .into_iter()
-            .map(|r| PayoutId(r.id))
+            .map(|r| DBPayoutId(r.id))
             .collect::<Vec<_>>())
     }
 }
diff --git a/apps/labrinth/src/database/models/product_item.rs b/apps/labrinth/src/database/models/product_item.rs
index eaca8b7d..3879fe41 100644
--- a/apps/labrinth/src/database/models/product_item.rs
+++ b/apps/labrinth/src/database/models/product_item.rs
@@ -1,5 +1,5 @@
 use crate::database::models::{
-    product_item, DatabaseError, ProductId, ProductPriceId,
+    DBProductId, DBProductPriceId, DatabaseError, product_item,
 };
 use crate::database::redis::RedisPool;
 use crate::models::billing::{Price, ProductMetadata};
@@ -11,13 +11,13 @@ use std::convert::TryInto;
 
 const PRODUCTS_NAMESPACE: &str = "products";
 
-pub struct ProductItem {
-    pub id: ProductId,
+pub struct DBProduct {
+    pub id: DBProductId,
     pub metadata: ProductMetadata,
     pub unitary: bool,
 }
 
-struct ProductResult {
+struct ProductQueryResult {
     id: i64,
     metadata: serde_json::Value,
     unitary: bool,
@@ -26,7 +26,7 @@ struct ProductResult {
 macro_rules! select_products_with_predicate {
     ($predicate:tt, $param:ident) => {
         sqlx::query_as!(
-            ProductResult,
+            ProductQueryResult,
             r#"
             SELECT id, metadata, unitary
             FROM products
@@ -37,30 +37,30 @@ macro_rules! select_products_with_predicate {
     };
 }
 
-impl TryFrom<ProductResult> for ProductItem {
+impl TryFrom<ProductQueryResult> for DBProduct {
     type Error = serde_json::Error;
 
-    fn try_from(r: ProductResult) -> Result<Self, Self::Error> {
-        Ok(ProductItem {
-            id: ProductId(r.id),
+    fn try_from(r: ProductQueryResult) -> Result<Self, Self::Error> {
+        Ok(DBProduct {
+            id: DBProductId(r.id),
             metadata: serde_json::from_value(r.metadata)?,
             unitary: r.unitary,
         })
     }
 }
 
-impl ProductItem {
+impl DBProduct {
     pub async fn get(
-        id: ProductId,
+        id: DBProductId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<ProductItem>, DatabaseError> {
+    ) -> Result<Option<DBProduct>, DatabaseError> {
         Ok(Self::get_many(&[id], exec).await?.into_iter().next())
     }
 
     pub async fn get_many(
-        ids: &[ProductId],
+        ids: &[DBProductId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ProductItem>, DatabaseError> {
+    ) -> Result<Vec<DBProduct>, DatabaseError> {
         let ids = ids.iter().map(|id| id.0).collect_vec();
         let ids_ref: &[i64] = &ids;
         let results = select_products_with_predicate!(
@@ -78,7 +78,7 @@ impl ProductItem {
 
     pub async fn get_all(
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ProductItem>, DatabaseError> {
+    ) -> Result<Vec<DBProduct>, DatabaseError> {
         let one = 1;
         let results = select_products_with_predicate!("WHERE 1 = $1", one)
             .fetch_all(exec)
@@ -92,24 +92,24 @@ impl ProductItem {
 }
 
 #[derive(Deserialize, Serialize)]
-pub struct QueryProduct {
-    pub id: ProductId,
+pub struct QueryProductWithPrices {
+    pub id: DBProductId,
     pub metadata: ProductMetadata,
     pub unitary: bool,
-    pub prices: Vec<ProductPriceItem>,
+    pub prices: Vec<DBProductPrice>,
 }
 
-impl QueryProduct {
+impl QueryProductWithPrices {
     pub async fn list<'a, E>(
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<QueryProduct>, DatabaseError>
+    ) -> Result<Vec<QueryProductWithPrices>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
         let mut redis = redis.connect().await?;
 
-        let res: Option<Vec<QueryProduct>> = redis
+        let res: Option<Vec<QueryProductWithPrices>> = redis
             .get_deserialized_from_json(PRODUCTS_NAMESPACE, "all")
             .await?;
 
@@ -117,8 +117,8 @@ impl QueryProduct {
             return Ok(res);
         }
 
-        let all_products = product_item::ProductItem::get_all(exec).await?;
-        let prices = product_item::ProductPriceItem::get_all_products_prices(
+        let all_products = product_item::DBProduct::get_all(exec).await?;
+        let prices = product_item::DBProductPrice::get_all_products_prices(
             &all_products.iter().map(|x| x.id).collect::<Vec<_>>(),
             exec,
         )
@@ -126,7 +126,7 @@ impl QueryProduct {
 
         let products = all_products
             .into_iter()
-            .map(|x| QueryProduct {
+            .map(|x| QueryProductWithPrices {
                 id: x.id,
                 metadata: x.metadata,
                 prices: prices
@@ -134,7 +134,7 @@ impl QueryProduct {
                     .map(|x| x.1)
                     .unwrap_or_default()
                     .into_iter()
-                    .map(|x| ProductPriceItem {
+                    .map(|x| DBProductPrice {
                         id: x.id,
                         product_id: x.product_id,
                         prices: x.prices,
@@ -154,14 +154,14 @@ impl QueryProduct {
 }
 
 #[derive(Deserialize, Serialize)]
-pub struct ProductPriceItem {
-    pub id: ProductPriceId,
-    pub product_id: ProductId,
+pub struct DBProductPrice {
+    pub id: DBProductPriceId,
+    pub product_id: DBProductId,
     pub prices: Price,
     pub currency_code: String,
 }
 
-struct ProductPriceResult {
+struct ProductPriceQueryResult {
     id: i64,
     product_id: i64,
     prices: serde_json::Value,
@@ -171,7 +171,7 @@ struct ProductPriceResult {
 macro_rules! select_prices_with_predicate {
     ($predicate:tt, $param:ident) => {
         sqlx::query_as!(
-            ProductPriceResult,
+            ProductPriceQueryResult,
             r#"
             SELECT id, product_id, prices, currency_code
             FROM products_prices
@@ -182,31 +182,31 @@ macro_rules! select_prices_with_predicate {
     };
 }
 
-impl TryFrom<ProductPriceResult> for ProductPriceItem {
+impl TryFrom<ProductPriceQueryResult> for DBProductPrice {
     type Error = serde_json::Error;
 
-    fn try_from(r: ProductPriceResult) -> Result<Self, Self::Error> {
-        Ok(ProductPriceItem {
-            id: ProductPriceId(r.id),
-            product_id: ProductId(r.product_id),
+    fn try_from(r: ProductPriceQueryResult) -> Result<Self, Self::Error> {
+        Ok(DBProductPrice {
+            id: DBProductPriceId(r.id),
+            product_id: DBProductId(r.product_id),
             prices: serde_json::from_value(r.prices)?,
             currency_code: r.currency_code,
         })
     }
 }
 
-impl ProductPriceItem {
+impl DBProductPrice {
     pub async fn get(
-        id: ProductPriceId,
+        id: DBProductPriceId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<ProductPriceItem>, DatabaseError> {
+    ) -> Result<Option<DBProductPrice>, DatabaseError> {
         Ok(Self::get_many(&[id], exec).await?.into_iter().next())
     }
 
     pub async fn get_many(
-        ids: &[ProductPriceId],
+        ids: &[DBProductPriceId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ProductPriceItem>, DatabaseError> {
+    ) -> Result<Vec<DBProductPrice>, DatabaseError> {
         let ids = ids.iter().map(|id| id.0).collect_vec();
         let ids_ref: &[i64] = &ids;
         let results = select_prices_with_predicate!(
@@ -223,18 +223,18 @@ impl ProductPriceItem {
     }
 
     pub async fn get_all_product_prices(
-        product_id: ProductId,
+        product_id: DBProductId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<ProductPriceItem>, DatabaseError> {
+    ) -> Result<Vec<DBProductPrice>, DatabaseError> {
         let res = Self::get_all_products_prices(&[product_id], exec).await?;
 
         Ok(res.remove(&product_id).map(|x| x.1).unwrap_or_default())
     }
 
     pub async fn get_all_products_prices(
-        product_ids: &[ProductId],
+        product_ids: &[DBProductId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<DashMap<ProductId, Vec<ProductPriceItem>>, DatabaseError> {
+    ) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
         let ids = product_ids.iter().map(|id| id.0).collect_vec();
         let ids_ref: &[i64] = &ids;
 
@@ -246,9 +246,9 @@ impl ProductPriceItem {
         .fetch(exec)
         .try_fold(
             DashMap::new(),
-            |acc: DashMap<ProductId, Vec<ProductPriceItem>>, x| {
-                if let Ok(item) = <ProductPriceResult as TryInto<
-                    ProductPriceItem,
+            |acc: DashMap<DBProductId, Vec<DBProductPrice>>, x| {
+                if let Ok(item) = <ProductPriceQueryResult as TryInto<
+                    DBProductPrice,
                 >>::try_into(x)
                 {
                     acc.entry(item.product_id).or_default().push(item);
diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs
index e2ca2522..b22c4cb5 100644
--- a/apps/labrinth/src/database/models/project_item.rs
+++ b/apps/labrinth/src/database/models/project_item.rs
@@ -2,7 +2,7 @@ use super::loader_fields::{
     QueryLoaderField, QueryLoaderFieldEnumValue, QueryVersionField,
     VersionField,
 };
-use super::{ids::*, User};
+use super::{DBUser, ids::*};
 use crate::database::models;
 use crate::database::models::DatabaseError;
 use crate::database::redis::RedisPool;
@@ -31,7 +31,7 @@ pub struct LinkUrl {
 impl LinkUrl {
     pub async fn insert_many_projects(
         links: Vec<Self>,
-        project_id: ProjectId,
+        project_id: DBProjectId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), sqlx::error::Error> {
         let (project_ids, platform_ids, urls): (Vec<_>, Vec<_>, Vec<_>) = links
@@ -57,7 +57,7 @@ impl LinkUrl {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GalleryItem {
+pub struct DBGalleryItem {
     pub image_url: String,
     pub raw_image_url: String,
     pub featured: bool,
@@ -67,10 +67,10 @@ pub struct GalleryItem {
     pub ordering: i64,
 }
 
-impl GalleryItem {
+impl DBGalleryItem {
     pub async fn insert_many(
         items: Vec<Self>,
-        project_id: ProjectId,
+        project_id: DBProjectId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), sqlx::error::Error> {
         let (
@@ -117,14 +117,13 @@ impl GalleryItem {
     }
 }
 
-#[derive(derive_new::new)]
-pub struct ModCategory {
-    project_id: ProjectId,
-    category_id: CategoryId,
-    is_additional: bool,
+pub struct DBModCategory {
+    pub project_id: DBProjectId,
+    pub category_id: CategoryId,
+    pub is_additional: bool,
 }
 
-impl ModCategory {
+impl DBModCategory {
     pub async fn insert_many(
         items: Vec<Self>,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -155,9 +154,9 @@ impl ModCategory {
 
 #[derive(Clone)]
 pub struct ProjectBuilder {
-    pub project_id: ProjectId,
-    pub team_id: TeamId,
-    pub organization_id: Option<OrganizationId>,
+    pub project_id: DBProjectId,
+    pub team_id: DBTeamId,
+    pub organization_id: Option<DBOrganizationId>,
     pub name: String,
     pub summary: String,
     pub description: String,
@@ -172,7 +171,7 @@ pub struct ProjectBuilder {
     pub license: String,
     pub slug: Option<String>,
     pub link_urls: Vec<LinkUrl>,
-    pub gallery_items: Vec<GalleryItem>,
+    pub gallery_items: Vec<DBGalleryItem>,
     pub color: Option<u32>,
     pub monetization_status: MonetizationStatus,
 }
@@ -181,8 +180,8 @@ impl ProjectBuilder {
     pub async fn insert(
         self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<ProjectId, DatabaseError> {
-        let project_struct = Project {
+    ) -> Result<DBProjectId, DatabaseError> {
+        let project_struct = DBProject {
             id: self.project_id,
             team_id: self.team_id,
             organization_id: self.organization_id,
@@ -235,7 +234,7 @@ impl ProjectBuilder {
         )
         .await?;
 
-        GalleryItem::insert_many(
+        DBGalleryItem::insert_many(
             gallery_items,
             self.project_id,
             &mut *transaction,
@@ -245,23 +244,29 @@ impl ProjectBuilder {
         let project_id = self.project_id;
         let mod_categories = categories
             .into_iter()
-            .map(|c| ModCategory::new(project_id, c, false))
-            .chain(
-                additional_categories
-                    .into_iter()
-                    .map(|c| ModCategory::new(project_id, c, true)),
-            )
+            .map(|category_id| DBModCategory {
+                project_id,
+                category_id,
+                is_additional: false,
+            })
+            .chain(additional_categories.into_iter().map(|category_id| {
+                DBModCategory {
+                    project_id,
+                    category_id,
+                    is_additional: true,
+                }
+            }))
             .collect_vec();
-        ModCategory::insert_many(mod_categories, &mut *transaction).await?;
+        DBModCategory::insert_many(mod_categories, &mut *transaction).await?;
 
         Ok(self.project_id)
     }
 }
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Project {
-    pub id: ProjectId,
-    pub team_id: TeamId,
-    pub organization_id: Option<OrganizationId>,
+pub struct DBProject {
+    pub id: DBProjectId,
+    pub team_id: DBTeamId,
+    pub organization_id: Option<DBOrganizationId>,
     pub name: String,
     pub summary: String,
     pub description: String,
@@ -286,7 +291,7 @@ pub struct Project {
     pub loaders: Vec<String>,
 }
 
-impl Project {
+impl DBProject {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -306,8 +311,8 @@ impl Project {
                 LOWER($14), $15, $16, $17
             )
             ",
-            self.id as ProjectId,
-            self.team_id as TeamId,
+            self.id as DBProjectId,
+            self.team_id as DBTeamId,
             &self.name,
             &self.summary,
             &self.description,
@@ -331,14 +336,14 @@ impl Project {
     }
 
     pub async fn remove(
-        id: ProjectId,
+        id: DBProjectId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
         let project = Self::get_id(id, &mut **transaction, redis).await?;
 
         if let Some(project) = project {
-            Project::clear_cache(id, project.inner.slug, Some(true), redis)
+            DBProject::clear_cache(id, project.inner.slug, Some(true), redis)
                 .await?;
 
             sqlx::query!(
@@ -346,7 +351,7 @@ impl Project {
                 DELETE FROM mod_follows
                 WHERE mod_id = $1
                 ",
-                id as ProjectId
+                id as DBProjectId
             )
             .execute(&mut **transaction)
             .await?;
@@ -356,7 +361,7 @@ impl Project {
                 DELETE FROM mods_gallery
                 WHERE mod_id = $1
                 ",
-                id as ProjectId
+                id as DBProjectId
             )
             .execute(&mut **transaction)
             .await?;
@@ -366,12 +371,13 @@ impl Project {
                 DELETE FROM mod_follows
                 WHERE mod_id = $1
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
 
-            models::Thread::remove_full(project.thread_id, transaction).await?;
+            models::DBThread::remove_full(project.thread_id, transaction)
+                .await?;
 
             sqlx::query!(
                 "
@@ -379,7 +385,7 @@ impl Project {
                 SET mod_id = NULL
                 WHERE mod_id = $1
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -389,7 +395,7 @@ impl Project {
                 DELETE FROM mods_categories
                 WHERE joining_mod_id = $1
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -399,13 +405,13 @@ impl Project {
                 DELETE FROM mods_links
                 WHERE joining_mod_id = $1
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
 
             for version in project.versions {
-                super::Version::remove_full(version, redis, transaction)
+                super::DBVersion::remove_full(version, redis, transaction)
                     .await?;
             }
 
@@ -413,7 +419,7 @@ impl Project {
                 "
                 DELETE FROM dependencies WHERE mod_dependency_id = $1
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -424,7 +430,7 @@ impl Project {
                 SET mod_id = NULL
                 WHERE (mod_id = $1)
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -434,12 +440,12 @@ impl Project {
                 DELETE FROM mods
                 WHERE id = $1
                 ",
-                id as ProjectId,
+                id as DBProjectId,
             )
             .execute(&mut **transaction)
             .await?;
 
-            models::TeamMember::clear_cache(project.inner.team_id, redis)
+            models::DBTeamMember::clear_cache(project.inner.team_id, redis)
                 .await?;
 
             let affected_user_ids = sqlx::query!(
@@ -448,21 +454,21 @@ impl Project {
                 WHERE team_id = $1
                 RETURNING user_id
                 ",
-                project.inner.team_id as TeamId,
+                project.inner.team_id as DBTeamId,
             )
             .fetch(&mut **transaction)
-            .map_ok(|x| UserId(x.user_id))
+            .map_ok(|x| DBUserId(x.user_id))
             .try_collect::<Vec<_>>()
             .await?;
 
-            User::clear_project_cache(&affected_user_ids, redis).await?;
+            DBUser::clear_project_cache(&affected_user_ids, redis).await?;
 
             sqlx::query!(
                 "
                 DELETE FROM teams
                 WHERE id = $1
                 ",
-                project.inner.team_id as TeamId,
+                project.inner.team_id as DBTeamId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -477,24 +483,24 @@ impl Project {
         string: &str,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<QueryProject>, DatabaseError>
+    ) -> Result<Option<ProjectQueryResult>, DatabaseError>
     where
         E: sqlx::Acquire<'a, Database = sqlx::Postgres>,
     {
-        Project::get_many(&[string], executor, redis)
+        DBProject::get_many(&[string], executor, redis)
             .await
             .map(|x| x.into_iter().next())
     }
 
     pub async fn get_id<'a, 'b, E>(
-        id: ProjectId,
+        id: DBProjectId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<QueryProject>, DatabaseError>
+    ) -> Result<Option<ProjectQueryResult>, DatabaseError>
     where
         E: sqlx::Acquire<'a, Database = sqlx::Postgres>,
     {
-        Project::get_many(
+        DBProject::get_many(
             &[crate::models::ids::ProjectId::from(id)],
             executor,
             redis,
@@ -504,10 +510,10 @@ impl Project {
     }
 
     pub async fn get_many_ids<'a, E>(
-        project_ids: &[ProjectId],
+        project_ids: &[DBProjectId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<QueryProject>, DatabaseError>
+    ) -> Result<Vec<ProjectQueryResult>, DatabaseError>
     where
         E: sqlx::Acquire<'a, Database = sqlx::Postgres>,
     {
@@ -515,7 +521,7 @@ impl Project {
             .iter()
             .map(|x| crate::models::ids::ProjectId::from(*x))
             .collect::<Vec<_>>();
-        Project::get_many(&ids, exec, redis).await
+        DBProject::get_many(&ids, exec, redis).await
     }
 
     pub async fn get_many<
@@ -526,7 +532,7 @@ impl Project {
         project_strings: &[T],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<QueryProject>, DatabaseError>
+    ) -> Result<Vec<ProjectQueryResult>, DatabaseError>
     where
         E: sqlx::Acquire<'a, Database = sqlx::Postgres>,
     {
@@ -548,7 +554,7 @@ impl Project {
                     .collect::<Vec<_>>();
 
                 let all_version_ids = DashSet::new();
-                let versions: DashMap<ProjectId, Vec<(VersionId, DateTime<Utc>)>> = sqlx::query!(
+                let versions: DashMap<DBProjectId, Vec<(DBVersionId, DateTime<Utc>)>> = sqlx::query!(
                     "
                     SELECT DISTINCT mod_id, v.id as id, date_published
                     FROM mods m
@@ -565,11 +571,11 @@ impl Project {
                     .fetch(&mut *exec)
                     .try_fold(
                         DashMap::new(),
-                        |acc: DashMap<ProjectId, Vec<(VersionId, DateTime<Utc>)>>, m| {
-                            let version_id = VersionId(m.id);
+                        |acc: DashMap<DBProjectId, Vec<(DBVersionId, DateTime<Utc>)>>, m| {
+                            let version_id = DBVersionId(m.id);
                             let date_published = m.date_published;
                             all_version_ids.insert(version_id);
-                            acc.entry(ProjectId(m.mod_id))
+                            acc.entry(DBProjectId(m.mod_id))
                                 .or_default()
                                 .push((version_id, date_published));
                             async move { Ok(acc) }
@@ -578,7 +584,7 @@ impl Project {
                     .await?;
 
                 let loader_field_enum_value_ids = DashSet::new();
-                let version_fields: DashMap<ProjectId, Vec<QueryVersionField>> = sqlx::query!(
+                let version_fields: DashMap<DBProjectId, Vec<QueryVersionField>> = sqlx::query!(
                     "
                     SELECT DISTINCT mod_id, version_id, field_id, int_value, enum_value, string_value
                     FROM versions v
@@ -590,9 +596,9 @@ impl Project {
                     .fetch(&mut *exec)
                     .try_fold(
                         DashMap::new(),
-                        |acc: DashMap<ProjectId, Vec<QueryVersionField>>, m| {
+                        |acc: DashMap<DBProjectId, Vec<QueryVersionField>>, m| {
                             let qvf = QueryVersionField {
-                                version_id: VersionId(m.version_id),
+                                version_id: DBVersionId(m.version_id),
                                 field_id: LoaderFieldId(m.field_id),
                                 int_value: m.int_value,
                                 enum_value: if m.enum_value == -1  { None } else { Some(LoaderFieldEnumValueId(m.enum_value)) },
@@ -603,7 +609,7 @@ impl Project {
                                 loader_field_enum_value_ids.insert(LoaderFieldEnumValueId(m.enum_value));
                             }
 
-                            acc.entry(ProjectId(m.mod_id)).or_default().push(qvf);
+                            acc.entry(DBProjectId(m.mod_id)).or_default().push(qvf);
                             async move { Ok(acc) }
                         },
                     )
@@ -633,7 +639,7 @@ impl Project {
                     .try_collect()
                     .await?;
 
-                let mods_gallery: DashMap<ProjectId, Vec<GalleryItem>> = sqlx::query!(
+                let mods_gallery: DashMap<DBProjectId, Vec<DBGalleryItem>> = sqlx::query!(
                     "
                     SELECT DISTINCT mod_id, mg.image_url, mg.raw_image_url, mg.featured, mg.name, mg.description, mg.created, mg.ordering
                     FROM mods_gallery mg
@@ -643,10 +649,10 @@ impl Project {
                     &project_ids_parsed,
                     &slugs
                 ).fetch(&mut *exec)
-                    .try_fold(DashMap::new(), |acc : DashMap<ProjectId, Vec<GalleryItem>>, m| {
-                        acc.entry(ProjectId(m.mod_id))
+                    .try_fold(DashMap::new(), |acc : DashMap<DBProjectId, Vec<DBGalleryItem>>, m| {
+                        acc.entry(DBProjectId(m.mod_id))
                             .or_default()
-                            .push(GalleryItem {
+                            .push(DBGalleryItem {
                                 image_url: m.image_url,
                                 raw_image_url: m.raw_image_url,
                                 featured: m.featured.unwrap_or(false),
@@ -659,7 +665,7 @@ impl Project {
                     }
                     ).await?;
 
-                let links: DashMap<ProjectId, Vec<LinkUrl>> = sqlx::query!(
+                let links: DashMap<DBProjectId, Vec<LinkUrl>> = sqlx::query!(
                     "
                     SELECT DISTINCT joining_mod_id as mod_id, joining_platform_id as platform_id, lp.name as platform_name, url, lp.donation as donation
                     FROM mods_links ml
@@ -670,8 +676,8 @@ impl Project {
                     &project_ids_parsed,
                     &slugs
                 ).fetch(&mut *exec)
-                    .try_fold(DashMap::new(), |acc : DashMap<ProjectId, Vec<LinkUrl>>, m| {
-                        acc.entry(ProjectId(m.mod_id))
+                    .try_fold(DashMap::new(), |acc : DashMap<DBProjectId, Vec<LinkUrl>>, m| {
+                        acc.entry(DBProjectId(m.mod_id))
                             .or_default()
                             .push(LinkUrl {
                                 platform_id: LinkPlatformId(m.platform_id),
@@ -692,7 +698,7 @@ impl Project {
                 }
 
                 let loader_field_ids = DashSet::new();
-                let loaders_ptypes_games: DashMap<ProjectId, VersionLoaderData> = sqlx::query!(
+                let loaders_ptypes_games: DashMap<DBProjectId, VersionLoaderData> = sqlx::query!(
                     "
                     SELECT DISTINCT mod_id,
                         ARRAY_AGG(DISTINCT l.loader) filter (where l.loader is not null) loaders,
@@ -713,7 +719,7 @@ impl Project {
                     &all_version_ids.iter().map(|x| x.0).collect::<Vec<_>>()
                 ).fetch(&mut *exec)
                     .map_ok(|m| {
-                        let project_id = ProjectId(m.mod_id);
+                        let project_id = DBProjectId(m.mod_id);
 
                         // 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<_>>();
@@ -759,7 +765,7 @@ impl Project {
                     "
                     SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,
                     m.icon_url icon_url, m.raw_icon_url raw_icon_url, m.description description, m.published published,
-                    m.updated updated, m.approved approved, m.queued, m.status status, m.requested_status requested_status,
+                    m.approved approved, m.queued, m.status status, m.requested_status requested_status,
                     m.license_url license_url,
                     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,
@@ -779,14 +785,16 @@ impl Project {
                     .fetch(&mut *exec)
                     .try_fold(DashMap::new(), |acc, m| {
                         let id = m.id;
-                        let project_id = ProjectId(id);
+                        let project_id = DBProjectId(id);
                         let VersionLoaderData {
                             loaders,
                             project_types,
                             games,
                             loader_loader_field_ids,
                         } = loaders_ptypes_games.remove(&project_id).map(|x|x.1).unwrap_or_default();
+                        // Each version is a tuple of (DBVersionId, DateTime<Utc>)
                         let mut versions = versions.remove(&project_id).map(|x| x.1).unwrap_or_default();
+                        versions.sort_by(|a, b| a.1.cmp(&b.1));
                         let mut gallery = mods_gallery.remove(&project_id).map(|x| x.1).unwrap_or_default();
                         let urls = links.remove(&project_id).map(|x| x.1).unwrap_or_default();
                         let version_fields = version_fields.remove(&project_id).map(|x| x.1).unwrap_or_default();
@@ -795,18 +803,18 @@ impl Project {
                             .filter(|x| loader_loader_field_ids.contains(&x.id))
                             .collect::<Vec<_>>();
 
-                        let project = QueryProject {
-                            inner: Project {
-                                id: ProjectId(id),
-                                team_id: TeamId(m.team_id),
-                                organization_id: m.organization_id.map(OrganizationId),
+                        let project = ProjectQueryResult {
+                            inner: DBProject {
+                                id: DBProjectId(id),
+                                team_id: DBTeamId(m.team_id),
+                                organization_id: m.organization_id.map(DBOrganizationId),
                                 name: m.name.clone(),
                                 summary: m.summary.clone(),
                                 downloads: m.downloads,
                                 icon_url: m.icon_url.clone(),
                                 raw_icon_url: m.raw_icon_url.clone(),
                                 published: m.published,
-                                updated: m.updated,
+                                updated: versions.iter().map(|x| x.1).next_back().unwrap_or(m.published),
                                 license_url: m.license_url.clone(),
                                 status: ProjectStatus::from_string(
                                     &m.status,
@@ -833,18 +841,14 @@ impl Project {
                             additional_categories: m.additional_categories.unwrap_or_default(),
                             project_types,
                             games,
-                            versions: {
-                                // Each version is a tuple of (VersionId, DateTime<Utc>)
-                                versions.sort_by(|a, b| a.1.cmp(&b.1));
-                                versions.into_iter().map(|x| x.0).collect()
-                            },
+                            versions: versions.into_iter().map(|x| x.0).collect(),
                             gallery_items: {
                                 gallery.sort_by(|a, b| a.ordering.cmp(&b.ordering));
                                 gallery
                             },
                             urls,
                             aggregate_version_fields: VersionField::from_query_json(version_fields, &loader_fields, &loader_field_enum_values, true),
-                            thread_id: ThreadId(m.thread_id),
+                            thread_id: DBThreadId(m.thread_id),
                         };
 
                         acc.insert(m.id, (m.slug, project));
@@ -860,18 +864,25 @@ impl Project {
     }
 
     pub async fn get_dependencies<'a, E>(
-        id: ProjectId,
+        id: DBProjectId,
         exec: E,
         redis: &RedisPool,
     ) -> Result<
-        Vec<(Option<VersionId>, Option<ProjectId>, Option<ProjectId>)>,
+        Vec<(
+            Option<DBVersionId>,
+            Option<DBProjectId>,
+            Option<DBProjectId>,
+        )>,
         DatabaseError,
     >
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        type Dependencies =
-            Vec<(Option<VersionId>, Option<ProjectId>, Option<ProjectId>)>;
+        type Dependencies = Vec<(
+            Option<DBVersionId>,
+            Option<DBProjectId>,
+            Option<DBProjectId>,
+        )>;
 
         let mut redis = redis.connect().await?;
 
@@ -893,18 +904,18 @@ impl Project {
             LEFT JOIN versions vd ON d.dependency_id = vd.id
             WHERE v.mod_id = $1
             ",
-            id as ProjectId
+            id as DBProjectId
         )
         .fetch(exec)
         .map_ok(|x| {
             (
-                x.dependency_id.map(VersionId),
+                x.dependency_id.map(DBVersionId),
                 if x.mod_id == Some(0) {
                     None
                 } else {
-                    x.mod_id.map(ProjectId)
+                    x.mod_id.map(DBProjectId)
                 },
-                x.mod_dependency_id.map(ProjectId),
+                x.mod_dependency_id.map(DBProjectId),
             )
         })
         .try_collect::<Dependencies>()
@@ -922,7 +933,7 @@ impl Project {
     }
 
     pub async fn clear_cache(
-        id: ProjectId,
+        id: DBProjectId,
         slug: Option<String>,
         clear_dependencies: Option<bool>,
         redis: &RedisPool,
@@ -948,15 +959,15 @@ impl Project {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct QueryProject {
-    pub inner: Project,
+pub struct ProjectQueryResult {
+    pub inner: DBProject,
     pub categories: Vec<String>,
     pub additional_categories: Vec<String>,
-    pub versions: Vec<VersionId>,
+    pub versions: Vec<DBVersionId>,
     pub project_types: Vec<String>,
     pub games: Vec<String>,
     pub urls: Vec<LinkUrl>,
-    pub gallery_items: Vec<GalleryItem>,
-    pub thread_id: ThreadId,
+    pub gallery_items: Vec<DBGalleryItem>,
+    pub thread_id: DBThreadId,
     pub aggregate_version_fields: Vec<VersionField>,
 }
diff --git a/apps/labrinth/src/database/models/report_item.rs b/apps/labrinth/src/database/models/report_item.rs
index 703c5d60..2d105da4 100644
--- a/apps/labrinth/src/database/models/report_item.rs
+++ b/apps/labrinth/src/database/models/report_item.rs
@@ -1,32 +1,32 @@
 use super::ids::*;
 use chrono::{DateTime, Utc};
 
-pub struct Report {
-    pub id: ReportId,
+pub struct DBReport {
+    pub id: DBReportId,
     pub report_type_id: ReportTypeId,
-    pub project_id: Option<ProjectId>,
-    pub version_id: Option<VersionId>,
-    pub user_id: Option<UserId>,
+    pub project_id: Option<DBProjectId>,
+    pub version_id: Option<DBVersionId>,
+    pub user_id: Option<DBUserId>,
     pub body: String,
-    pub reporter: UserId,
+    pub reporter: DBUserId,
     pub created: DateTime<Utc>,
     pub closed: bool,
 }
 
-pub struct QueryReport {
-    pub id: ReportId,
+pub struct ReportQueryResult {
+    pub id: DBReportId,
     pub report_type: String,
-    pub project_id: Option<ProjectId>,
-    pub version_id: Option<VersionId>,
-    pub user_id: Option<UserId>,
+    pub project_id: Option<DBProjectId>,
+    pub version_id: Option<DBVersionId>,
+    pub user_id: Option<DBUserId>,
     pub body: String,
-    pub reporter: UserId,
+    pub reporter: DBUserId,
     pub created: DateTime<Utc>,
     pub closed: bool,
-    pub thread_id: ThreadId,
+    pub thread_id: DBThreadId,
 }
 
-impl Report {
+impl DBReport {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -42,13 +42,13 @@ impl Report {
                 $6, $7
             )
             ",
-            self.id as ReportId,
+            self.id as DBReportId,
             self.report_type_id as ReportTypeId,
             self.project_id.map(|x| x.0 as i64),
             self.version_id.map(|x| x.0 as i64),
             self.user_id.map(|x| x.0 as i64),
             self.body,
-            self.reporter as UserId
+            self.reporter as DBUserId
         )
         .execute(&mut **transaction)
         .await?;
@@ -57,9 +57,9 @@ impl Report {
     }
 
     pub async fn get<'a, E>(
-        id: ReportId,
+        id: DBReportId,
         exec: E,
-    ) -> Result<Option<QueryReport>, sqlx::Error>
+    ) -> Result<Option<ReportQueryResult>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -69,9 +69,9 @@ impl Report {
     }
 
     pub async fn get_many<'a, E>(
-        report_ids: &[ReportId],
+        report_ids: &[DBReportId],
         exec: E,
-    ) -> Result<Vec<QueryReport>, sqlx::Error>
+    ) -> Result<Vec<ReportQueryResult>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -91,33 +91,33 @@ impl Report {
             &report_ids_parsed
         )
         .fetch(exec)
-        .map_ok(|x| QueryReport {
-            id: ReportId(x.id),
+        .map_ok(|x| ReportQueryResult {
+            id: DBReportId(x.id),
             report_type: x.name,
-            project_id: x.mod_id.map(ProjectId),
-            version_id: x.version_id.map(VersionId),
-            user_id: x.user_id.map(UserId),
+            project_id: x.mod_id.map(DBProjectId),
+            version_id: x.version_id.map(DBVersionId),
+            user_id: x.user_id.map(DBUserId),
             body: x.body,
-            reporter: UserId(x.reporter),
+            reporter: DBUserId(x.reporter),
             created: x.created,
             closed: x.closed,
-            thread_id: ThreadId(x.thread_id)
+            thread_id: DBThreadId(x.thread_id)
         })
-        .try_collect::<Vec<QueryReport>>()
+        .try_collect::<Vec<ReportQueryResult>>()
         .await?;
 
         Ok(reports)
     }
 
     pub async fn remove_full(
-        id: ReportId,
+        id: DBReportId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<Option<()>, sqlx::error::Error> {
         let result = sqlx::query!(
             "
             SELECT EXISTS(SELECT 1 FROM reports WHERE id = $1)
             ",
-            id as ReportId
+            id as DBReportId
         )
         .fetch_one(&mut **transaction)
         .await?;
@@ -131,14 +131,14 @@ impl Report {
             SELECT id FROM threads
             WHERE report_id = $1
             ",
-            id as ReportId
+            id as DBReportId
         )
         .fetch_optional(&mut **transaction)
         .await?;
 
         if let Some(thread_id) = thread_id {
-            crate::database::models::Thread::remove_full(
-                ThreadId(thread_id.id),
+            crate::database::models::DBThread::remove_full(
+                DBThreadId(thread_id.id),
                 transaction,
             )
             .await?;
@@ -148,7 +148,7 @@ impl Report {
             "
             DELETE FROM reports WHERE id = $1
             ",
-            id as ReportId,
+            id as DBReportId,
         )
         .execute(&mut **transaction)
         .await?;
diff --git a/apps/labrinth/src/database/models/session_item.rs b/apps/labrinth/src/database/models/session_item.rs
index 57fd42ce..c728a836 100644
--- a/apps/labrinth/src/database/models/session_item.rs
+++ b/apps/labrinth/src/database/models/session_item.rs
@@ -14,7 +14,7 @@ const SESSIONS_USERS_NAMESPACE: &str = "sessions_users";
 
 pub struct SessionBuilder {
     pub session: String,
-    pub user_id: UserId,
+    pub user_id: DBUserId,
 
     pub os: Option<String>,
     pub platform: Option<String>,
@@ -30,7 +30,7 @@ impl SessionBuilder {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<SessionId, DatabaseError> {
+    ) -> Result<DBSessionId, DatabaseError> {
         let id = generate_session_id(transaction).await?;
 
         sqlx::query!(
@@ -44,9 +44,9 @@ impl SessionBuilder {
                 $6, $7, $8, $9
             )
             ",
-            id as SessionId,
+            id as DBSessionId,
             self.session,
-            self.user_id as UserId,
+            self.user_id as DBUserId,
             self.os,
             self.platform,
             self.city,
@@ -62,10 +62,10 @@ impl SessionBuilder {
 }
 
 #[derive(Deserialize, Serialize)]
-pub struct Session {
-    pub id: SessionId,
+pub struct DBSession {
+    pub id: DBSessionId,
     pub session: String,
-    pub user_id: UserId,
+    pub user_id: DBUserId,
 
     pub created: DateTime<Utc>,
     pub last_login: DateTime<Utc>,
@@ -81,7 +81,7 @@ pub struct Session {
     pub ip: String,
 }
 
-impl Session {
+impl DBSession {
     pub async fn get<
         'a,
         E,
@@ -90,7 +90,7 @@ impl Session {
         id: T,
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Option<Session>, DatabaseError>
+    ) -> Result<Option<DBSession>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -100,14 +100,14 @@ impl Session {
     }
 
     pub async fn get_id<'a, 'b, E>(
-        id: SessionId,
+        id: DBSessionId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<Session>, DatabaseError>
+    ) -> Result<Option<DBSession>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        Session::get_many(
+        DBSession::get_many(
             &[crate::models::ids::SessionId::from(id)],
             executor,
             redis,
@@ -117,10 +117,10 @@ impl Session {
     }
 
     pub async fn get_many_ids<'a, E>(
-        session_ids: &[SessionId],
+        session_ids: &[DBSessionId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<Session>, DatabaseError>
+    ) -> Result<Vec<DBSession>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -128,7 +128,7 @@ impl Session {
             .iter()
             .map(|x| crate::models::ids::SessionId::from(*x))
             .collect::<Vec<_>>();
-        Session::get_many(&ids, exec, redis).await
+        DBSession::get_many(&ids, exec, redis).await
     }
 
     pub async fn get_many<
@@ -139,7 +139,7 @@ impl Session {
         session_strings: &[T],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<Session>, DatabaseError>
+    ) -> Result<Vec<DBSession>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -173,10 +173,10 @@ impl Session {
                 )
                     .fetch(exec)
                     .try_fold(DashMap::new(), |acc, x| {
-                        let session = Session {
-                            id: SessionId(x.id),
+                        let session = DBSession {
+                            id: DBSessionId(x.id),
                             session: x.session.clone(),
-                            user_id: UserId(x.user_id),
+                            user_id: DBUserId(x.user_id),
                             created: x.created,
                             last_login: x.last_login,
                             expires: x.expires,
@@ -202,10 +202,10 @@ impl Session {
     }
 
     pub async fn get_user_sessions<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<SessionId>, DatabaseError>
+    ) -> Result<Vec<DBSessionId>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -219,11 +219,11 @@ impl Session {
             .await?;
 
         if let Some(res) = res {
-            return Ok(res.into_iter().map(SessionId).collect());
+            return Ok(res.into_iter().map(DBSessionId).collect());
         }
 
         use futures::TryStreamExt;
-        let db_sessions: Vec<SessionId> = sqlx::query!(
+        let db_sessions: Vec<DBSessionId> = sqlx::query!(
             "
                 SELECT id
                 FROM sessions
@@ -233,8 +233,8 @@ impl Session {
             user_id.0,
         )
         .fetch(exec)
-        .map_ok(|x| SessionId(x.id))
-        .try_collect::<Vec<SessionId>>()
+        .map_ok(|x| DBSessionId(x.id))
+        .try_collect::<Vec<DBSessionId>>()
         .await?;
 
         redis
@@ -251,9 +251,9 @@ impl Session {
 
     pub async fn clear_cache(
         clear_sessions: Vec<(
-            Option<SessionId>,
+            Option<DBSessionId>,
             Option<String>,
-            Option<UserId>,
+            Option<DBUserId>,
         )>,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
@@ -281,14 +281,14 @@ impl Session {
     }
 
     pub async fn remove(
-        id: SessionId,
+        id: DBSessionId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<Option<()>, sqlx::error::Error> {
         sqlx::query!(
             "
             DELETE FROM sessions WHERE id = $1
             ",
-            id as SessionId,
+            id as DBSessionId,
         )
         .execute(&mut **transaction)
         .await?;
diff --git a/apps/labrinth/src/database/models/team_item.rs b/apps/labrinth/src/database/models/team_item.rs
index d343596c..641b89fb 100644
--- a/apps/labrinth/src/database/models/team_item.rs
+++ b/apps/labrinth/src/database/models/team_item.rs
@@ -1,4 +1,4 @@
-use super::{ids::*, Organization, Project};
+use super::{DBOrganization, DBProject, ids::*};
 use crate::{
     database::redis::RedisPool,
     models::teams::{OrganizationPermissions, ProjectPermissions},
@@ -15,7 +15,7 @@ pub struct TeamBuilder {
     pub members: Vec<TeamMemberBuilder>,
 }
 pub struct TeamMemberBuilder {
-    pub user_id: UserId,
+    pub user_id: DBUserId,
     pub role: String,
     pub is_owner: bool,
     pub permissions: ProjectPermissions,
@@ -29,17 +29,17 @@ impl TeamBuilder {
     pub async fn insert(
         self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<TeamId, super::DatabaseError> {
+    ) -> Result<DBTeamId, super::DatabaseError> {
         let team_id = generate_team_id(transaction).await?;
 
-        let team = Team { id: team_id };
+        let team = DBTeam { id: team_id };
 
         sqlx::query!(
             "
             INSERT INTO teams (id)
             VALUES ($1)
             ",
-            team.id as TeamId,
+            team.id as DBTeamId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -109,20 +109,20 @@ impl TeamBuilder {
 }
 
 /// A team of users who control a project
-pub struct Team {
+pub struct DBTeam {
     /// The id of the team
-    pub id: TeamId,
+    pub id: DBTeamId,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug, Copy)]
 pub enum TeamAssociationId {
-    Project(ProjectId),
-    Organization(OrganizationId),
+    Project(DBProjectId),
+    Organization(DBOrganizationId),
 }
 
-impl Team {
+impl DBTeam {
     pub async fn get_association<'a, 'b, E>(
-        id: TeamId,
+        id: DBTeamId,
         executor: E,
     ) -> Result<Option<TeamAssociationId>, super::DatabaseError>
     where
@@ -133,14 +133,14 @@ impl Team {
             SELECT m.id AS pid, NULL AS oid
             FROM mods m
             WHERE m.team_id = $1
-            
+
             UNION ALL
-             
+
             SELECT NULL AS pid, o.id AS oid
             FROM organizations o
-            WHERE o.team_id = $1    
+            WHERE o.team_id = $1
             ",
-            id as TeamId
+            id as DBTeamId
         )
         .fetch_optional(executor)
         .await?;
@@ -150,11 +150,12 @@ impl Team {
             let mut team_association_id = None;
             if let Some(pid) = t.pid {
                 team_association_id =
-                    Some(TeamAssociationId::Project(ProjectId(pid)));
+                    Some(TeamAssociationId::Project(DBProjectId(pid)));
             }
             if let Some(oid) = t.oid {
-                team_association_id =
-                    Some(TeamAssociationId::Organization(OrganizationId(oid)));
+                team_association_id = Some(TeamAssociationId::Organization(
+                    DBOrganizationId(oid),
+                ));
             }
             return Ok(team_association_id);
         }
@@ -164,12 +165,12 @@ impl Team {
 
 /// A member of a team
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct TeamMember {
-    pub id: TeamMemberId,
-    pub team_id: TeamId,
+pub struct DBTeamMember {
+    pub id: DBTeamMemberId,
+    pub team_id: DBTeamId,
 
     /// The ID of the user associated with the member
-    pub user_id: UserId,
+    pub user_id: DBUserId,
     pub role: String,
     pub is_owner: bool,
 
@@ -186,13 +187,13 @@ pub struct TeamMember {
     pub ordering: i64,
 }
 
-impl TeamMember {
+impl DBTeamMember {
     // Lists the full members of a team
     pub async fn get_from_team_full<'a, 'b, E>(
-        id: TeamId,
+        id: DBTeamId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Vec<TeamMember>, super::DatabaseError>
+    ) -> Result<Vec<DBTeamMember>, super::DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -200,10 +201,10 @@ impl TeamMember {
     }
 
     pub async fn get_from_team_full_many<'a, E>(
-        team_ids: &[TeamId],
+        team_ids: &[DBTeamId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<TeamMember>, super::DatabaseError>
+    ) -> Result<Vec<DBTeamMember>, super::DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -227,10 +228,10 @@ impl TeamMember {
                     &team_ids
                 )
                     .fetch(exec)
-                    .try_fold(DashMap::new(), |acc: DashMap<i64, Vec<TeamMember>>, m| {
-                        let member = TeamMember {
-                            id: TeamMemberId(m.id),
-                            team_id: TeamId(m.team_id),
+                    .try_fold(DashMap::new(), |acc: DashMap<i64, Vec<DBTeamMember>>, m| {
+                        let member = DBTeamMember {
+                            id: DBTeamMemberId(m.id),
+                            team_id: DBTeamId(m.team_id),
                             role: m.member_role,
                             is_owner: m.is_owner,
                             permissions: ProjectPermissions::from_bits(m.permissions as u64)
@@ -239,7 +240,7 @@ impl TeamMember {
                                 .organization_permissions
                                 .map(|p| OrganizationPermissions::from_bits(p as u64).unwrap_or_default()),
                             accepted: m.accepted,
-                            user_id: UserId(m.user_id),
+                            user_id: DBUserId(m.user_id),
                             payouts_split: m.payouts_split,
                             ordering: m.ordering,
                         };
@@ -260,7 +261,7 @@ impl TeamMember {
     }
 
     pub async fn clear_cache(
-        id: TeamId,
+        id: DBTeamId,
         redis: &RedisPool,
     ) -> Result<(), super::DatabaseError> {
         let mut redis = redis.connect().await?;
@@ -270,8 +271,8 @@ impl TeamMember {
 
     /// Gets a team member from a user id and team id.  Does not return pending members.
     pub async fn get_from_user_id<'a, 'b, E>(
-        id: TeamId,
-        user_id: UserId,
+        id: DBTeamId,
+        user_id: DBUserId,
         executor: E,
     ) -> Result<Option<Self>, super::DatabaseError>
     where
@@ -284,8 +285,8 @@ impl TeamMember {
 
     /// Gets team members from user ids and team ids.  Does not return pending members.
     pub async fn get_from_user_id_many<'a, 'b, E>(
-        team_ids: &[TeamId],
-        user_id: UserId,
+        team_ids: &[DBTeamId],
+        user_id: DBUserId,
         executor: E,
     ) -> Result<Vec<Self>, super::DatabaseError>
     where
@@ -303,12 +304,12 @@ impl TeamMember {
             ORDER BY ordering
             ",
             &team_ids_parsed,
-            user_id as UserId
+            user_id as DBUserId
         )
         .fetch(executor)
-        .map_ok(|m| TeamMember {
-            id: TeamMemberId(m.id),
-            team_id: TeamId(m.team_id),
+        .map_ok(|m| DBTeamMember {
+            id: DBTeamMemberId(m.id),
+            team_id: DBTeamId(m.team_id),
             user_id,
             role: m.role,
             is_owner: m.is_owner,
@@ -321,7 +322,7 @@ impl TeamMember {
             payouts_split: m.payouts_split,
             ordering: m.ordering,
         })
-        .try_collect::<Vec<TeamMember>>()
+        .try_collect::<Vec<DBTeamMember>>()
         .await?;
 
         Ok(team_members)
@@ -329,8 +330,8 @@ impl TeamMember {
 
     /// Gets a team member from a user id and team id, including pending members.
     pub async fn get_from_user_id_pending<'a, 'b, E>(
-        id: TeamId,
-        user_id: UserId,
+        id: DBTeamId,
+        user_id: DBUserId,
         executor: E,
     ) -> Result<Option<Self>, super::DatabaseError>
     where
@@ -341,20 +342,20 @@ impl TeamMember {
             SELECT id, team_id, role AS member_role, is_owner, permissions, organization_permissions,
                 accepted, payouts_split, role,
                 ordering, user_id
-                
+
             FROM team_members
             WHERE (team_id = $1 AND user_id = $2)
             ORDER BY ordering
             ",
-            id as TeamId,
-            user_id as UserId
+            id as DBTeamId,
+            user_id as DBUserId
         )
         .fetch_optional(executor)
         .await?;
 
         if let Some(m) = result {
-            Ok(Some(TeamMember {
-                id: TeamMemberId(m.id),
+            Ok(Some(DBTeamMember {
+                id: DBTeamMemberId(m.id),
                 team_id: id,
                 user_id,
                 role: m.role,
@@ -389,9 +390,9 @@ impl TeamMember {
                 $1, $2, $3, $4, $5, $6, $7, $8, $9
             )
             ",
-            self.id as TeamMemberId,
-            self.team_id as TeamId,
-            self.user_id as UserId,
+            self.id as DBTeamMemberId,
+            self.team_id as DBTeamId,
+            self.user_id as DBUserId,
             self.role,
             self.permissions.bits() as i64,
             self.organization_permissions.map(|p| p.bits() as i64),
@@ -406,8 +407,8 @@ impl TeamMember {
     }
 
     pub async fn delete(
-        id: TeamId,
-        user_id: UserId,
+        id: DBTeamId,
+        user_id: DBUserId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), super::DatabaseError> {
         sqlx::query!(
@@ -415,8 +416,8 @@ impl TeamMember {
             DELETE FROM team_members
             WHERE (team_id = $1 AND user_id = $2 AND NOT is_owner = TRUE)
             ",
-            id as TeamId,
-            user_id as UserId,
+            id as DBTeamId,
+            user_id as DBUserId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -426,8 +427,8 @@ impl TeamMember {
 
     #[allow(clippy::too_many_arguments)]
     pub async fn edit_team_member(
-        id: TeamId,
-        user_id: UserId,
+        id: DBTeamId,
+        user_id: DBUserId,
         new_permissions: Option<ProjectPermissions>,
         new_organization_permissions: Option<OrganizationPermissions>,
         new_role: Option<String>,
@@ -445,8 +446,8 @@ impl TeamMember {
                 WHERE (team_id = $2 AND user_id = $3)
                 ",
                 permissions.bits() as i64,
-                id as TeamId,
-                user_id as UserId,
+                id as DBTeamId,
+                user_id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -460,8 +461,8 @@ impl TeamMember {
                 WHERE (team_id = $2 AND user_id = $3)
                 ",
                 organization_permissions.bits() as i64,
-                id as TeamId,
-                user_id as UserId,
+                id as DBTeamId,
+                user_id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -475,8 +476,8 @@ impl TeamMember {
                 WHERE (team_id = $2 AND user_id = $3)
                 ",
                 role,
-                id as TeamId,
-                user_id as UserId,
+                id as DBTeamId,
+                user_id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -490,8 +491,8 @@ impl TeamMember {
                     SET accepted = TRUE
                     WHERE (team_id = $1 AND user_id = $2)
                     ",
-                    id as TeamId,
-                    user_id as UserId,
+                    id as DBTeamId,
+                    user_id as DBUserId,
                 )
                 .execute(&mut **transaction)
                 .await?;
@@ -506,8 +507,8 @@ impl TeamMember {
                 WHERE (team_id = $2 AND user_id = $3)
                 ",
                 payouts_split,
-                id as TeamId,
-                user_id as UserId,
+                id as DBTeamId,
+                user_id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -521,8 +522,8 @@ impl TeamMember {
                 WHERE (team_id = $2 AND user_id = $3)
                 ",
                 ordering,
-                id as TeamId,
-                user_id as UserId,
+                id as DBTeamId,
+                user_id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -536,8 +537,8 @@ impl TeamMember {
                 WHERE (team_id = $2 AND user_id = $3)
                 ",
                 is_owner,
-                id as TeamId,
-                user_id as UserId,
+                id as DBTeamId,
+                user_id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -547,8 +548,8 @@ impl TeamMember {
     }
 
     pub async fn get_from_user_id_project<'a, 'b, E>(
-        id: ProjectId,
-        user_id: UserId,
+        id: DBProjectId,
+        user_id: DBUserId,
         allow_pending: bool,
         executor: E,
     ) -> Result<Option<Self>, super::DatabaseError>
@@ -568,17 +569,17 @@ impl TeamMember {
             INNER JOIN team_members tm ON tm.team_id = m.team_id AND user_id = $2 AND accepted = ANY($3)
             WHERE m.id = $1
             ",
-            id as ProjectId,
-            user_id as UserId,
+            id as DBProjectId,
+            user_id as DBUserId,
             &accepted
         )
             .fetch_optional(executor)
             .await?;
 
         if let Some(m) = result {
-            Ok(Some(TeamMember {
-                id: TeamMemberId(m.id),
-                team_id: TeamId(m.team_id),
+            Ok(Some(DBTeamMember {
+                id: DBTeamMemberId(m.id),
+                team_id: DBTeamId(m.team_id),
                 user_id,
                 role: m.role,
                 is_owner: m.is_owner,
@@ -600,8 +601,8 @@ impl TeamMember {
     }
 
     pub async fn get_from_user_id_organization<'a, 'b, E>(
-        id: OrganizationId,
-        user_id: UserId,
+        id: DBOrganizationId,
+        user_id: DBUserId,
         allow_pending: bool,
         executor: E,
     ) -> Result<Option<Self>, super::DatabaseError>
@@ -620,17 +621,17 @@ impl TeamMember {
             INNER JOIN team_members tm ON tm.team_id = o.team_id AND user_id = $2 AND accepted = ANY($3)
             WHERE o.id = $1
             ",
-            id as OrganizationId,
-            user_id as UserId,
+            id as DBOrganizationId,
+            user_id as DBUserId,
             &accepted
         )
             .fetch_optional(executor)
             .await?;
 
         if let Some(m) = result {
-            Ok(Some(TeamMember {
-                id: TeamMemberId(m.id),
-                team_id: TeamId(m.team_id),
+            Ok(Some(DBTeamMember {
+                id: DBTeamMemberId(m.id),
+                team_id: DBTeamId(m.team_id),
                 user_id,
                 role: m.role,
                 is_owner: m.is_owner,
@@ -652,8 +653,8 @@ impl TeamMember {
     }
 
     pub async fn get_from_user_id_version<'a, 'b, E>(
-        id: VersionId,
-        user_id: UserId,
+        id: DBVersionId,
+        user_id: DBUserId,
         executor: E,
     ) -> Result<Option<Self>, super::DatabaseError>
     where
@@ -661,22 +662,22 @@ impl TeamMember {
     {
         let result = sqlx::query!(
             "
-            SELECT tm.id, tm.team_id, tm.user_id, tm.role, tm.is_owner, tm.permissions, tm.organization_permissions, tm.accepted, tm.payouts_split, tm.ordering, v.mod_id 
+            SELECT tm.id, tm.team_id, tm.user_id, tm.role, tm.is_owner, tm.permissions, tm.organization_permissions, tm.accepted, tm.payouts_split, tm.ordering, v.mod_id
             FROM versions v
             INNER JOIN mods m ON m.id = v.mod_id
             INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.user_id = $2 AND tm.accepted = TRUE
             WHERE v.id = $1
             ",
-            id as VersionId,
-            user_id as UserId
+            id as DBVersionId,
+            user_id as DBUserId
         )
             .fetch_optional(executor)
             .await?;
 
         if let Some(m) = result {
-            Ok(Some(TeamMember {
-                id: TeamMemberId(m.id),
-                team_id: TeamId(m.team_id),
+            Ok(Some(DBTeamMember {
+                id: DBTeamMemberId(m.id),
+                team_id: DBTeamId(m.team_id),
                 user_id,
                 role: m.role,
                 is_owner: m.is_owner,
@@ -701,8 +702,8 @@ impl TeamMember {
     // - project team member (a user's membership to a given project)
     // - organization team member (a user's membership to a given organization that owns a given project)
     pub async fn get_for_project_permissions<'a, 'b, E>(
-        project: &Project,
-        user_id: UserId,
+        project: &DBProject,
+        user_id: DBUserId,
         executor: E,
     ) -> Result<(Option<Self>, Option<Self>), super::DatabaseError>
     where
@@ -712,7 +713,7 @@ impl TeamMember {
             Self::get_from_user_id(project.team_id, user_id, executor).await?;
 
         let organization =
-            Organization::get_associated_organization_project_id(
+            DBOrganization::get_associated_organization_project_id(
                 project.id, executor,
             )
             .await?;
diff --git a/apps/labrinth/src/database/models/thread_item.rs b/apps/labrinth/src/database/models/thread_item.rs
index 38d6cbe4..04275d62 100644
--- a/apps/labrinth/src/database/models/thread_item.rs
+++ b/apps/labrinth/src/database/models/thread_item.rs
@@ -6,35 +6,35 @@ use serde::{Deserialize, Serialize};
 
 pub struct ThreadBuilder {
     pub type_: ThreadType,
-    pub members: Vec<UserId>,
-    pub project_id: Option<ProjectId>,
-    pub report_id: Option<ReportId>,
+    pub members: Vec<DBUserId>,
+    pub project_id: Option<DBProjectId>,
+    pub report_id: Option<DBReportId>,
 }
 
 #[derive(Clone, Serialize)]
-pub struct Thread {
-    pub id: ThreadId,
+pub struct DBThread {
+    pub id: DBThreadId,
 
-    pub project_id: Option<ProjectId>,
-    pub report_id: Option<ReportId>,
+    pub project_id: Option<DBProjectId>,
+    pub report_id: Option<DBReportId>,
     pub type_: ThreadType,
 
-    pub messages: Vec<ThreadMessage>,
-    pub members: Vec<UserId>,
+    pub messages: Vec<DBThreadMessage>,
+    pub members: Vec<DBUserId>,
 }
 
 pub struct ThreadMessageBuilder {
-    pub author_id: Option<UserId>,
+    pub author_id: Option<DBUserId>,
     pub body: MessageBody,
-    pub thread_id: ThreadId,
+    pub thread_id: DBThreadId,
     pub hide_identity: bool,
 }
 
 #[derive(Serialize, Deserialize, Clone)]
-pub struct ThreadMessage {
-    pub id: ThreadMessageId,
-    pub thread_id: ThreadId,
-    pub author_id: Option<UserId>,
+pub struct DBThreadMessage {
+    pub id: DBThreadMessageId,
+    pub thread_id: DBThreadId,
+    pub author_id: Option<DBUserId>,
     pub body: MessageBody,
     pub created: DateTime<Utc>,
     pub hide_identity: bool,
@@ -44,7 +44,7 @@ impl ThreadMessageBuilder {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<ThreadMessageId, DatabaseError> {
+    ) -> Result<DBThreadMessageId, DatabaseError> {
         let thread_message_id = generate_thread_message_id(transaction).await?;
 
         sqlx::query!(
@@ -56,10 +56,10 @@ impl ThreadMessageBuilder {
                 $1, $2, $3, $4, $5
             )
             ",
-            thread_message_id as ThreadMessageId,
+            thread_message_id as DBThreadMessageId,
             self.author_id.map(|x| x.0),
             serde_json::value::to_value(self.body.clone())?,
-            self.thread_id as ThreadId,
+            self.thread_id as DBThreadId,
             self.hide_identity
         )
         .execute(&mut **transaction)
@@ -73,7 +73,7 @@ impl ThreadBuilder {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<ThreadId, DatabaseError> {
+    ) -> Result<DBThreadId, DatabaseError> {
         let thread_id = generate_thread_id(&mut *transaction).await?;
         sqlx::query!(
             "
@@ -84,7 +84,7 @@ impl ThreadBuilder {
                 $1, $2, $3, $4
             )
             ",
-            thread_id as ThreadId,
+            thread_id as DBThreadId,
             self.type_.as_str(),
             self.project_id.map(|x| x.0),
             self.report_id.map(|x| x.0),
@@ -111,11 +111,11 @@ impl ThreadBuilder {
     }
 }
 
-impl Thread {
+impl DBThread {
     pub async fn get<'a, E>(
-        id: ThreadId,
+        id: DBThreadId,
         exec: E,
-    ) -> Result<Option<Thread>, sqlx::Error>
+    ) -> Result<Option<DBThread>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -125,9 +125,9 @@ impl Thread {
     }
 
     pub async fn get_many<'a, E>(
-        thread_ids: &[ThreadId],
+        thread_ids: &[DBThreadId],
         exec: E,
-    ) -> Result<Vec<Thread>, sqlx::Error>
+    ) -> Result<Vec<DBThread>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -149,13 +149,13 @@ impl Thread {
             &thread_ids_parsed
         )
         .fetch(exec)
-            .map_ok(|x| Thread {
-                id: ThreadId(x.id),
-                project_id: x.mod_id.map(ProjectId),
-                report_id: x.report_id.map(ReportId),
+            .map_ok(|x| DBThread {
+                id: DBThreadId(x.id),
+                project_id: x.mod_id.map(DBProjectId),
+                report_id: x.report_id.map(DBReportId),
                 type_: ThreadType::from_string(&x.thread_type),
                 messages: {
-                    let mut messages: Vec<ThreadMessage> = serde_json::from_value(
+                    let mut messages: Vec<DBThreadMessage> = serde_json::from_value(
                         x.messages.unwrap_or_default(),
                     )
                         .ok()
@@ -163,16 +163,16 @@ impl Thread {
                     messages.sort_by(|a, b| a.created.cmp(&b.created));
                     messages
                 },
-                members: x.members.unwrap_or_default().into_iter().map(UserId).collect(),
+                members: x.members.unwrap_or_default().into_iter().map(DBUserId).collect(),
             })
-        .try_collect::<Vec<Thread>>()
+        .try_collect::<Vec<DBThread>>()
         .await?;
 
         Ok(threads)
     }
 
     pub async fn remove_full(
-        id: ThreadId,
+        id: DBThreadId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<Option<()>, sqlx::error::Error> {
         sqlx::query!(
@@ -180,7 +180,7 @@ impl Thread {
             DELETE FROM threads_messages
             WHERE thread_id = $1
             ",
-            id as ThreadId,
+            id as DBThreadId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -189,7 +189,7 @@ impl Thread {
             DELETE FROM threads_members
             WHERE thread_id = $1
             ",
-            id as ThreadId
+            id as DBThreadId
         )
         .execute(&mut **transaction)
         .await?;
@@ -198,7 +198,7 @@ impl Thread {
             DELETE FROM threads
             WHERE id = $1
             ",
-            id as ThreadId,
+            id as DBThreadId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -207,11 +207,11 @@ impl Thread {
     }
 }
 
-impl ThreadMessage {
+impl DBThreadMessage {
     pub async fn get<'a, E>(
-        id: ThreadMessageId,
+        id: DBThreadMessageId,
         exec: E,
-    ) -> Result<Option<ThreadMessage>, sqlx::Error>
+    ) -> Result<Option<DBThreadMessage>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -221,9 +221,9 @@ impl ThreadMessage {
     }
 
     pub async fn get_many<'a, E>(
-        message_ids: &[ThreadMessageId],
+        message_ids: &[DBThreadMessageId],
         exec: E,
-    ) -> Result<Vec<ThreadMessage>, sqlx::Error>
+    ) -> Result<Vec<DBThreadMessage>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -240,22 +240,22 @@ impl ThreadMessage {
             &message_ids_parsed
         )
         .fetch(exec)
-        .map_ok(|x| ThreadMessage {
-            id: ThreadMessageId(x.id),
-            thread_id: ThreadId(x.thread_id),
-            author_id: x.author_id.map(UserId),
+        .map_ok(|x| DBThreadMessage {
+            id: DBThreadMessageId(x.id),
+            thread_id: DBThreadId(x.thread_id),
+            author_id: x.author_id.map(DBUserId),
             body: serde_json::from_value(x.body).unwrap_or(MessageBody::Deleted { private: false }),
             created: x.created,
             hide_identity: x.hide_identity,
         })
-        .try_collect::<Vec<ThreadMessage>>()
+        .try_collect::<Vec<DBThreadMessage>>()
         .await?;
 
         Ok(messages)
     }
 
     pub async fn remove_full(
-        id: ThreadMessageId,
+        id: DBThreadMessageId,
         private: bool,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<Option<()>, sqlx::error::Error> {
@@ -265,7 +265,7 @@ impl ThreadMessage {
             SET body = $2
             WHERE id = $1
             ",
-            id as ThreadMessageId,
+            id as DBThreadMessageId,
             serde_json::to_value(MessageBody::Deleted { private })
                 .unwrap_or(serde_json::json!({}))
         )
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index 8c3ec18b..4f9af3b8 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -1,9 +1,9 @@
-use super::ids::{ProjectId, UserId};
-use super::{CollectionId, ReportId, ThreadId};
+use super::ids::{DBProjectId, DBUserId};
+use super::{DBCollectionId, DBReportId, DBThreadId};
 use crate::database::models;
-use crate::database::models::charge_item::ChargeItem;
-use crate::database::models::user_subscription_item::UserSubscriptionItem;
-use crate::database::models::{DatabaseError, OrganizationId};
+use crate::database::models::charge_item::DBCharge;
+use crate::database::models::user_subscription_item::DBUserSubscription;
+use crate::database::models::{DBOrganizationId, DatabaseError};
 use crate::database::redis::RedisPool;
 use crate::models::billing::ChargeStatus;
 use crate::models::users::Badges;
@@ -19,8 +19,8 @@ const USER_USERNAMES_NAMESPACE: &str = "users_usernames";
 const USERS_PROJECTS_NAMESPACE: &str = "users_projects";
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct User {
-    pub id: UserId,
+pub struct DBUser {
+    pub id: DBUserId,
 
     pub github_id: Option<i64>,
     pub discord_id: Option<i64>,
@@ -51,7 +51,7 @@ pub struct User {
     pub allow_friend_requests: bool,
 }
 
-impl User {
+impl DBUser {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -72,7 +72,7 @@ impl User {
                 $14, $15, $16, $17, $18, $19, $20, $21
             )
             ",
-            self.id as UserId,
+            self.id as DBUserId,
             &self.username,
             self.email.as_ref(),
             self.avatar_url.as_ref(),
@@ -104,41 +104,41 @@ impl User {
         string: &str,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<User>, DatabaseError>
+    ) -> Result<Option<DBUser>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        User::get_many(&[string], executor, redis)
+        DBUser::get_many(&[string], executor, redis)
             .await
             .map(|x| x.into_iter().next())
     }
 
     pub async fn get_id<'a, 'b, E>(
-        id: UserId,
+        id: DBUserId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<User>, DatabaseError>
+    ) -> Result<Option<DBUser>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
-        User::get_many(&[crate::models::ids::UserId::from(id)], executor, redis)
+        DBUser::get_many(&[ariadne::ids::UserId::from(id)], executor, redis)
             .await
             .map(|x| x.into_iter().next())
     }
 
     pub async fn get_many_ids<'a, E>(
-        user_ids: &[UserId],
+        user_ids: &[DBUserId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<User>, DatabaseError>
+    ) -> Result<Vec<DBUser>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
         let ids = user_ids
             .iter()
-            .map(|x| crate::models::ids::UserId::from(*x))
+            .map(|x| ariadne::ids::UserId::from(*x))
             .collect::<Vec<_>>();
-        User::get_many(&ids, exec, redis).await
+        DBUser::get_many(&ids, exec, redis).await
     }
 
     pub async fn get_many<
@@ -149,7 +149,7 @@ impl User {
         users_strings: &[T],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<User>, DatabaseError>
+    ) -> Result<Vec<DBUser>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -187,8 +187,8 @@ impl User {
                 )
                     .fetch(exec)
                     .try_fold(DashMap::new(), |acc, u| {
-                        let user = User {
-                            id: UserId(u.id),
+                        let user = DBUser {
+                            id: DBUserId(u.id),
                             github_id: u.github_id,
                             discord_id: u.discord_id,
                             gitlab_id: u.gitlab_id,
@@ -227,7 +227,7 @@ impl User {
     pub async fn get_email<'a, E>(
         email: &str,
         exec: E,
-    ) -> Result<Option<UserId>, sqlx::Error>
+    ) -> Result<Option<DBUserId>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -241,14 +241,14 @@ impl User {
         .fetch_optional(exec)
         .await?;
 
-        Ok(user_pass.map(|x| UserId(x.id)))
+        Ok(user_pass.map(|x| DBUserId(x.id)))
     }
 
     pub async fn get_projects<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<ProjectId>, DatabaseError>
+    ) -> Result<Vec<DBProjectId>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -257,7 +257,7 @@ impl User {
         let mut redis = redis.connect().await?;
 
         let cached_projects = redis
-            .get_deserialized_from_json::<Vec<ProjectId>>(
+            .get_deserialized_from_json::<Vec<DBProjectId>>(
                 USERS_PROJECTS_NAMESPACE,
                 &user_id.0.to_string(),
             )
@@ -274,11 +274,11 @@ impl User {
             WHERE tm.user_id = $1
             ORDER BY m.downloads DESC
             ",
-            user_id as UserId,
+            user_id as DBUserId,
         )
         .fetch(exec)
-        .map_ok(|m| ProjectId(m.id))
-        .try_collect::<Vec<ProjectId>>()
+        .map_ok(|m| DBProjectId(m.id))
+        .try_collect::<Vec<DBProjectId>>()
         .await?;
 
         redis
@@ -294,9 +294,9 @@ impl User {
     }
 
     pub async fn get_organizations<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
-    ) -> Result<Vec<OrganizationId>, sqlx::Error>
+    ) -> Result<Vec<DBOrganizationId>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -308,20 +308,20 @@ impl User {
             INNER JOIN team_members tm ON tm.team_id = o.team_id AND tm.accepted = TRUE
             WHERE tm.user_id = $1
             ",
-            user_id as UserId,
+            user_id as DBUserId,
         )
         .fetch(exec)
-        .map_ok(|m| OrganizationId(m.id))
-        .try_collect::<Vec<OrganizationId>>()
+        .map_ok(|m| DBOrganizationId(m.id))
+        .try_collect::<Vec<DBOrganizationId>>()
         .await?;
 
         Ok(orgs)
     }
 
     pub async fn get_collections<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
-    ) -> Result<Vec<CollectionId>, sqlx::Error>
+    ) -> Result<Vec<DBCollectionId>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -332,20 +332,20 @@ impl User {
             SELECT c.id FROM collections c
             WHERE c.user_id = $1
             ",
-            user_id as UserId,
+            user_id as DBUserId,
         )
         .fetch(exec)
-        .map_ok(|m| CollectionId(m.id))
-        .try_collect::<Vec<CollectionId>>()
+        .map_ok(|m| DBCollectionId(m.id))
+        .try_collect::<Vec<DBCollectionId>>()
         .await?;
 
         Ok(projects)
     }
 
     pub async fn get_follows<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
-    ) -> Result<Vec<ProjectId>, sqlx::Error>
+    ) -> Result<Vec<DBProjectId>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -356,20 +356,20 @@ impl User {
             SELECT mf.mod_id FROM mod_follows mf
             WHERE mf.follower_id = $1
             ",
-            user_id as UserId,
+            user_id as DBUserId,
         )
         .fetch(exec)
-        .map_ok(|m| ProjectId(m.mod_id))
-        .try_collect::<Vec<ProjectId>>()
+        .map_ok(|m| DBProjectId(m.mod_id))
+        .try_collect::<Vec<DBProjectId>>()
         .await?;
 
         Ok(projects)
     }
 
     pub async fn get_reports<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
-    ) -> Result<Vec<ReportId>, sqlx::Error>
+    ) -> Result<Vec<DBReportId>, sqlx::Error>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -380,18 +380,18 @@ impl User {
             SELECT r.id FROM reports r
             WHERE r.user_id = $1
             ",
-            user_id as UserId,
+            user_id as DBUserId,
         )
         .fetch(exec)
-        .map_ok(|m| ReportId(m.id))
-        .try_collect::<Vec<ReportId>>()
+        .map_ok(|m| DBReportId(m.id))
+        .try_collect::<Vec<DBReportId>>()
         .await?;
 
         Ok(reports)
     }
 
     pub async fn get_backup_codes<'a, E>(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: E,
     ) -> Result<Vec<String>, sqlx::Error>
     where
@@ -404,7 +404,7 @@ impl User {
             SELECT code FROM user_backup_codes
             WHERE user_id = $1
             ",
-            user_id as UserId,
+            user_id as DBUserId,
         )
         .fetch(exec)
         .map_ok(|m| to_base62(m.code as u64))
@@ -415,7 +415,7 @@ impl User {
     }
 
     pub async fn clear_caches(
-        user_ids: &[(UserId, Option<String>)],
+        user_ids: &[(DBUserId, Option<String>)],
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
@@ -435,7 +435,7 @@ impl User {
     }
 
     pub async fn clear_project_cache(
-        user_ids: &[UserId],
+        user_ids: &[DBUserId],
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
@@ -452,17 +452,17 @@ impl User {
     }
 
     pub async fn remove(
-        id: UserId,
+        id: DBUserId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
         redis: &RedisPool,
     ) -> Result<Option<()>, DatabaseError> {
         let user = Self::get_id(id, &mut **transaction, redis).await?;
 
         if let Some(delete_user) = user {
-            User::clear_caches(&[(id, Some(delete_user.username))], redis)
+            DBUser::clear_caches(&[(id, Some(delete_user.username))], redis)
                 .await?;
 
-            let deleted_user: UserId =
+            let deleted_user: DBUserId =
                 crate::models::users::DELETED_USER.into();
 
             sqlx::query!(
@@ -471,8 +471,8 @@ impl User {
                 SET user_id = $1
                 WHERE (user_id = $2 AND is_owner = TRUE)
                 ",
-                deleted_user as UserId,
-                id as UserId,
+                deleted_user as DBUserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -483,8 +483,8 @@ impl User {
                 SET author_id = $1
                 WHERE (author_id = $2)
                 ",
-                deleted_user as UserId,
-                id as UserId,
+                deleted_user as DBUserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -495,7 +495,7 @@ impl User {
                 SELECT n.id FROM notifications n
                 WHERE n.user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .fetch(&mut **transaction)
             .map_ok(|m| m.id)
@@ -507,7 +507,7 @@ impl User {
                 DELETE FROM notifications
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -528,15 +528,15 @@ impl User {
                 FROM collections
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .fetch(&mut **transaction)
-            .map_ok(|x| CollectionId(x.id))
+            .map_ok(|x| DBCollectionId(x.id))
             .try_collect::<Vec<_>>()
             .await?;
 
             for collection_id in user_collections {
-                models::Collection::remove(collection_id, transaction, redis)
+                models::DBCollection::remove(collection_id, transaction, redis)
                     .await?;
             }
 
@@ -547,15 +547,15 @@ impl User {
                 INNER JOIN reports r ON t.report_id = r.id AND (r.user_id = $1 OR r.reporter = $1)
                 WHERE report_id IS NOT NULL
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .fetch(&mut **transaction)
-            .map_ok(|x| ThreadId(x.id))
+            .map_ok(|x| DBThreadId(x.id))
             .try_collect::<Vec<_>>()
             .await?;
 
             for thread_id in report_threads {
-                models::Thread::remove_full(thread_id, transaction).await?;
+                models::DBThread::remove_full(thread_id, transaction).await?;
             }
 
             sqlx::query!(
@@ -563,7 +563,7 @@ impl User {
                 DELETE FROM reports
                 WHERE user_id = $1 OR reporter = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -573,7 +573,7 @@ impl User {
                 DELETE FROM mod_follows
                 WHERE follower_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -583,7 +583,7 @@ impl User {
                 DELETE FROM team_members
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -593,7 +593,7 @@ impl User {
                 DELETE FROM payouts_values
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -603,7 +603,7 @@ impl User {
                 DELETE FROM payouts
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -614,8 +614,8 @@ impl User {
                 SET body = '{"type": "deleted"}', author_id = $2
                 WHERE author_id = $1
                 "#,
-                id as UserId,
-                deleted_user as UserId,
+                id as DBUserId,
+                deleted_user as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -625,7 +625,7 @@ impl User {
                 DELETE FROM threads_members
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -635,7 +635,7 @@ impl User {
                 DELETE FROM sessions
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -645,7 +645,7 @@ impl User {
                 DELETE FROM pats
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -655,18 +655,18 @@ impl User {
                 DELETE FROM friends
                 WHERE user_id = $1 OR friend_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
 
             let open_subscriptions =
-                UserSubscriptionItem::get_all_user(id, &mut **transaction)
+                DBUserSubscription::get_all_user(id, &mut **transaction)
                     .await?;
 
             for x in open_subscriptions {
                 let charge =
-                    ChargeItem::get_open_subscription(x.id, &mut **transaction)
+                    DBCharge::get_open_subscription(x.id, &mut **transaction)
                         .await?;
                 if let Some(mut charge) = charge {
                     charge.status = ChargeStatus::Cancelled;
@@ -683,8 +683,8 @@ impl User {
                 SET user_id = $1
                 WHERE user_id = $2
                 ",
-                deleted_user as UserId,
-                id as UserId,
+                deleted_user as DBUserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -694,7 +694,7 @@ impl User {
                 DELETE FROM user_backup_codes
                 WHERE user_id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
@@ -704,7 +704,7 @@ impl User {
                 DELETE FROM users
                 WHERE id = $1
                 ",
-                id as UserId,
+                id as DBUserId,
             )
             .execute(&mut **transaction)
             .await?;
diff --git a/apps/labrinth/src/database/models/user_subscription_item.rs b/apps/labrinth/src/database/models/user_subscription_item.rs
index 0cdd6785..ec677782 100644
--- a/apps/labrinth/src/database/models/user_subscription_item.rs
+++ b/apps/labrinth/src/database/models/user_subscription_item.rs
@@ -1,5 +1,5 @@
 use crate::database::models::{
-    DatabaseError, ProductPriceId, UserId, UserSubscriptionId,
+    DBProductPriceId, DBUserId, DBUserSubscriptionId, DatabaseError,
 };
 use crate::models::billing::{
     PriceDuration, SubscriptionMetadata, SubscriptionStatus,
@@ -8,17 +8,17 @@ use chrono::{DateTime, Utc};
 use itertools::Itertools;
 use std::convert::{TryFrom, TryInto};
 
-pub struct UserSubscriptionItem {
-    pub id: UserSubscriptionId,
-    pub user_id: UserId,
-    pub price_id: ProductPriceId,
+pub struct DBUserSubscription {
+    pub id: DBUserSubscriptionId,
+    pub user_id: DBUserId,
+    pub price_id: DBProductPriceId,
     pub interval: PriceDuration,
     pub created: DateTime<Utc>,
     pub status: SubscriptionStatus,
     pub metadata: Option<SubscriptionMetadata>,
 }
 
-struct UserSubscriptionResult {
+struct UserSubscriptionQueryResult {
     id: i64,
     user_id: i64,
     price_id: i64,
@@ -31,7 +31,7 @@ struct UserSubscriptionResult {
 macro_rules! select_user_subscriptions_with_predicate {
     ($predicate:tt, $param:ident) => {
         sqlx::query_as!(
-            UserSubscriptionResult,
+            UserSubscriptionQueryResult,
             r#"
             SELECT
                 us.id, us.user_id, us.price_id, us.interval, us.created, us.status, us.metadata
@@ -43,14 +43,14 @@ macro_rules! select_user_subscriptions_with_predicate {
     };
 }
 
-impl TryFrom<UserSubscriptionResult> for UserSubscriptionItem {
+impl TryFrom<UserSubscriptionQueryResult> for DBUserSubscription {
     type Error = serde_json::Error;
 
-    fn try_from(r: UserSubscriptionResult) -> Result<Self, Self::Error> {
-        Ok(UserSubscriptionItem {
-            id: UserSubscriptionId(r.id),
-            user_id: UserId(r.user_id),
-            price_id: ProductPriceId(r.price_id),
+    fn try_from(r: UserSubscriptionQueryResult) -> Result<Self, Self::Error> {
+        Ok(DBUserSubscription {
+            id: DBUserSubscriptionId(r.id),
+            user_id: DBUserId(r.user_id),
+            price_id: DBProductPriceId(r.price_id),
             interval: PriceDuration::from_string(&r.interval),
             created: r.created,
             status: SubscriptionStatus::from_string(&r.status),
@@ -59,18 +59,18 @@ impl TryFrom<UserSubscriptionResult> for UserSubscriptionItem {
     }
 }
 
-impl UserSubscriptionItem {
+impl DBUserSubscription {
     pub async fn get(
-        id: UserSubscriptionId,
+        id: DBUserSubscriptionId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Option<UserSubscriptionItem>, DatabaseError> {
+    ) -> Result<Option<DBUserSubscription>, DatabaseError> {
         Ok(Self::get_many(&[id], exec).await?.into_iter().next())
     }
 
     pub async fn get_many(
-        ids: &[UserSubscriptionId],
+        ids: &[DBUserSubscriptionId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<UserSubscriptionItem>, DatabaseError> {
+    ) -> Result<Vec<DBUserSubscription>, DatabaseError> {
         let ids = ids.iter().map(|id| id.0).collect_vec();
         let ids_ref: &[i64] = &ids;
         let results = select_user_subscriptions_with_predicate!(
@@ -87,9 +87,9 @@ impl UserSubscriptionItem {
     }
 
     pub async fn get_all_user(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<UserSubscriptionItem>, DatabaseError> {
+    ) -> Result<Vec<DBUserSubscription>, DatabaseError> {
         let user_id = user_id.0;
         let results = select_user_subscriptions_with_predicate!(
             "WHERE us.user_id = $1",
@@ -107,7 +107,7 @@ impl UserSubscriptionItem {
     pub async fn get_all_servers(
         status: Option<SubscriptionStatus>,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-    ) -> Result<Vec<UserSubscriptionItem>, DatabaseError> {
+    ) -> Result<Vec<DBUserSubscription>, DatabaseError> {
         let status = status.map(|x| x.as_str());
 
         let results = select_user_subscriptions_with_predicate!(
diff --git a/apps/labrinth/src/database/models/version_item.rs b/apps/labrinth/src/database/models/version_item.rs
index f8de51f6..3a4edb76 100644
--- a/apps/labrinth/src/database/models/version_item.rs
+++ b/apps/labrinth/src/database/models/version_item.rs
@@ -1,6 +1,6 @@
+use super::DatabaseError;
 use super::ids::*;
 use super::loader_fields::VersionField;
-use super::DatabaseError;
 use crate::database::models::loader_fields::{
     QueryLoaderField, QueryLoaderFieldEnumValue, QueryVersionField,
 };
@@ -20,9 +20,9 @@ const VERSION_FILES_NAMESPACE: &str = "versions_files";
 
 #[derive(Clone)]
 pub struct VersionBuilder {
-    pub version_id: VersionId,
-    pub project_id: ProjectId,
-    pub author_id: UserId,
+    pub version_id: DBVersionId,
+    pub project_id: DBProjectId,
+    pub author_id: DBUserId,
     pub name: String,
     pub version_number: String,
     pub changelog: String,
@@ -39,8 +39,8 @@ pub struct VersionBuilder {
 
 #[derive(Clone)]
 pub struct DependencyBuilder {
-    pub project_id: Option<ProjectId>,
-    pub version_id: Option<VersionId>,
+    pub project_id: Option<DBProjectId>,
+    pub version_id: Option<DBVersionId>,
     pub file_name: Option<String>,
     pub dependency_type: String,
 }
@@ -48,7 +48,7 @@ pub struct DependencyBuilder {
 impl DependencyBuilder {
     pub async fn insert_many(
         builders: Vec<Self>,
-        version_id: VersionId,
+        version_id: DBVersionId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         let mut project_ids = Vec::new();
@@ -97,7 +97,7 @@ impl DependencyBuilder {
     async fn try_get_project_id(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<Option<ProjectId>, DatabaseError> {
+    ) -> Result<Option<DBProjectId>, DatabaseError> {
         Ok(if let Some(project_id) = self.project_id {
             Some(project_id)
         } else if let Some(version_id) = self.version_id {
@@ -105,11 +105,11 @@ impl DependencyBuilder {
                 "
                 SELECT mod_id FROM versions WHERE id = $1
                 ",
-                version_id as VersionId,
+                version_id as DBVersionId,
             )
             .fetch_optional(&mut **transaction)
             .await?
-            .map(|x| ProjectId(x.mod_id))
+            .map(|x| DBProjectId(x.mod_id))
         } else {
             None
         })
@@ -129,9 +129,9 @@ pub struct VersionFileBuilder {
 impl VersionFileBuilder {
     pub async fn insert(
         self,
-        version_id: VersionId,
+        version_id: DBVersionId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<FileId, DatabaseError> {
+    ) -> Result<DBFileId, DatabaseError> {
         let file_id = generate_file_id(&mut *transaction).await?;
 
         sqlx::query!(
@@ -139,8 +139,8 @@ impl VersionFileBuilder {
             INSERT INTO files (id, version_id, url, filename, is_primary, size, file_type)
             VALUES ($1, $2, $3, $4, $5, $6, $7)
             ",
-            file_id as FileId,
-            version_id as VersionId,
+            file_id as DBFileId,
+            version_id as DBVersionId,
             self.url,
             self.filename,
             self.primary,
@@ -156,7 +156,7 @@ impl VersionFileBuilder {
                 INSERT INTO hashes (file_id, algorithm, hash)
                 VALUES ($1, $2, $3)
                 ",
-                file_id as FileId,
+                file_id as DBFileId,
                 hash.algorithm,
                 hash.hash,
             )
@@ -178,8 +178,8 @@ impl VersionBuilder {
     pub async fn insert(
         self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<VersionId, DatabaseError> {
-        let version = Version {
+    ) -> Result<DBVersionId, DatabaseError> {
+        let version = DBVersion {
             id: self.version_id,
             project_id: self.project_id,
             author_id: self.author_id,
@@ -203,7 +203,7 @@ impl VersionBuilder {
             SET updated = NOW()
             WHERE id = $1
             ",
-            self.project_id as ProjectId,
+            self.project_id as DBProjectId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -229,9 +229,12 @@ impl VersionBuilder {
 
         let loader_versions = loaders
             .iter()
-            .map(|l| LoaderVersion::new(*l, version_id))
+            .map(|&loader_id| DBLoaderVersion {
+                loader_id,
+                version_id,
+            })
             .collect_vec();
-        LoaderVersion::insert_many(loader_versions, transaction).await?;
+        DBLoaderVersion::insert_many(loader_versions, transaction).await?;
 
         VersionField::insert_many(self.version_fields, transaction).await?;
 
@@ -239,13 +242,13 @@ impl VersionBuilder {
     }
 }
 
-#[derive(derive_new::new, Serialize, Deserialize)]
-pub struct LoaderVersion {
+#[derive(Serialize, Deserialize)]
+pub struct DBLoaderVersion {
     pub loader_id: LoaderId,
-    pub version_id: VersionId,
+    pub version_id: DBVersionId,
 }
 
-impl LoaderVersion {
+impl DBLoaderVersion {
     pub async fn insert_many(
         items: Vec<Self>,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -270,10 +273,10 @@ impl LoaderVersion {
 }
 
 #[derive(Clone, Deserialize, Serialize, PartialEq, Eq)]
-pub struct Version {
-    pub id: VersionId,
-    pub project_id: ProjectId,
-    pub author_id: UserId,
+pub struct DBVersion {
+    pub id: DBVersionId,
+    pub project_id: DBProjectId,
+    pub author_id: DBUserId,
     pub name: String,
     pub version_number: String,
     pub changelog: String,
@@ -286,7 +289,7 @@ pub struct Version {
     pub ordering: Option<i32>,
 }
 
-impl Version {
+impl DBVersion {
     pub async fn insert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -304,9 +307,9 @@ impl Version {
                 $9, $10, $11, $12
             )
             ",
-            self.id as VersionId,
-            self.project_id as ProjectId,
-            self.author_id as UserId,
+            self.id as DBVersionId,
+            self.project_id as DBProjectId,
+            self.author_id as DBUserId,
             &self.name,
             &self.version_number,
             self.changelog,
@@ -324,7 +327,7 @@ impl Version {
     }
 
     pub async fn remove_full(
-        id: VersionId,
+        id: DBVersionId,
         redis: &RedisPool,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<Option<()>, DatabaseError> {
@@ -336,7 +339,7 @@ impl Version {
             return Ok(None);
         };
 
-        Version::clear_cache(&result, redis).await?;
+        DBVersion::clear_cache(&result, redis).await?;
 
         sqlx::query!(
             "
@@ -344,7 +347,7 @@ impl Version {
             SET version_id = NULL
             WHERE version_id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -354,7 +357,7 @@ impl Version {
             DELETE FROM version_fields vf
             WHERE vf.version_id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -364,7 +367,7 @@ impl Version {
             DELETE FROM loaders_versions
             WHERE loaders_versions.version_id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -378,7 +381,7 @@ impl Version {
                     (hashes.file_id = files.id)
             )
             ",
-            id as VersionId
+            id as DBVersionId
         )
         .execute(&mut **transaction)
         .await?;
@@ -388,7 +391,7 @@ impl Version {
             DELETE FROM files
             WHERE files.version_id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -399,7 +402,7 @@ impl Version {
             "
             SELECT mod_id FROM versions WHERE id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .fetch_one(&mut **transaction)
         .await?;
@@ -410,7 +413,7 @@ impl Version {
             SET dependency_id = NULL, mod_dependency_id = $2
             WHERE dependency_id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
             project_id.mod_id,
         )
         .execute(&mut **transaction)
@@ -428,7 +431,7 @@ impl Version {
             "
             DELETE FROM dependencies WHERE dependent_id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .execute(&mut **transaction)
         .await?;
@@ -439,13 +442,13 @@ impl Version {
             "
             DELETE FROM versions WHERE id = $1
             ",
-            id as VersionId,
+            id as DBVersionId,
         )
         .execute(&mut **transaction)
         .await?;
 
-        crate::database::models::Project::clear_cache(
-            ProjectId(project_id.mod_id),
+        crate::database::models::DBProject::clear_cache(
+            DBProjectId(project_id.mod_id),
             None,
             None,
             redis,
@@ -456,10 +459,10 @@ impl Version {
     }
 
     pub async fn get<'a, 'b, E>(
-        id: VersionId,
+        id: DBVersionId,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<QueryVersion>, DatabaseError>
+    ) -> Result<Option<VersionQueryResult>, DatabaseError>
     where
         E: sqlx::Acquire<'a, Database = sqlx::Postgres>,
     {
@@ -469,10 +472,10 @@ impl Version {
     }
 
     pub async fn get_many<'a, E>(
-        version_ids: &[VersionId],
+        version_ids: &[DBVersionId],
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<QueryVersion>, DatabaseError>
+    ) -> Result<Vec<VersionQueryResult>, DatabaseError>
     where
         E: sqlx::Acquire<'a, Database = sqlx::Postgres>,
     {
@@ -483,7 +486,7 @@ impl Version {
                 let mut exec = exec.acquire().await?;
 
                 let loader_field_enum_value_ids = DashSet::new();
-                let version_fields: DashMap<VersionId, Vec<QueryVersionField>> = sqlx::query!(
+                let version_fields: DashMap<DBVersionId, Vec<QueryVersionField>> = sqlx::query!(
                     "
                     SELECT version_id, field_id, int_value, enum_value, string_value
                     FROM version_fields
@@ -494,9 +497,9 @@ impl Version {
                     .fetch(&mut *exec)
                     .try_fold(
                         DashMap::new(),
-                        |acc: DashMap<VersionId, Vec<QueryVersionField>>, m| {
+                        |acc: DashMap<DBVersionId, Vec<QueryVersionField>>, m| {
                             let qvf = QueryVersionField {
-                                version_id: VersionId(m.version_id),
+                                version_id: DBVersionId(m.version_id),
                                 field_id: LoaderFieldId(m.field_id),
                                 int_value: m.int_value,
                                 enum_value: if m.enum_value == -1  { None } else { Some(LoaderFieldEnumValueId(m.enum_value)) },
@@ -507,7 +510,7 @@ impl Version {
                                 loader_field_enum_value_ids.insert(LoaderFieldEnumValueId(m.enum_value));
                             }
 
-                            acc.entry(VersionId(m.version_id)).or_default().push(qvf);
+                            acc.entry(DBVersionId(m.version_id)).or_default().push(qvf);
                             async move { Ok(acc) }
                         },
                     )
@@ -522,7 +525,7 @@ impl Version {
                 }
 
                 let loader_field_ids = DashSet::new();
-                let loaders_ptypes_games: DashMap<VersionId, VersionLoaderData> = sqlx::query!(
+                let loaders_ptypes_games: DashMap<DBVersionId, VersionLoaderData> = sqlx::query!(
                     "
                     SELECT DISTINCT version_id,
                         ARRAY_AGG(DISTINCT l.loader) filter (where l.loader is not null) loaders,
@@ -543,7 +546,7 @@ impl Version {
                     &version_ids
                 ).fetch(&mut *exec)
                     .map_ok(|m| {
-                        let version_id = VersionId(m.version_id);
+                        let version_id = DBVersionId(m.version_id);
 
                         // 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<_>>();
@@ -611,14 +614,14 @@ impl Version {
 
                 #[derive(Deserialize)]
                 struct Hash {
-                    pub file_id: FileId,
+                    pub file_id: DBFileId,
                     pub algorithm: String,
                     pub hash: String,
                 }
 
                 #[derive(Deserialize)]
                 struct File {
-                    pub id: FileId,
+                    pub id: DBFileId,
                     pub url: String,
                     pub filename: String,
                     pub primary: bool,
@@ -628,7 +631,7 @@ impl Version {
 
                 let file_ids = DashSet::new();
                 let reverse_file_map = DashMap::new();
-                let files : DashMap<VersionId, Vec<File>> = sqlx::query!(
+                let files : DashMap<DBVersionId, Vec<File>> = sqlx::query!(
                     "
                     SELECT DISTINCT version_id, f.id, f.url, f.filename, f.is_primary, f.size, f.file_type
                     FROM files f
@@ -636,9 +639,9 @@ impl Version {
                     ",
                     &version_ids
                 ).fetch(&mut *exec)
-                    .try_fold(DashMap::new(), |acc : DashMap<VersionId, Vec<File>>, m| {
+                    .try_fold(DashMap::new(), |acc : DashMap<DBVersionId, Vec<File>>, m| {
                         let file = File {
-                            id: FileId(m.id),
+                            id: DBFileId(m.id),
                             url: m.url,
                             filename: m.filename,
                             primary: m.is_primary,
@@ -646,17 +649,17 @@ impl Version {
                             file_type: m.file_type.map(|x| FileType::from_string(&x)),
                         };
 
-                        file_ids.insert(FileId(m.id));
-                        reverse_file_map.insert(FileId(m.id), VersionId(m.version_id));
+                        file_ids.insert(DBFileId(m.id));
+                        reverse_file_map.insert(DBFileId(m.id), DBVersionId(m.version_id));
 
-                        acc.entry(VersionId(m.version_id))
+                        acc.entry(DBVersionId(m.version_id))
                             .or_default()
                             .push(file);
                         async move { Ok(acc) }
                     }
                     ).await?;
 
-                let hashes: DashMap<VersionId, Vec<Hash>> = sqlx::query!(
+                let hashes: DashMap<DBVersionId, Vec<Hash>> = sqlx::query!(
                     "
                     SELECT DISTINCT file_id, algorithm, encode(hash, 'escape') hash
                     FROM hashes
@@ -665,15 +668,15 @@ impl Version {
                     &file_ids.iter().map(|x| x.0).collect::<Vec<_>>()
                 )
                     .fetch(&mut *exec)
-                    .try_fold(DashMap::new(), |acc: DashMap<VersionId, Vec<Hash>>, m| {
+                    .try_fold(DashMap::new(), |acc: DashMap<DBVersionId, Vec<Hash>>, m| {
                         if let Some(found_hash) = m.hash {
                             let hash = Hash {
-                                file_id: FileId(m.file_id),
+                                file_id: DBFileId(m.file_id),
                                 algorithm: m.algorithm,
                                 hash: found_hash,
                             };
 
-                            if let Some(version_id) = reverse_file_map.get(&FileId(m.file_id)) {
+                            if let Some(version_id) = reverse_file_map.get(&DBFileId(m.file_id)) {
                                 acc.entry(*version_id).or_default().push(hash);
                             }
                         }
@@ -681,7 +684,7 @@ impl Version {
                     })
                     .await?;
 
-                let dependencies : DashMap<VersionId, Vec<QueryDependency>> = sqlx::query!(
+                let dependencies : DashMap<DBVersionId, Vec<DependencyQueryResult>> = sqlx::query!(
                     "
                     SELECT DISTINCT dependent_id as version_id, d.mod_dependency_id as dependency_project_id, d.dependency_id as dependency_version_id, d.dependency_file_name as file_name, d.dependency_type as dependency_type
                     FROM dependencies d
@@ -689,15 +692,15 @@ impl Version {
                     ",
                     &version_ids
                 ).fetch(&mut *exec)
-                    .try_fold(DashMap::new(), |acc : DashMap<_,Vec<QueryDependency>>, m| {
-                        let dependency = QueryDependency {
-                            project_id: m.dependency_project_id.map(ProjectId),
-                            version_id: m.dependency_version_id.map(VersionId),
+                    .try_fold(DashMap::new(), |acc : DashMap<_,Vec<DependencyQueryResult>>, m| {
+                        let dependency = DependencyQueryResult {
+                            project_id: m.dependency_project_id.map(DBProjectId),
+                            version_id: m.dependency_version_id.map(DBVersionId),
                             file_name: m.file_name,
                             dependency_type: m.dependency_type,
                         };
 
-                        acc.entry(VersionId(m.version_id))
+                        acc.entry(DBVersionId(m.version_id))
                             .or_default()
                             .push(dependency);
                         async move { Ok(acc) }
@@ -716,7 +719,7 @@ impl Version {
                 )
                     .fetch(&mut *exec)
                     .try_fold(DashMap::new(), |acc, v| {
-                        let version_id = VersionId(v.id);
+                        let version_id = DBVersionId(v.id);
                         let VersionLoaderData {
                             loaders,
                             project_types,
@@ -732,11 +735,11 @@ impl Version {
                             .filter(|x| loader_loader_field_ids.contains(&x.id))
                             .collect::<Vec<_>>();
 
-                        let query_version = QueryVersion {
-                            inner: Version {
-                                id: VersionId(v.id),
-                                project_id: ProjectId(v.mod_id),
-                                author_id: UserId(v.author_id),
+                        let query_version = VersionQueryResult {
+                            inner: DBVersion {
+                                id: DBVersionId(v.id),
+                                project_id: DBProjectId(v.mod_id),
+                                author_id: DBUserId(v.author_id),
                                 name: v.version_name,
                                 version_number: v.version_number,
                                 changelog: v.changelog,
@@ -762,7 +765,7 @@ impl Version {
                                         }
                                     }
 
-                                    QueryFile {
+                                    FileQueryResult {
                                         id: x.id,
                                         url: x.url.clone(),
                                         filename: x.filename.clone(),
@@ -809,10 +812,10 @@ impl Version {
     pub async fn get_file_from_hash<'a, 'b, E>(
         algo: String,
         hash: String,
-        version_id: Option<VersionId>,
+        version_id: Option<DBVersionId>,
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Option<SingleFile>, DatabaseError>
+    ) -> Result<Option<DBFile>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -829,7 +832,7 @@ impl Version {
         hashes: &[String],
         executor: E,
         redis: &RedisPool,
-    ) -> Result<Vec<SingleFile>, DatabaseError>
+    ) -> Result<Vec<DBFile>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -869,10 +872,10 @@ impl Version {
                         if let Some(hash) = hashes.get(&algorithm) {
                             let key = format!("{algorithm}_{hash}");
 
-                            let file = SingleFile {
-                                id: FileId(f.id),
-                                version_id: VersionId(f.version_id),
-                                project_id: ProjectId(f.mod_id),
+                            let file = DBFile {
+                                id: DBFileId(f.id),
+                                version_id: DBVersionId(f.version_id),
+                                project_id: DBProjectId(f.mod_id),
                                 url: f.url,
                                 filename: f.filename,
                                 hashes,
@@ -896,7 +899,7 @@ impl Version {
     }
 
     pub async fn clear_cache(
-        version: &QueryVersion,
+        version: &VersionQueryResult,
         redis: &RedisPool,
     ) -> Result<(), DatabaseError> {
         let mut redis = redis.connect().await?;
@@ -912,7 +915,7 @@ impl Version {
                         file.hashes.iter().map(|(algo, hash)| {
                             (
                                 VERSION_FILES_NAMESPACE,
-                                Some(format!("{}_{}", algo, hash)),
+                                Some(format!("{algo}_{hash}")),
                             )
                         })
                     },
@@ -924,28 +927,28 @@ impl Version {
 }
 
 #[derive(Clone, Deserialize, Serialize, PartialEq, Eq)]
-pub struct QueryVersion {
-    pub inner: Version,
+pub struct VersionQueryResult {
+    pub inner: DBVersion,
 
-    pub files: Vec<QueryFile>,
+    pub files: Vec<FileQueryResult>,
     pub version_fields: Vec<VersionField>,
     pub loaders: Vec<String>,
     pub project_types: Vec<String>,
     pub games: Vec<String>,
-    pub dependencies: Vec<QueryDependency>,
+    pub dependencies: Vec<DependencyQueryResult>,
 }
 
 #[derive(Clone, Deserialize, Serialize, PartialEq, Eq)]
-pub struct QueryDependency {
-    pub project_id: Option<ProjectId>,
-    pub version_id: Option<VersionId>,
+pub struct DependencyQueryResult {
+    pub project_id: Option<DBProjectId>,
+    pub version_id: Option<DBVersionId>,
     pub file_name: Option<String>,
     pub dependency_type: String,
 }
 
 #[derive(Clone, Deserialize, Serialize, PartialEq, Eq)]
-pub struct QueryFile {
-    pub id: FileId,
+pub struct FileQueryResult {
+    pub id: DBFileId,
     pub url: String,
     pub filename: String,
     pub hashes: HashMap<String, String>,
@@ -955,10 +958,10 @@ pub struct QueryFile {
 }
 
 #[derive(Clone, Deserialize, Serialize)]
-pub struct SingleFile {
-    pub id: FileId,
-    pub version_id: VersionId,
-    pub project_id: ProjectId,
+pub struct DBFile {
+    pub id: DBFileId,
+    pub version_id: DBVersionId,
+    pub project_id: DBProjectId,
     pub url: String,
     pub filename: String,
     pub hashes: HashMap<String, String>,
@@ -967,19 +970,19 @@ pub struct SingleFile {
     pub file_type: Option<FileType>,
 }
 
-impl std::cmp::Ord for QueryVersion {
+impl std::cmp::Ord for VersionQueryResult {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         self.inner.cmp(&other.inner)
     }
 }
 
-impl std::cmp::PartialOrd for QueryVersion {
+impl std::cmp::PartialOrd for VersionQueryResult {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
 }
 
-impl std::cmp::Ord for Version {
+impl std::cmp::Ord for DBVersion {
     fn cmp(&self, other: &Self) -> Ordering {
         let ordering_order = match (self.ordering, other.ordering) {
             (None, None) => Ordering::Equal,
@@ -995,7 +998,7 @@ impl std::cmp::Ord for Version {
     }
 }
 
-impl std::cmp::PartialOrd for Version {
+impl std::cmp::PartialOrd for DBVersion {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
@@ -1032,13 +1035,13 @@ mod tests {
         id: i64,
         ordering: Option<i32>,
         date_published: DateTime<Utc>,
-    ) -> Version {
-        Version {
-            id: VersionId(id),
+    ) -> DBVersion {
+        DBVersion {
+            id: DBVersionId(id),
             ordering,
             date_published,
-            project_id: ProjectId(0),
-            author_id: UserId(0),
+            project_id: DBProjectId(0),
+            author_id: DBUserId(0),
             name: Default::default(),
             version_number: Default::default(),
             changelog: Default::default(),
diff --git a/apps/labrinth/src/database/redis.rs b/apps/labrinth/src/database/redis.rs
index ee0268fd..913701ed 100644
--- a/apps/labrinth/src/database/redis.rs
+++ b/apps/labrinth/src/database/redis.rs
@@ -4,7 +4,7 @@ use chrono::{TimeZone, Utc};
 use dashmap::DashMap;
 use deadpool_redis::{Config, Runtime};
 use prometheus::{IntGauge, Registry};
-use redis::{cmd, Cmd, ExistenceCheck, SetExpiry, SetOptions};
+use redis::{Cmd, ExistenceCheck, SetExpiry, SetOptions, cmd};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
diff --git a/apps/labrinth/src/file_hosting/backblaze/upload.rs b/apps/labrinth/src/file_hosting/backblaze/upload.rs
index b43aa1b5..44bed469 100644
--- a/apps/labrinth/src/file_hosting/backblaze/upload.rs
+++ b/apps/labrinth/src/file_hosting/backblaze/upload.rs
@@ -1,7 +1,9 @@
 use super::authorization::UploadUrlData;
 use crate::file_hosting::FileHostingError;
 use bytes::Bytes;
+use hex::ToHex;
 use serde::{Deserialize, Serialize};
+use sha1::Digest;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
@@ -35,7 +37,7 @@ pub async fn upload_file(
         .header(reqwest::header::CONTENT_LENGTH, file_bytes.len())
         .header(
             "X-Bz-Content-Sha1",
-            sha1::Sha1::from(&file_bytes).hexdigest(),
+            sha1::Sha1::digest(&file_bytes).encode_hex::<String>(),
         )
         .body(file_bytes)
         .send()
diff --git a/apps/labrinth/src/file_hosting/mock.rs b/apps/labrinth/src/file_hosting/mock.rs
index f520bd11..aef633e5 100644
--- a/apps/labrinth/src/file_hosting/mock.rs
+++ b/apps/labrinth/src/file_hosting/mock.rs
@@ -2,6 +2,7 @@ use super::{DeleteFileData, FileHost, FileHostingError, UploadFileData};
 use async_trait::async_trait;
 use bytes::Bytes;
 use chrono::Utc;
+use hex::ToHex;
 use sha2::Digest;
 
 #[derive(Default)]
@@ -27,7 +28,7 @@ impl FileHost for MockHost {
         std::fs::create_dir_all(
             path.parent().ok_or(FileHostingError::InvalidFilename)?,
         )?;
-        let content_sha1 = sha1::Sha1::from(&file_bytes).hexdigest();
+        let content_sha1 = sha1::Sha1::digest(&file_bytes).encode_hex();
         let content_sha512 = format!("{:x}", sha2::Sha512::digest(&file_bytes));
 
         std::fs::write(path, &*file_bytes)?;
diff --git a/apps/labrinth/src/file_hosting/s3_host.rs b/apps/labrinth/src/file_hosting/s3_host.rs
index c4893781..369ee52d 100644
--- a/apps/labrinth/src/file_hosting/s3_host.rs
+++ b/apps/labrinth/src/file_hosting/s3_host.rs
@@ -4,6 +4,7 @@ use crate::file_hosting::{
 use async_trait::async_trait;
 use bytes::Bytes;
 use chrono::Utc;
+use hex::ToHex;
 use s3::bucket::Bucket;
 use s3::creds::Credentials;
 use s3::region::Region;
@@ -52,7 +53,7 @@ impl S3Host {
             )
         })?;
 
-        Ok(S3Host { bucket })
+        Ok(S3Host { bucket: *bucket })
     }
 }
 
@@ -64,7 +65,7 @@ impl FileHost for S3Host {
         file_name: &str,
         file_bytes: Bytes,
     ) -> Result<UploadFileData, FileHostingError> {
-        let content_sha1 = sha1::Sha1::from(&file_bytes).hexdigest();
+        let content_sha1 = sha1::Sha1::digest(&file_bytes).encode_hex();
         let content_sha512 = format!("{:x}", sha2::Sha512::digest(&file_bytes));
 
         self.bucket
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index 18b94a72..66007a9a 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -316,7 +316,7 @@ pub fn app_config(
     .configure(
         #[allow(unused_variables)]
         |cfg| {
-            #[cfg(not(target_env = "msvc"))]
+            #[cfg(target_os = "linux")]
             routes::debug::config(cfg)
         },
     )
@@ -374,7 +374,10 @@ pub fn check_env_vars() -> bool {
             failed |= check_var::<String>("MOCK_FILE_PATH");
         }
         Some(backend) => {
-            warn!("Variable `STORAGE_BACKEND` contains an invalid value: {}. Expected \"backblaze\", \"s3\", or \"local\".", backend);
+            warn!(
+                "Variable `STORAGE_BACKEND` contains an invalid value: {}. Expected \"backblaze\", \"s3\", or \"local\".",
+                backend
+            );
             failed |= true;
         }
         _ => {
@@ -387,12 +390,16 @@ pub fn check_env_vars() -> bool {
     failed |= check_var::<usize>("VERSION_INDEX_INTERVAL");
 
     if parse_strings_from_var("WHITELISTED_MODPACK_DOMAINS").is_none() {
-        warn!("Variable `WHITELISTED_MODPACK_DOMAINS` missing in dotenv or not a json array of strings");
+        warn!(
+            "Variable `WHITELISTED_MODPACK_DOMAINS` missing in dotenv or not a json array of strings"
+        );
         failed |= true;
     }
 
     if parse_strings_from_var("ALLOWED_CALLBACK_URLS").is_none() {
-        warn!("Variable `ALLOWED_CALLBACK_URLS` missing in dotenv or not a json array of strings");
+        warn!(
+            "Variable `ALLOWED_CALLBACK_URLS` missing in dotenv or not a json array of strings"
+        );
         failed |= true;
     }
 
@@ -425,6 +432,8 @@ pub fn check_env_vars() -> bool {
     failed |= check_var::<String>("SMTP_USERNAME");
     failed |= check_var::<String>("SMTP_PASSWORD");
     failed |= check_var::<String>("SMTP_HOST");
+    failed |= check_var::<u16>("SMTP_PORT");
+    failed |= check_var::<String>("SMTP_TLS");
 
     failed |= check_var::<String>("SITE_VERIFY_EMAIL_PATH");
     failed |= check_var::<String>("SITE_RESET_PASSWORD_PATH");
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index 1c4f9c87..25a7b9f3 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -12,12 +12,12 @@ use std::sync::Arc;
 use tracing::{error, info};
 use tracing_actix_web::TracingLogger;
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(target_os = "linux")]
 #[global_allocator]
 static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 #[allow(non_upper_case_globals)]
-#[export_name = "malloc_conf"]
+#[unsafe(export_name = "malloc_conf")]
 pub static malloc_conf: &[u8] =
     b"prof:true,prof_active:true,lg_prof_sample:19\0";
 
@@ -63,7 +63,9 @@ async fn main() -> std::io::Result<()> {
     });
     if sentry.is_enabled() {
         info!("Enabled Sentry integration");
-        std::env::set_var("RUST_BACKTRACE", "1");
+        unsafe {
+            std::env::set_var("RUST_BACKTRACE", "1");
+        }
     }
 
     if args.run_background_task.is_none() {
@@ -149,8 +151,8 @@ async fn main() -> std::io::Result<()> {
         .await
         .expect("Failed to register redis metrics");
 
-    #[cfg(not(target_env = "msvc"))]
-    labrinth::routes::debug::jemalloc_mmeory_stats(&prometheus.registry)
+    #[cfg(target_os = "linux")]
+    labrinth::routes::debug::jemalloc_memory_stats(&prometheus.registry)
         .expect("Failed to register jemalloc metrics");
 
     let labrinth_config = labrinth::app_setup(
diff --git a/apps/labrinth/src/models/v2/notifications.rs b/apps/labrinth/src/models/v2/notifications.rs
index 6e4166a5..59626b0a 100644
--- a/apps/labrinth/src/models/v2/notifications.rs
+++ b/apps/labrinth/src/models/v2/notifications.rs
@@ -1,14 +1,14 @@
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-
+use crate::models::ids::{ThreadMessageId, VersionId};
 use crate::models::{
     ids::{
         NotificationId, OrganizationId, ProjectId, ReportId, TeamId, ThreadId,
-        ThreadMessageId, UserId, VersionId,
     },
     notifications::{Notification, NotificationAction, NotificationBody},
     projects::ProjectStatus,
 };
+use ariadne::ids::UserId;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
 pub struct LegacyNotification {
diff --git a/apps/labrinth/src/models/v2/projects.rs b/apps/labrinth/src/models/v2/projects.rs
index a96d5170..35a340f0 100644
--- a/apps/labrinth/src/models/v2/projects.rs
+++ b/apps/labrinth/src/models/v2/projects.rs
@@ -3,17 +3,15 @@ use std::convert::TryFrom;
 use std::collections::HashMap;
 
 use super::super::ids::OrganizationId;
-use super::super::teams::TeamId;
-use super::super::users::UserId;
-use crate::database::models::{version_item, DatabaseError};
+use crate::database::models::{DatabaseError, version_item};
 use crate::database::redis::RedisPool;
-use crate::models::ids::{ProjectId, VersionId};
+use crate::models::ids::{ProjectId, TeamId, ThreadId, VersionId};
 use crate::models::projects::{
     Dependency, License, Link, Loader, ModeratorMessage, MonetizationStatus,
     Project, ProjectStatus, Version, VersionFile, VersionStatus, VersionType,
 };
-use crate::models::threads::ThreadId;
 use crate::routes::v2_reroute::{self, capitalize_first};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -105,7 +103,7 @@ impl LegacyProject {
     // It's safe to use a db version_item for this as the only info is side types, game versions, and loader fields (for loaders), which used to be public on project anyway.
     pub fn from(
         data: Project,
-        versions_item: Option<version_item::QueryVersion>,
+        versions_item: Option<version_item::VersionQueryResult>,
     ) -> Self {
         let mut client_side = LegacySideType::Unknown;
         let mut server_side = LegacySideType::Unknown;
@@ -239,7 +237,8 @@ impl LegacyProject {
             .filter_map(|p| p.versions.first().map(|i| (*i).into()))
             .collect();
         let example_versions =
-            version_item::Version::get_many(&version_ids, exec, redis).await?;
+            version_item::DBVersion::get_many(&version_ids, exec, redis)
+                .await?;
         let mut legacy_projects = Vec::new();
         for project in data {
             let version_item = example_versions
diff --git a/apps/labrinth/src/models/v2/reports.rs b/apps/labrinth/src/models/v2/reports.rs
index 4e531326..7682941f 100644
--- a/apps/labrinth/src/models/v2/reports.rs
+++ b/apps/labrinth/src/models/v2/reports.rs
@@ -1,5 +1,6 @@
-use crate::models::ids::{ReportId, ThreadId, UserId};
+use crate::models::ids::{ReportId, ThreadId};
 use crate::models::reports::{ItemType, Report};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
diff --git a/apps/labrinth/src/models/v2/threads.rs b/apps/labrinth/src/models/v2/threads.rs
index 064be280..d5aa45bf 100644
--- a/apps/labrinth/src/models/v2/threads.rs
+++ b/apps/labrinth/src/models/v2/threads.rs
@@ -2,7 +2,8 @@ use crate::models::ids::{
     ImageId, ProjectId, ReportId, ThreadId, ThreadMessageId,
 };
 use crate::models::projects::ProjectStatus;
-use crate::models::users::{User, UserId};
+use crate::models::users::User;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
diff --git a/apps/labrinth/src/models/v2/user.rs b/apps/labrinth/src/models/v2/user.rs
index cc5c6d63..f8e9d0d0 100644
--- a/apps/labrinth/src/models/v2/user.rs
+++ b/apps/labrinth/src/models/v2/user.rs
@@ -1,10 +1,8 @@
 use crate::{
     auth::AuthProvider,
-    models::{
-        ids::UserId,
-        users::{Badges, Role, UserPayoutData},
-    },
+    models::users::{Badges, Role, UserPayoutData},
 };
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
diff --git a/apps/labrinth/src/models/v3/billing.rs b/apps/labrinth/src/models/v3/billing.rs
index b9892a97..1e9055e5 100644
--- a/apps/labrinth/src/models/v3/billing.rs
+++ b/apps/labrinth/src/models/v3/billing.rs
@@ -1,14 +1,11 @@
-use crate::models::ids::Base62Id;
-use crate::models::ids::UserId;
+use crate::models::ids::{
+    ChargeId, ProductId, ProductPriceId, UserSubscriptionId,
+};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ProductId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Product {
     pub id: ProductId,
@@ -29,11 +26,6 @@ pub enum ProductMetadata {
     },
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ProductPriceId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct ProductPrice {
     pub id: ProductPriceId,
@@ -87,11 +79,6 @@ impl PriceDuration {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct UserSubscriptionId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct UserSubscription {
     pub id: UserSubscriptionId,
@@ -103,11 +90,11 @@ pub struct UserSubscription {
     pub metadata: Option<SubscriptionMetadata>,
 }
 
-impl From<crate::database::models::user_subscription_item::UserSubscriptionItem>
+impl From<crate::database::models::user_subscription_item::DBUserSubscription>
     for UserSubscription
 {
     fn from(
-        x: crate::database::models::user_subscription_item::UserSubscriptionItem,
+        x: crate::database::models::user_subscription_item::DBUserSubscription,
     ) -> Self {
         Self {
             id: x.id.into(),
@@ -151,11 +138,6 @@ pub enum SubscriptionMetadata {
     Pyro { id: String },
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ChargeId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Charge {
     pub id: ChargeId,
diff --git a/apps/labrinth/src/models/v3/collections.rs b/apps/labrinth/src/models/v3/collections.rs
index 52a937bd..652a44d2 100644
--- a/apps/labrinth/src/models/v3/collections.rs
+++ b/apps/labrinth/src/models/v3/collections.rs
@@ -1,17 +1,10 @@
-use super::{
-    ids::{Base62Id, ProjectId},
-    users::UserId,
-};
+use super::ids::ProjectId;
 use crate::database;
+use crate::models::ids::CollectionId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-/// The ID of a specific collection, encoded as base62 for usage in the API
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct CollectionId(pub u64);
-
 /// A collection returned from the API
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Collection {
@@ -42,8 +35,8 @@ pub struct Collection {
     pub projects: Vec<ProjectId>,
 }
 
-impl From<database::models::Collection> for Collection {
-    fn from(c: database::models::Collection) -> Self {
+impl From<database::models::DBCollection> for Collection {
+    fn from(c: database::models::DBCollection) -> Self {
         Self {
             id: c.id.into(),
             user: c.user_id.into(),
diff --git a/apps/labrinth/src/models/v3/ids.rs b/apps/labrinth/src/models/v3/ids.rs
index 033bfdc0..2e1c9745 100644
--- a/apps/labrinth/src/models/v3/ids.rs
+++ b/apps/labrinth/src/models/v3/ids.rs
@@ -1,41 +1,25 @@
-pub use super::collections::CollectionId;
-pub use super::images::ImageId;
-pub use super::notifications::NotificationId;
-pub use super::oauth_clients::OAuthClientAuthorizationId;
-pub use super::oauth_clients::{OAuthClientId, OAuthRedirectUriId};
-pub use super::organizations::OrganizationId;
-pub use super::pats::PatId;
-pub use super::payouts::PayoutId;
-pub use super::projects::{ProjectId, VersionId};
-pub use super::reports::ReportId;
-pub use super::sessions::SessionId;
-pub use super::teams::TeamId;
-pub use super::threads::ThreadId;
-pub use super::threads::ThreadMessageId;
-pub use crate::models::billing::{
-    ChargeId, ProductId, ProductPriceId, UserSubscriptionId,
-};
-use ariadne::ids::base62_id_impl;
-pub use ariadne::ids::Base62Id;
-pub use ariadne::users::UserId;
+use ariadne::ids::base62_id;
 
-base62_id_impl!(ProjectId, ProjectId);
-base62_id_impl!(VersionId, VersionId);
-base62_id_impl!(CollectionId, CollectionId);
-base62_id_impl!(TeamId, TeamId);
-base62_id_impl!(OrganizationId, OrganizationId);
-base62_id_impl!(ReportId, ReportId);
-base62_id_impl!(NotificationId, NotificationId);
-base62_id_impl!(ThreadId, ThreadId);
-base62_id_impl!(ThreadMessageId, ThreadMessageId);
-base62_id_impl!(SessionId, SessionId);
-base62_id_impl!(PatId, PatId);
-base62_id_impl!(ImageId, ImageId);
-base62_id_impl!(OAuthClientId, OAuthClientId);
-base62_id_impl!(OAuthRedirectUriId, OAuthRedirectUriId);
-base62_id_impl!(OAuthClientAuthorizationId, OAuthClientAuthorizationId);
-base62_id_impl!(PayoutId, PayoutId);
-base62_id_impl!(ProductId, ProductId);
-base62_id_impl!(ProductPriceId, ProductPriceId);
-base62_id_impl!(UserSubscriptionId, UserSubscriptionId);
-base62_id_impl!(ChargeId, ChargeId);
+base62_id!(ChargeId);
+base62_id!(CollectionId);
+base62_id!(FileId);
+base62_id!(ImageId);
+base62_id!(NotificationId);
+base62_id!(OAuthAccessTokenId);
+base62_id!(OAuthClientAuthorizationId);
+base62_id!(OAuthClientId);
+base62_id!(OAuthRedirectUriId);
+base62_id!(OrganizationId);
+base62_id!(PatId);
+base62_id!(PayoutId);
+base62_id!(ProductId);
+base62_id!(ProductPriceId);
+base62_id!(ProjectId);
+base62_id!(ReportId);
+base62_id!(SessionId);
+base62_id!(TeamId);
+base62_id!(TeamMemberId);
+base62_id!(ThreadId);
+base62_id!(ThreadMessageId);
+base62_id!(UserSubscriptionId);
+base62_id!(VersionId);
diff --git a/apps/labrinth/src/models/v3/images.rs b/apps/labrinth/src/models/v3/images.rs
index 5e814f53..0180a5dd 100644
--- a/apps/labrinth/src/models/v3/images.rs
+++ b/apps/labrinth/src/models/v3/images.rs
@@ -1,18 +1,13 @@
 use super::{
-    ids::{Base62Id, ProjectId, ThreadMessageId, VersionId},
+    ids::{ProjectId, ThreadMessageId, VersionId},
     pats::Scopes,
-    reports::ReportId,
-    users::UserId,
 };
-use crate::database::models::image_item::Image as DBImage;
+use crate::database::models::image_item::DBImage;
+use crate::models::ids::{ImageId, ReportId};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ImageId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Image {
     pub id: ImageId,
diff --git a/apps/labrinth/src/models/v3/notifications.rs b/apps/labrinth/src/models/v3/notifications.rs
index e47375af..6cbd275d 100644
--- a/apps/labrinth/src/models/v3/notifications.rs
+++ b/apps/labrinth/src/models/v3/notifications.rs
@@ -1,20 +1,15 @@
-use super::ids::Base62Id;
 use super::ids::OrganizationId;
-use super::users::UserId;
-use crate::database::models::notification_item::Notification as DBNotification;
-use crate::database::models::notification_item::NotificationAction as DBNotificationAction;
+use crate::database::models::notification_item::DBNotification;
+use crate::database::models::notification_item::DBNotificationAction;
 use crate::models::ids::{
-    ProjectId, ReportId, TeamId, ThreadId, ThreadMessageId, VersionId,
+    NotificationId, ProjectId, ReportId, TeamId, ThreadId, ThreadMessageId,
+    VersionId,
 };
 use crate::models::projects::ProjectStatus;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct NotificationId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Notification {
     pub id: NotificationId,
@@ -80,10 +75,9 @@ impl From<DBNotification> for Notification {
                 } => (
                     "A project you follow has been updated!".to_string(),
                     format!(
-                        "The project {} has released a new version: {}",
-                        project_id, version_id
+                        "The project {project_id} has released a new version: {version_id}"
                     ),
-                    format!("/project/{}/version/{}", project_id, version_id),
+                    format!("/project/{project_id}/version/{version_id}"),
                     vec![],
                 ),
                 NotificationBody::TeamInvite {
@@ -93,18 +87,26 @@ impl From<DBNotification> for Notification {
                     ..
                 } => (
                     "You have been invited to join a team!".to_string(),
-                    format!("An invite has been sent for you to be {} of a team", role),
-                    format!("/project/{}", project_id),
+                    format!(
+                        "An invite has been sent for you to be {role} of a team"
+                    ),
+                    format!("/project/{project_id}"),
                     vec![
                         NotificationAction {
                             name: "Accept".to_string(),
-                            action_route: ("POST".to_string(), format!("team/{team_id}/join")),
+                            action_route: (
+                                "POST".to_string(),
+                                format!("team/{team_id}/join"),
+                            ),
                         },
                         NotificationAction {
                             name: "Deny".to_string(),
                             action_route: (
                                 "DELETE".to_string(),
-                                format!("team/{team_id}/members/{}", UserId::from(notif.user_id)),
+                                format!(
+                                    "team/{team_id}/members/{}",
+                                    UserId::from(notif.user_id)
+                                ),
                             ),
                         },
                     ],
@@ -115,16 +117,19 @@ impl From<DBNotification> for Notification {
                     team_id,
                     ..
                 } => (
-                    "You have been invited to join an organization!".to_string(),
+                    "You have been invited to join an organization!"
+                        .to_string(),
                     format!(
-                        "An invite has been sent for you to be {} of an organization",
-                        role
+                        "An invite has been sent for you to be {role} of an organization"
                     ),
-                    format!("/organization/{}", organization_id),
+                    format!("/organization/{organization_id}"),
                     vec![
                         NotificationAction {
                             name: "Accept".to_string(),
-                            action_route: ("POST".to_string(), format!("team/{team_id}/join")),
+                            action_route: (
+                                "POST".to_string(),
+                                format!("team/{team_id}/join"),
+                            ),
                         },
                         NotificationAction {
                             name: "Deny".to_string(),
@@ -149,7 +154,7 @@ impl From<DBNotification> for Notification {
                         old_status.as_friendly_str(),
                         new_status.as_friendly_str()
                     ),
-                    format!("/project/{}", project_id),
+                    format!("/project/{project_id}"),
                     vec![],
                 ),
                 NotificationBody::ModeratorMessage {
@@ -160,9 +165,9 @@ impl From<DBNotification> for Notification {
                     "A moderator has sent you a message!".to_string(),
                     "Click on the link to read more.".to_string(),
                     if let Some(project_id) = project_id {
-                        format!("/project/{}", project_id)
+                        format!("/project/{project_id}")
                     } else if let Some(report_id) = report_id {
-                        format!("/project/{}", report_id)
+                        format!("/project/{report_id}")
                     } else {
                         "#".to_string()
                     },
diff --git a/apps/labrinth/src/models/v3/oauth_clients.rs b/apps/labrinth/src/models/v3/oauth_clients.rs
index 73f1ae86..875752bc 100644
--- a/apps/labrinth/src/models/v3/oauth_clients.rs
+++ b/apps/labrinth/src/models/v3/oauth_clients.rs
@@ -1,30 +1,15 @@
-use super::{
-    ids::{Base62Id, UserId},
-    pats::Scopes,
+use super::pats::Scopes;
+use crate::database::models::oauth_client_authorization_item::DBOAuthClientAuthorization;
+use crate::database::models::oauth_client_item::DBOAuthClient;
+use crate::database::models::oauth_client_item::DBOAuthRedirectUri;
+use crate::models::ids::{
+    OAuthClientAuthorizationId, OAuthClientId, OAuthRedirectUriId,
 };
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 
-use crate::database::models::oauth_client_authorization_item::OAuthClientAuthorization as DBOAuthClientAuthorization;
-use crate::database::models::oauth_client_item::OAuthClient as DBOAuthClient;
-use crate::database::models::oauth_client_item::OAuthRedirectUri as DBOAuthRedirectUri;
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OAuthClientId(pub u64);
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OAuthClientAuthorizationId(pub u64);
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OAuthRedirectUriId(pub u64);
-
 #[derive(Deserialize, Serialize)]
 pub struct OAuthRedirectUri {
     pub id: OAuthRedirectUriId,
diff --git a/apps/labrinth/src/models/v3/organizations.rs b/apps/labrinth/src/models/v3/organizations.rs
index f2817e36..4ec48cdc 100644
--- a/apps/labrinth/src/models/v3/organizations.rs
+++ b/apps/labrinth/src/models/v3/organizations.rs
@@ -1,15 +1,7 @@
-use super::{
-    ids::{Base62Id, TeamId},
-    teams::TeamMember,
-};
+use super::teams::TeamMember;
+use crate::models::ids::{OrganizationId, TeamId};
 use serde::{Deserialize, Serialize};
 
-/// The ID of a team
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OrganizationId(pub u64);
-
 /// An organization of users who control a project
 #[derive(Serialize, Deserialize)]
 pub struct Organization {
@@ -35,7 +27,7 @@ pub struct Organization {
 
 impl Organization {
     pub fn from(
-        data: crate::database::models::organization_item::Organization,
+        data: crate::database::models::organization_item::DBOrganization,
         team_members: Vec<TeamMember>,
     ) -> Self {
         Self {
diff --git a/apps/labrinth/src/models/v3/pack.rs b/apps/labrinth/src/models/v3/pack.rs
index 63fc73b2..ae57cea5 100644
--- a/apps/labrinth/src/models/v3/pack.rs
+++ b/apps/labrinth/src/models/v3/pack.rs
@@ -15,7 +15,7 @@ pub struct PackFormat {
     pub name: String,
     #[validate(length(max = 2048))]
     pub summary: Option<String>,
-    #[validate]
+    #[validate(nested)]
     pub files: Vec<PackFile>,
     pub dependencies: std::collections::HashMap<PackDependency, String>,
 }
diff --git a/apps/labrinth/src/models/v3/pats.rs b/apps/labrinth/src/models/v3/pats.rs
index 118db66b..edfb557e 100644
--- a/apps/labrinth/src/models/v3/pats.rs
+++ b/apps/labrinth/src/models/v3/pats.rs
@@ -1,15 +1,9 @@
-use super::ids::Base62Id;
 use crate::bitflags_serde_impl;
-use crate::models::ids::UserId;
+use crate::models::ids::PatId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-/// The ID of a team
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct PatId(pub u64);
-
 bitflags::bitflags! {
     #[derive(Copy, Clone, Debug)]
     pub struct Scopes: u64 {
@@ -161,7 +155,7 @@ pub struct PersonalAccessToken {
 
 impl PersonalAccessToken {
     pub fn from(
-        data: crate::database::models::pat_item::PersonalAccessToken,
+        data: crate::database::models::pat_item::DBPersonalAccessToken,
         include_token: bool,
     ) -> Self {
         Self {
diff --git a/apps/labrinth/src/models/v3/payouts.rs b/apps/labrinth/src/models/v3/payouts.rs
index ba4b6310..0d6c7dc7 100644
--- a/apps/labrinth/src/models/v3/payouts.rs
+++ b/apps/labrinth/src/models/v3/payouts.rs
@@ -1,13 +1,9 @@
-use crate::models::ids::{Base62Id, UserId};
+use crate::models::ids::PayoutId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct PayoutId(pub u64);
-
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Payout {
     pub id: PayoutId,
@@ -26,7 +22,7 @@ pub struct Payout {
 }
 
 impl Payout {
-    pub fn from(data: crate::database::models::payout_item::Payout) -> Self {
+    pub fn from(data: crate::database::models::payout_item::DBPayout) -> Self {
         Self {
             id: data.id.into(),
             user_id: data.user_id.into(),
diff --git a/apps/labrinth/src/models/v3/projects.rs b/apps/labrinth/src/models/v3/projects.rs
index a6f3c8a2..55631a6f 100644
--- a/apps/labrinth/src/models/v3/projects.rs
+++ b/apps/labrinth/src/models/v3/projects.rs
@@ -1,28 +1,16 @@
 use std::collections::{HashMap, HashSet};
 
-use super::ids::{Base62Id, OrganizationId};
-use super::teams::TeamId;
-use super::users::UserId;
 use crate::database::models::loader_fields::VersionField;
-use crate::database::models::project_item::{LinkUrl, QueryProject};
-use crate::database::models::version_item::QueryVersion;
-use crate::models::threads::ThreadId;
+use crate::database::models::project_item::{LinkUrl, ProjectQueryResult};
+use crate::database::models::version_item::VersionQueryResult;
+use crate::models::ids::{
+    OrganizationId, ProjectId, TeamId, ThreadId, VersionId,
+};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-/// The ID of a specific project, encoded as base62 for usage in the API
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, Hash)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ProjectId(pub u64);
-
-/// The ID of a specific version of a project
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct VersionId(pub u64);
-
 /// A project returned from the API
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Project {
@@ -151,8 +139,8 @@ pub fn from_duplicate_version_fields(
     fields
 }
 
-impl From<QueryProject> for Project {
-    fn from(data: QueryProject) -> Self {
+impl From<ProjectQueryResult> for Project {
+    fn from(data: ProjectQueryResult) -> Self {
         let fields =
             from_duplicate_version_fields(data.aggregate_version_fields);
         let m = data.inner;
@@ -669,8 +657,8 @@ where
     Ok(map)
 }
 
-impl From<QueryVersion> for Version {
-    fn from(data: QueryVersion) -> Version {
+impl From<VersionQueryResult> for Version {
+    fn from(data: VersionQueryResult) -> Version {
         let v = data.inner;
         Version {
             id: v.id.into(),
diff --git a/apps/labrinth/src/models/v3/reports.rs b/apps/labrinth/src/models/v3/reports.rs
index f620bc13..2d958441 100644
--- a/apps/labrinth/src/models/v3/reports.rs
+++ b/apps/labrinth/src/models/v3/reports.rs
@@ -1,14 +1,9 @@
-use super::ids::Base62Id;
-use crate::database::models::report_item::QueryReport as DBReport;
-use crate::models::ids::{ProjectId, ThreadId, UserId, VersionId};
+use crate::database::models::report_item::ReportQueryResult as DBReport;
+use crate::models::ids::{ProjectId, ReportId, ThreadId, VersionId};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ReportId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Report {
     pub id: ReportId,
diff --git a/apps/labrinth/src/models/v3/sessions.rs b/apps/labrinth/src/models/v3/sessions.rs
index 46a8a69a..5fabe51c 100644
--- a/apps/labrinth/src/models/v3/sessions.rs
+++ b/apps/labrinth/src/models/v3/sessions.rs
@@ -1,13 +1,8 @@
-use super::ids::Base62Id;
-use crate::models::users::UserId;
+use crate::models::ids::SessionId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct SessionId(pub u64);
-
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Session {
     pub id: SessionId,
@@ -32,7 +27,7 @@ pub struct Session {
 
 impl Session {
     pub fn from(
-        data: crate::database::models::session_item::Session,
+        data: crate::database::models::session_item::DBSession,
         include_session: bool,
         current_session: Option<&str>,
     ) -> Self {
diff --git a/apps/labrinth/src/models/v3/teams.rs b/apps/labrinth/src/models/v3/teams.rs
index f9f6ef91..65292c91 100644
--- a/apps/labrinth/src/models/v3/teams.rs
+++ b/apps/labrinth/src/models/v3/teams.rs
@@ -1,15 +1,9 @@
-use super::ids::Base62Id;
 use crate::bitflags_serde_impl;
+use crate::models::ids::TeamId;
 use crate::models::users::User;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 
-/// The ID of a team
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct TeamId(pub u64);
-
 pub const DEFAULT_ROLE: &str = "Member";
 
 /// A team of users who control a project
@@ -48,8 +42,10 @@ impl Default for ProjectPermissions {
 impl ProjectPermissions {
     pub fn get_permissions_by_role(
         role: &crate::models::users::Role,
-        project_team_member: &Option<crate::database::models::TeamMember>, // team member of the user in the project
-        organization_team_member: &Option<crate::database::models::TeamMember>, // team member of the user in the organization
+        project_team_member: &Option<crate::database::models::DBTeamMember>, // team member of the user in the project
+        organization_team_member: &Option<
+            crate::database::models::DBTeamMember,
+        >, // team member of the user in the organization
     ) -> Option<Self> {
         if role.is_admin() {
             return Some(ProjectPermissions::all());
@@ -105,7 +101,7 @@ impl Default for OrganizationPermissions {
 impl OrganizationPermissions {
     pub fn get_permissions_by_role(
         role: &crate::models::users::Role,
-        team_member: &Option<crate::database::models::TeamMember>,
+        team_member: &Option<crate::database::models::DBTeamMember>,
     ) -> Option<Self> {
         if role.is_admin() {
             return Some(OrganizationPermissions::all());
@@ -160,8 +156,8 @@ pub struct TeamMember {
 
 impl TeamMember {
     pub fn from(
-        data: crate::database::models::team_item::TeamMember,
-        user: crate::database::models::User,
+        data: crate::database::models::team_item::DBTeamMember,
+        user: crate::database::models::DBUser,
         override_permissions: bool,
     ) -> Self {
         let user: User = user.into();
@@ -172,7 +168,7 @@ impl TeamMember {
     // if already available.
     // (Avoids a db query in some cases)
     pub fn from_model(
-        data: crate::database::models::team_item::TeamMember,
+        data: crate::database::models::team_item::DBTeamMember,
         user: crate::models::users::User,
         override_permissions: bool,
     ) -> Self {
diff --git a/apps/labrinth/src/models/v3/threads.rs b/apps/labrinth/src/models/v3/threads.rs
index 1c188317..685eec6e 100644
--- a/apps/labrinth/src/models/v3/threads.rs
+++ b/apps/labrinth/src/models/v3/threads.rs
@@ -1,20 +1,12 @@
-use super::ids::{Base62Id, ImageId};
-use crate::models::ids::{ProjectId, ReportId};
+use crate::models::ids::{
+    ImageId, ProjectId, ReportId, ThreadId, ThreadMessageId,
+};
 use crate::models::projects::ProjectStatus;
-use crate::models::users::{User, UserId};
+use crate::models::users::User;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ThreadId(pub u64);
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ThreadMessageId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Thread {
     pub id: ThreadId,
@@ -94,7 +86,7 @@ impl ThreadType {
 
 impl Thread {
     pub fn from(
-        data: crate::database::models::Thread,
+        data: crate::database::models::DBThread,
         users: Vec<User>,
         user: &User,
     ) -> Self {
@@ -127,7 +119,7 @@ impl Thread {
 
 impl ThreadMessage {
     pub fn from(
-        data: crate::database::models::ThreadMessage,
+        data: crate::database::models::DBThreadMessage,
         user: &User,
     ) -> Self {
         Self {
diff --git a/apps/labrinth/src/models/v3/users.rs b/apps/labrinth/src/models/v3/users.rs
index 0c44fa09..42d50535 100644
--- a/apps/labrinth/src/models/v3/users.rs
+++ b/apps/labrinth/src/models/v3/users.rs
@@ -1,5 +1,6 @@
 use crate::{auth::AuthProvider, bitflags_serde_impl};
-pub use ariadne::users::{UserId, UserStatus};
+use ariadne::ids::UserId;
+pub use ariadne::users::UserStatus;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -62,7 +63,7 @@ pub struct UserPayoutData {
     pub balance: Decimal,
 }
 
-use crate::database::models::user_item::User as DBUser;
+use crate::database::models::user_item::DBUser;
 impl From<DBUser> for User {
     fn from(data: DBUser) -> Self {
         Self {
@@ -195,9 +196,7 @@ pub struct UserFriend {
 }
 
 impl UserFriend {
-    pub fn from(
-        data: crate::database::models::friend_item::FriendItem,
-    ) -> Self {
+    pub fn from(data: crate::database::models::friend_item::DBFriend) -> Self {
         Self {
             id: data.friend_id.into(),
             friend_id: data.user_id.into(),
diff --git a/apps/labrinth/src/queue/maxmind.rs b/apps/labrinth/src/queue/maxmind.rs
index 30a83d1e..1e65a525 100644
--- a/apps/labrinth/src/queue/maxmind.rs
+++ b/apps/labrinth/src/queue/maxmind.rs
@@ -61,7 +61,9 @@ impl MaxMindIndexer {
         }
 
         if should_panic {
-            panic!("Unable to download maxmind database- did you get a license key?")
+            panic!(
+                "Unable to download maxmind database- did you get a license key?"
+            )
         } else {
             warn!("Unable to download maxmind database.");
 
@@ -73,9 +75,13 @@ impl MaxMindIndexer {
         let maxmind = self.reader.read().await;
 
         if let Some(ref maxmind) = *maxmind {
-            maxmind.lookup::<Country>(ip.into()).ok().and_then(|x| {
-                x.country.and_then(|x| x.iso_code.map(|x| x.to_string()))
-            })
+            maxmind
+                .lookup::<Country>(ip.into())
+                .ok()
+                .flatten()
+                .and_then(|x| {
+                    x.country.and_then(|x| x.iso_code.map(|x| x.to_string()))
+                })
         } else {
             None
         }
diff --git a/apps/labrinth/src/queue/moderation.rs b/apps/labrinth/src/queue/moderation.rs
index 2b9b9319..49c2e38c 100644
--- a/apps/labrinth/src/queue/moderation.rs
+++ b/apps/labrinth/src/queue/moderation.rs
@@ -10,8 +10,10 @@ use crate::models::projects::ProjectStatus;
 use crate::models::threads::MessageBody;
 use crate::routes::ApiError;
 use dashmap::DashSet;
+use hex::ToHex;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
+use sha1::Digest;
 use sqlx::PgPool;
 use std::collections::HashMap;
 use std::io::{Cursor, Read};
@@ -168,19 +170,19 @@ impl ModerationMessage {
 
                     for project in &projects {
                         let additional_text = if project.contains("ftb-quests") {
-                            Some("Heracles")
+                            Some(("Odyssey Quests", "lo90fZoB"))
                         } else if project.contains("ftb-ranks") || project.contains("ftb-essentials") {
-                            Some("Prometheus")
+                            Some(("Odyssey Roles", "iYcNKH7W"))
                         } else if project.contains("ftb-teams") {
-                            Some("Argonauts")
+                            Some(("Odyssey Guilds", "bb2EpKpx"))
                         } else if project.contains("ftb-chunks") {
-                            Some("Cadmus")
+                            Some(("Odyssey Claims", "fEWKxVzh"))
                         } else {
                             None
                         };
 
                         val.push_str(&if let Some(additional_text) = additional_text {
-                            format!("- {project}(consider using [{additional_text}](https://modrinth.com/mod/{}) instead)\n", additional_text.to_lowercase())
+                            format!("- {project} (consider using [{}](https://modrinth.com/project/{}) instead)\n", additional_text.0, additional_text.1)
                         } else {
                             format!("- {project}\n")
                         })
@@ -231,7 +233,7 @@ impl AutomatedModerationQueue {
             for project in projects {
                 async {
                     let project =
-                        database::Project::get_id((project).into(), &pool, &redis).await?;
+                        database::DBProject::get_id((project).into(), &pool, &redis).await?;
 
                     if let Some(project) = project {
                         let res = async {
@@ -259,7 +261,7 @@ impl AutomatedModerationQueue {
                             }
 
                             let versions =
-                                database::Version::get_many(&project.versions, &pool, &redis)
+                                database::DBVersion::get_many(&project.versions, &pool, &redis)
                                     .await?
                                     .into_iter()
                                     // we only support modpacks at this time
@@ -329,7 +331,7 @@ impl AutomatedModerationQueue {
                                             let mut contents = Vec::new();
                                             file.read_to_end(&mut contents)?;
 
-                                            let hash = sha1::Sha1::from(&contents).hexdigest();
+                                            let hash = sha1::Sha1::digest(&contents).encode_hex::<String>();
                                             let murmur = hash_flame_murmur32(contents);
 
                                             hashes.push((
@@ -341,7 +343,7 @@ impl AutomatedModerationQueue {
                                         }
                                     }
 
-                                    let files = database::models::Version::get_files_from_hash(
+                                    let files = database::models::DBVersion::get_files_from_hash(
                                         "sha1".to_string(),
                                         &hashes.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
                                         &pool,
@@ -352,7 +354,7 @@ impl AutomatedModerationQueue {
                                     let version_ids =
                                         files.iter().map(|x| x.version_id).collect::<Vec<_>>();
                                     let versions_data = filter_visible_versions(
-                                        database::models::Version::get_many(
+                                        database::models::DBVersion::get_many(
                                             &version_ids,
                                             &pool,
                                             &redis,
@@ -619,13 +621,13 @@ impl AutomatedModerationQueue {
                             }
 
                             if !mod_messages.is_empty() {
-                                let first_time = database::models::Thread::get(project.thread_id, &pool).await?
-                                    .map(|x| x.messages.iter().all(|x| x.author_id == Some(database::models::UserId(AUTOMOD_ID)) || x.hide_identity))
+                                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);
 
                                 let mut transaction = pool.begin().await?;
                                 let id = ThreadMessageBuilder {
-                                    author_id: Some(database::models::UserId(AUTOMOD_ID)),
+                                    author_id: Some(database::models::DBUserId(AUTOMOD_ID)),
                                     body: MessageBody::Text {
                                         body: mod_messages.markdown(true),
                                         private: false,
@@ -638,7 +640,7 @@ impl AutomatedModerationQueue {
                                     .insert(&mut transaction)
                                     .await?;
 
-                                let members = database::models::TeamMember::get_from_team_full(
+                                let members = database::models::DBTeamMember::get_from_team_full(
                                     project.inner.team_id,
                                     &pool,
                                     &redis,
@@ -647,7 +649,7 @@ impl AutomatedModerationQueue {
 
                                 if mod_messages.should_reject(first_time) {
                                     ThreadMessageBuilder {
-                                        author_id: Some(database::models::UserId(AUTOMOD_ID)),
+                                        author_id: Some(database::models::DBUserId(AUTOMOD_ID)),
                                         body: MessageBody::StatusChange {
                                             new_status: ProjectStatus::Rejected,
                                             old_status: project.inner.status,
@@ -698,7 +700,7 @@ impl AutomatedModerationQueue {
                                         .execute(&pool)
                                         .await?;
 
-                                    database::models::Project::clear_cache(
+                                    database::models::DBProject::clear_cache(
                                         project.inner.id,
                                         project.inner.slug.clone(),
                                         None,
@@ -738,7 +740,7 @@ impl AutomatedModerationQueue {
 
                             let mut transaction = pool.begin().await?;
                             ThreadMessageBuilder {
-                                author_id: Some(database::models::UserId(AUTOMOD_ID)),
+                                author_id: Some(database::models::DBUserId(AUTOMOD_ID)),
                                 body: MessageBody::Text {
                                     body: str,
                                     private: true,
diff --git a/apps/labrinth/src/queue/payouts.rs b/apps/labrinth/src/queue/payouts.rs
index 38fd54a1..b6e95031 100644
--- a/apps/labrinth/src/queue/payouts.rs
+++ b/apps/labrinth/src/queue/payouts.rs
@@ -13,8 +13,8 @@ use rust_decimal::Decimal;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use sqlx::postgres::PgQueryResult;
 use sqlx::PgPool;
+use sqlx::postgres::PgQueryResult;
 use std::collections::HashMap;
 use tokio::sync::RwLock;
 
@@ -735,6 +735,18 @@ pub async fn process_payout(
     pool: &PgPool,
     client: &clickhouse::Client,
 ) -> Result<(), ApiError> {
+    sqlx::query!(
+        "
+        UPDATE payouts
+        SET status = $1
+        WHERE status = $2 AND created < NOW() - INTERVAL '30 days'
+        ",
+        crate::models::payouts::PayoutStatus::Failed.as_str(),
+        crate::models::payouts::PayoutStatus::InTransit.as_str(),
+    )
+    .execute(pool)
+    .await?;
+
     let start: DateTime<Utc> = DateTime::from_naive_utc_and_offset(
         (Utc::now() - Duration::days(1))
             .date_naive()
diff --git a/apps/labrinth/src/queue/session.rs b/apps/labrinth/src/queue/session.rs
index 1c3ce7be..ed969d35 100644
--- a/apps/labrinth/src/queue/session.rs
+++ b/apps/labrinth/src/queue/session.rs
@@ -1,7 +1,7 @@
-use crate::database::models::pat_item::PersonalAccessToken;
-use crate::database::models::session_item::Session;
+use crate::database::models::pat_item::DBPersonalAccessToken;
+use crate::database::models::session_item::DBSession;
 use crate::database::models::{
-    DatabaseError, OAuthAccessTokenId, PatId, SessionId, UserId,
+    DBOAuthAccessTokenId, DBPatId, DBSessionId, DBUserId, DatabaseError,
 };
 use crate::database::redis::RedisPool;
 use crate::routes::internal::session::SessionMetadata;
@@ -12,9 +12,9 @@ use std::collections::{HashMap, HashSet};
 use tokio::sync::Mutex;
 
 pub struct AuthQueue {
-    session_queue: Mutex<HashMap<SessionId, SessionMetadata>>,
-    pat_queue: Mutex<HashSet<PatId>>,
-    oauth_access_token_queue: Mutex<HashSet<OAuthAccessTokenId>>,
+    session_queue: Mutex<HashMap<DBSessionId, SessionMetadata>>,
+    pat_queue: Mutex<HashSet<DBPatId>>,
+    oauth_access_token_queue: Mutex<HashSet<DBOAuthAccessTokenId>>,
 }
 
 impl Default for AuthQueue {
@@ -32,22 +32,26 @@ impl AuthQueue {
             oauth_access_token_queue: Mutex::new(HashSet::with_capacity(1000)),
         }
     }
-    pub async fn add_session(&self, id: SessionId, metadata: SessionMetadata) {
+    pub async fn add_session(
+        &self,
+        id: DBSessionId,
+        metadata: SessionMetadata,
+    ) {
         self.session_queue.lock().await.insert(id, metadata);
     }
 
-    pub async fn add_pat(&self, id: PatId) {
+    pub async fn add_pat(&self, id: DBPatId) {
         self.pat_queue.lock().await.insert(id);
     }
 
     pub async fn add_oauth_access_token(
         &self,
-        id: crate::database::models::OAuthAccessTokenId,
+        id: crate::database::models::DBOAuthAccessTokenId,
     ) {
         self.oauth_access_token_queue.lock().await.insert(id);
     }
 
-    pub async fn take_sessions(&self) -> HashMap<SessionId, SessionMetadata> {
+    pub async fn take_sessions(&self) -> HashMap<DBSessionId, SessionMetadata> {
         let mut queue = self.session_queue.lock().await;
         let len = queue.len();
 
@@ -87,7 +91,7 @@ impl AuthQueue {
                     SET last_login = $2, city = $3, country = $4, ip = $5, os = $6, platform = $7, user_agent = $8
                     WHERE (id = $1)
                     ",
-                    id as SessionId,
+                    id as DBSessionId,
                     Utc::now(),
                     metadata.city,
                     metadata.country,
@@ -109,8 +113,8 @@ impl AuthQueue {
                 "
             )
             .fetch(&mut *transaction)
-            .map_ok(|x| (SessionId(x.id), x.session, UserId(x.user_id)))
-            .try_collect::<Vec<(SessionId, String, UserId)>>()
+            .map_ok(|x| (DBSessionId(x.id), x.session, DBUserId(x.user_id)))
+            .try_collect::<Vec<(DBSessionId, String, DBUserId)>>()
             .await?;
 
             for (id, session, user_id) in expired_ids {
@@ -119,10 +123,10 @@ impl AuthQueue {
                     Some(session),
                     Some(user_id),
                 ));
-                Session::remove(id, &mut transaction).await?;
+                DBSession::remove(id, &mut transaction).await?;
             }
 
-            Session::clear_cache(clear_cache_sessions, redis).await?;
+            DBSession::clear_cache(clear_cache_sessions, redis).await?;
 
             let ids = pat_queue.iter().map(|id| id.0).collect_vec();
             let clear_cache_pats = pat_queue
@@ -149,7 +153,7 @@ impl AuthQueue {
             .await?;
 
             transaction.commit().await?;
-            PersonalAccessToken::clear_cache(clear_cache_pats, redis).await?;
+            DBPersonalAccessToken::clear_cache(clear_cache_pats, redis).await?;
         }
 
         Ok(())
@@ -157,7 +161,7 @@ impl AuthQueue {
 }
 
 async fn update_oauth_access_token_last_used(
-    oauth_access_token_queue: HashSet<OAuthAccessTokenId>,
+    oauth_access_token_queue: HashSet<DBOAuthAccessTokenId>,
     transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
 ) -> Result<(), DatabaseError> {
     let ids = oauth_access_token_queue.iter().map(|id| id.0).collect_vec();
diff --git a/apps/labrinth/src/queue/socket.rs b/apps/labrinth/src/queue/socket.rs
index f11d477e..13b78ec5 100644
--- a/apps/labrinth/src/queue/socket.rs
+++ b/apps/labrinth/src/queue/socket.rs
@@ -1,7 +1,8 @@
 //! "Database" for Hydra
 
-use crate::models::users::{UserId, UserStatus};
+use crate::models::users::UserStatus;
 use actix_ws::Session;
+use ariadne::ids::UserId;
 use dashmap::{DashMap, DashSet};
 use std::sync::atomic::AtomicU32;
 use uuid::Uuid;
diff --git a/apps/labrinth/src/routes/analytics.rs b/apps/labrinth/src/routes/analytics.rs
index c8709d9e..9ca6bfeb 100644
--- a/apps/labrinth/src/routes/analytics.rs
+++ b/apps/labrinth/src/routes/analytics.rs
@@ -8,8 +8,8 @@ use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::date::get_current_tenths_of_ms;
 use crate::util::env::parse_strings_from_var;
-use actix_web::{post, web};
 use actix_web::{HttpRequest, HttpResponse};
+use actix_web::{post, web};
 use serde::Deserialize;
 use sqlx::PgPool;
 use std::collections::HashMap;
@@ -130,7 +130,7 @@ pub async fn page_view_ingest(
             ];
 
             if PROJECT_TYPES.contains(&segments_vec[0]) {
-                let project = crate::database::models::Project::get(
+                let project = crate::database::models::DBProject::get(
                     segments_vec[1],
                     &**pool,
                     &redis,
@@ -189,7 +189,7 @@ pub async fn playtime_ingest(
         ));
     }
 
-    let versions = crate::database::models::Version::get_many(
+    let versions = crate::database::models::DBVersion::get_many(
         &playtimes.iter().map(|x| (*x.0).into()).collect::<Vec<_>>(),
         &**pool,
         &redis,
diff --git a/apps/labrinth/src/routes/debug/mod.rs b/apps/labrinth/src/routes/debug/mod.rs
index 163909f0..66a16bda 100644
--- a/apps/labrinth/src/routes/debug/mod.rs
+++ b/apps/labrinth/src/routes/debug/mod.rs
@@ -1,7 +1,7 @@
 use crate::routes::ApiError;
 use crate::util::cors::default_cors;
 use crate::util::guards::admin_key_guard;
-use actix_web::{get, HttpResponse};
+use actix_web::{HttpResponse, get};
 use prometheus::{IntGauge, Registry};
 use std::time::Duration;
 
@@ -50,7 +50,7 @@ fn require_profiling_activated(
     }
 }
 
-pub fn jemalloc_mmeory_stats(
+pub fn jemalloc_memory_stats(
     registry: &Registry,
 ) -> Result<(), prometheus::Error> {
     let allocated_mem = IntGauge::new(
diff --git a/apps/labrinth/src/routes/index.rs b/apps/labrinth/src/routes/index.rs
index ba937d7f..cd0e48aa 100644
--- a/apps/labrinth/src/routes/index.rs
+++ b/apps/labrinth/src/routes/index.rs
@@ -1,4 +1,4 @@
-use actix_web::{get, HttpResponse};
+use actix_web::{HttpResponse, get};
 use serde_json::json;
 
 #[get("/")]
diff --git a/apps/labrinth/src/routes/internal/admin.rs b/apps/labrinth/src/routes/internal/admin.rs
index 70c8c88f..817803e9 100644
--- a/apps/labrinth/src/routes/internal/admin.rs
+++ b/apps/labrinth/src/routes/internal/admin.rs
@@ -14,7 +14,7 @@ use crate::routes::ApiError;
 use crate::search::SearchConfig;
 use crate::util::date::get_current_tenths_of_ms;
 use crate::util::guards::admin_key_guard;
-use actix_web::{get, patch, post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, get, patch, post, web};
 use serde::Deserialize;
 use sqlx::PgPool;
 use std::collections::HashMap;
@@ -71,7 +71,7 @@ pub async fn count_download(
     .ok()
     .flatten();
 
-    let project_id: crate::database::models::ids::ProjectId =
+    let project_id: crate::database::models::ids::DBProjectId =
         download_body.project_id.into();
 
     let id_option =
@@ -97,7 +97,7 @@ pub async fn count_download(
         WHERE ((version_number = $1 OR id = $3) AND mod_id = $2)
         ",
         download_body.version_name,
-        project_id as crate::database::models::ids::ProjectId,
+        project_id as crate::database::models::ids::DBProjectId,
         id_option
     )
     .fetch_optional(pool.as_ref())
@@ -204,7 +204,7 @@ pub async fn delphi_result_ingest(
 
     let webhook_url = dotenvy::var("DELPHI_SLACK_WEBHOOK")?;
 
-    let project = crate::database::models::Project::get_id(
+    let project = crate::database::models::DBProject::get_id(
         body.project_id.into(),
         &**pool,
         &redis,
@@ -222,8 +222,7 @@ pub async fn delphi_result_ingest(
     for (issue, trace) in &body.issues {
         for (path, code) in trace {
             header.push_str(&format!(
-                "\n issue {issue} found at file {}: \n ```\n{}\n```",
-                path, code
+                "\n issue {issue} found at file {path}: \n ```\n{code}\n```"
             ));
         }
     }
@@ -238,14 +237,15 @@ pub async fn delphi_result_ingest(
     .await
     .ok();
 
-    let mut thread_header = format!("Suspicious traces found at [version {}](https://modrinth.com/project/{}/version/{})", body.version_id, body.project_id, body.version_id);
+    let mut thread_header = format!(
+        "Suspicious traces found at [version {}](https://modrinth.com/project/{}/version/{})",
+        body.version_id, body.project_id, body.version_id
+    );
 
     for (issue, trace) in &body.issues {
         for path in trace.keys() {
-            thread_header.push_str(&format!(
-                "\n\n- issue {issue} found at file {}",
-                path
-            ));
+            thread_header
+                .push_str(&format!("\n\n- issue {issue} found at file {path}"));
         }
 
         if trace.is_empty() {
@@ -255,7 +255,7 @@ pub async fn delphi_result_ingest(
 
     let mut transaction = pool.begin().await?;
     ThreadMessageBuilder {
-        author_id: Some(crate::database::models::UserId(AUTOMOD_ID)),
+        author_id: Some(crate::database::models::DBUserId(AUTOMOD_ID)),
         body: MessageBody::Text {
             body: thread_header,
             private: true,
diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index 8eefe0f2..b0dc2f58 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -1,5 +1,5 @@
 use crate::auth::{get_user_from_headers, send_email};
-use crate::database::models::charge_item::ChargeItem;
+use crate::database::models::charge_item::DBCharge;
 use crate::database::models::{
     generate_charge_id, generate_user_subscription_id, product_item,
     user_subscription_item,
@@ -14,11 +14,11 @@ use crate::models::pats::Scopes;
 use crate::models::users::Badges;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
-use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use ariadne::ids::base62_impl::{parse_base62, to_base62};
-use chrono::Utc;
-use rust_decimal::prelude::ToPrimitive;
+use chrono::{Duration, Utc};
 use rust_decimal::Decimal;
+use rust_decimal::prelude::ToPrimitive;
 use serde::Serialize;
 use serde_with::serde_derive::Deserialize;
 use sqlx::{PgPool, Postgres, Transaction};
@@ -59,7 +59,8 @@ pub async fn products(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let products = product_item::QueryProduct::list(&**pool, &redis).await?;
+    let products =
+        product_item::QueryProductWithPrices::list(&**pool, &redis).await?;
 
     let products = products
         .into_iter()
@@ -85,7 +86,7 @@ pub async fn products(
 
 #[derive(Deserialize)]
 struct SubscriptionsQuery {
-    pub user_id: Option<crate::models::ids::UserId>,
+    pub user_id: Option<ariadne::ids::UserId>,
 }
 
 #[get("subscriptions")]
@@ -107,7 +108,7 @@ pub async fn subscriptions(
     .1;
 
     let subscriptions =
-        user_subscription_item::UserSubscriptionItem::get_all_user(
+        user_subscription_item::DBUserSubscription::get_all_user(
             if let Some(user_id) = query.user_id {
                 if user.role.is_admin() {
                     user_id.into()
@@ -173,8 +174,8 @@ pub async fn refund_charge(
         ));
     }
 
-    if let Some(charge) = ChargeItem::get(id.into(), &**pool).await? {
-        let refunds = ChargeItem::get_children(id.into(), &**pool).await?;
+    if let Some(charge) = DBCharge::get(id.into(), &**pool).await? {
+        let refunds = DBCharge::get_children(id.into(), &**pool).await?;
         let refunds = -refunds
             .into_iter()
             .filter_map(|x| match x.status {
@@ -261,7 +262,7 @@ pub async fn refund_charge(
         let mut transaction = pool.begin().await?;
 
         let charge_id = generate_charge_id(&mut transaction).await?;
-        ChargeItem {
+        DBCharge {
             id: charge_id,
             user_id: charge.user_id,
             price_id: charge.price_id,
@@ -284,7 +285,7 @@ pub async fn refund_charge(
         if body.0.unprovision.unwrap_or(false) {
             if let Some(subscription_id) = charge.subscription_id {
                 let open_charge =
-                    ChargeItem::get_open_subscription(subscription_id, &**pool)
+                    DBCharge::get_open_subscription(subscription_id, &**pool)
                         .await?;
                 if let Some(mut open_charge) = open_charge {
                     open_charge.status = ChargeStatus::Cancelled;
@@ -332,7 +333,7 @@ pub async fn edit_subscription(
     let (id,) = info.into_inner();
 
     if let Some(subscription) =
-        user_subscription_item::UserSubscriptionItem::get(id.into(), &**pool)
+        user_subscription_item::DBUserSubscription::get(id.into(), &**pool)
             .await?
     {
         if subscription.user_id != user.id.into() && !user.role.is_admin() {
@@ -342,7 +343,7 @@ pub async fn edit_subscription(
         let mut transaction = pool.begin().await?;
 
         let mut open_charge =
-            crate::database::models::charge_item::ChargeItem::get_open_subscription(
+            crate::database::models::charge_item::DBCharge::get_open_subscription(
                 subscription.id,
                 &mut *transaction,
             )
@@ -353,7 +354,7 @@ pub async fn edit_subscription(
                 )
             })?;
 
-        let current_price = product_item::ProductPriceItem::get(
+        let current_price = product_item::DBProductPrice::get(
             subscription.price_id,
             &mut *transaction,
         )
@@ -365,9 +366,12 @@ pub async fn edit_subscription(
         })?;
 
         if let Some(cancelled) = &edit_subscription.cancelled {
-            if open_charge.status != ChargeStatus::Open
-                && open_charge.status != ChargeStatus::Cancelled
-            {
+            if !matches!(
+                open_charge.status,
+                ChargeStatus::Open
+                    | ChargeStatus::Cancelled
+                    | ChargeStatus::Failed
+            ) {
                 return Err(ApiError::InvalidInput(
                     "You may not change the status of this subscription!"
                         .to_string(),
@@ -376,6 +380,9 @@ pub async fn edit_subscription(
 
             if *cancelled {
                 open_charge.status = ChargeStatus::Cancelled;
+            } else if open_charge.status == ChargeStatus::Failed {
+                // Force another resubscription attempt
+                open_charge.last_attempt = Some(Utc::now() - Duration::days(2));
             } else {
                 open_charge.status = ChargeStatus::Open;
             }
@@ -397,7 +404,7 @@ pub async fn edit_subscription(
 
         let intent = if let Some(product_id) = &edit_subscription.product {
             let product_price =
-                product_item::ProductPriceItem::get_all_product_prices(
+                product_item::DBProductPrice::get_all_product_prices(
                     (*product_id).into(),
                     &mut *transaction,
                 )
@@ -600,7 +607,7 @@ pub async fn user_customer(
 
 #[derive(Deserialize)]
 pub struct ChargesQuery {
-    pub user_id: Option<crate::models::ids::UserId>,
+    pub user_id: Option<ariadne::ids::UserId>,
 }
 
 #[get("payments")]
@@ -622,7 +629,7 @@ pub async fn charges(
     .1;
 
     let charges =
-        crate::database::models::charge_item::ChargeItem::get_from_user(
+        crate::database::models::charge_item::DBCharge::get_from_user(
             if let Some(user_id) = query.user_id {
                 if user.role.is_admin() {
                     user_id.into()
@@ -829,7 +836,7 @@ pub async fn remove_payment_method(
     .await?;
 
     let user_subscriptions =
-        user_subscription_item::UserSubscriptionItem::get_all_user(
+        user_subscription_item::DBUserSubscription::get_all_user(
             user.id.into(),
             &**pool,
         )
@@ -935,16 +942,15 @@ pub async fn active_servers(
         ));
     }
 
-    let servers =
-        user_subscription_item::UserSubscriptionItem::get_all_servers(
-            query.subscription_status,
-            &**pool,
-        )
-        .await?;
+    let servers = user_subscription_item::DBUserSubscription::get_all_servers(
+        query.subscription_status,
+        &**pool,
+    )
+    .await?;
 
     #[derive(Serialize)]
     struct ActiveServer {
-        pub user_id: crate::models::ids::UserId,
+        pub user_id: ariadne::ids::UserId,
         pub server_id: String,
         pub price_id: crate::models::ids::ProductPriceId,
         pub interval: PriceDuration,
@@ -1153,7 +1159,7 @@ pub async fn initiate_payment(
         match payment_request.charge {
             ChargeRequestType::Existing { id } => {
                 let charge =
-                    crate::database::models::charge_item::ChargeItem::get(
+                    crate::database::models::charge_item::DBCharge::get(
                         id.into(),
                         &**pool,
                     )
@@ -1178,7 +1184,7 @@ pub async fn initiate_payment(
                 interval,
             } => {
                 let product =
-                    product_item::ProductItem::get(product_id.into(), &**pool)
+                    product_item::DBProduct::get(product_id.into(), &**pool)
                         .await?
                         .ok_or_else(|| {
                             ApiError::InvalidInput(
@@ -1188,7 +1194,7 @@ pub async fn initiate_payment(
                         })?;
 
                 let mut product_prices =
-                    product_item::ProductPriceItem::get_all_product_prices(
+                    product_item::DBProductPrice::get_all_product_prices(
                         product.id, &**pool,
                     )
                     .await?;
@@ -1229,14 +1235,14 @@ pub async fn initiate_payment(
                 if let Price::Recurring { .. } = price_item.prices {
                     if product.unitary {
                         let user_subscriptions =
-                        user_subscription_item::UserSubscriptionItem::get_all_user(
+                        user_subscription_item::DBUserSubscription::get_all_user(
                             user.id.into(),
                             &**pool,
                         )
                         .await?;
 
                         let user_products =
-                            product_item::ProductPriceItem::get_many(
+                            product_item::DBProductPrice::get_many(
                                 &user_subscriptions
                                     .iter()
                                     .filter(|x| {
@@ -1413,12 +1419,12 @@ pub async fn stripe_webhook(
         &dotenvy::var("STRIPE_WEBHOOK_SECRET")?,
     ) {
         struct PaymentIntentMetadata {
-            pub user_item: crate::database::models::user_item::User,
-            pub product_price_item: product_item::ProductPriceItem,
-            pub product_item: product_item::ProductItem,
-            pub charge_item: crate::database::models::charge_item::ChargeItem,
+            pub user_item: crate::database::models::user_item::DBUser,
+            pub product_price_item: product_item::DBProductPrice,
+            pub product_item: product_item::DBProduct,
+            pub charge_item: crate::database::models::charge_item::DBCharge,
             pub user_subscription_item:
-                Option<user_subscription_item::UserSubscriptionItem>,
+                Option<user_subscription_item::DBUserSubscription>,
             pub payment_metadata: Option<PaymentRequestMetadata>,
             #[allow(dead_code)]
             pub charge_type: ChargeType,
@@ -1439,7 +1445,7 @@ pub async fn stripe_webhook(
                 let user_id = if let Some(user_id) = metadata
                     .get("modrinth_user_id")
                     .and_then(|x| parse_base62(x).ok())
-                    .map(|x| crate::database::models::ids::UserId(x as i64))
+                    .map(|x| crate::database::models::ids::DBUserId(x as i64))
                 {
                     user_id
                 } else {
@@ -1447,7 +1453,7 @@ pub async fn stripe_webhook(
                 };
 
                 let user = if let Some(user) =
-                    crate::database::models::user_item::User::get_id(
+                    crate::database::models::user_item::DBUser::get_id(
                         user_id, pool, redis,
                     )
                     .await?
@@ -1464,7 +1470,7 @@ pub async fn stripe_webhook(
                 let charge_id = if let Some(charge_id) = metadata
                     .get("modrinth_charge_id")
                     .and_then(|x| parse_base62(x).ok())
-                    .map(|x| crate::database::models::ids::ChargeId(x as i64))
+                    .map(|x| crate::database::models::ids::DBChargeId(x as i64))
                 {
                     charge_id
                 } else {
@@ -1483,17 +1489,14 @@ pub async fn stripe_webhook(
                 let (charge, price, product, subscription) = if let Some(
                     mut charge,
                 ) =
-                    crate::database::models::charge_item::ChargeItem::get(
+                    crate::database::models::charge_item::DBCharge::get(
                         charge_id, pool,
                     )
                     .await?
                 {
                     let price = if let Some(price) =
-                        product_item::ProductPriceItem::get(
-                            charge.price_id,
-                            pool,
-                        )
-                        .await?
+                        product_item::DBProductPrice::get(charge.price_id, pool)
+                            .await?
                     {
                         price
                     } else {
@@ -1501,7 +1504,7 @@ pub async fn stripe_webhook(
                     };
 
                     let product = if let Some(product) =
-                        product_item::ProductItem::get(price.product_id, pool)
+                        product_item::DBProduct::get(price.product_id, pool)
                             .await?
                     {
                         product
@@ -1517,7 +1520,7 @@ pub async fn stripe_webhook(
 
                     if let Some(subscription_id) = charge.subscription_id {
                         let mut subscription = if let Some(subscription) =
-                            user_subscription_item::UserSubscriptionItem::get(
+                            user_subscription_item::DBUserSubscription::get(
                                 subscription_id,
                                 pool,
                             )
@@ -1557,7 +1560,7 @@ pub async fn stripe_webhook(
                         .get("modrinth_price_id")
                         .and_then(|x| parse_base62(x).ok())
                         .map(|x| {
-                            crate::database::models::ids::ProductPriceId(
+                            crate::database::models::ids::DBProductPriceId(
                                 x as i64,
                             )
                         }) {
@@ -1567,7 +1570,7 @@ pub async fn stripe_webhook(
                     };
 
                     let price = if let Some(price) =
-                        product_item::ProductPriceItem::get(price_id, pool)
+                        product_item::DBProductPrice::get(price_id, pool)
                             .await?
                     {
                         price
@@ -1576,7 +1579,7 @@ pub async fn stripe_webhook(
                     };
 
                     let product = if let Some(product) =
-                        product_item::ProductItem::get(price.product_id, pool)
+                        product_item::DBProduct::get(price.product_id, pool)
                             .await?
                     {
                         product
@@ -1601,21 +1604,21 @@ pub async fn stripe_webhook(
                                     .get("modrinth_subscription_id")
                                     .and_then(|x| parse_base62(x).ok())
                                     .map(|x| {
-                                        crate::database::models::ids::UserSubscriptionId(x as i64)
+                                        crate::database::models::ids::DBUserSubscriptionId(x as i64)
                                     }) {
                                     subscription_id
                                 } else {
                                     break 'metadata;
                                 };
 
-                                let subscription = if let Some(mut subscription) = user_subscription_item::UserSubscriptionItem::get(subscription_id, pool).await? {
+                                let subscription = if let Some(mut subscription) = user_subscription_item::DBUserSubscription::get(subscription_id, pool).await? {
                                     subscription.status = SubscriptionStatus::Unprovisioned;
                                     subscription.price_id = price_id;
                                     subscription.interval = interval;
 
                                     subscription
                                 } else {
-                                    user_subscription_item::UserSubscriptionItem {
+                                    user_subscription_item::DBUserSubscription {
                                         id: subscription_id,
                                         user_id,
                                         price_id,
@@ -1637,7 +1640,7 @@ pub async fn stripe_webhook(
                         }
                     };
 
-                    let charge = ChargeItem {
+                    let charge = DBCharge {
                         id: charge_id,
                         user_id,
                         price_id,
@@ -1736,7 +1739,7 @@ pub async fn stripe_webhook(
                                 ",
                                 badges.bits() as i64,
                                 metadata.user_item.id
-                                    as crate::database::models::ids::UserId,
+                                    as crate::database::models::ids::DBUserId,
                             )
                             .execute(&mut *transaction)
                             .await?;
@@ -1870,7 +1873,7 @@ pub async fn stripe_webhook(
                     if let Some(mut subscription) =
                         metadata.user_subscription_item
                     {
-                        let open_charge = ChargeItem::get_open_subscription(
+                        let open_charge = DBCharge::get_open_subscription(
                             subscription.id,
                             &mut *transaction,
                         )
@@ -1898,7 +1901,7 @@ pub async fn stripe_webhook(
                         {
                             let charge_id =
                                 generate_charge_id(&mut transaction).await?;
-                            ChargeItem {
+                            DBCharge {
                                 id: charge_id,
                                 user_id: metadata.user_item.id,
                                 price_id: metadata.product_price_item.id,
@@ -1936,7 +1939,7 @@ pub async fn stripe_webhook(
                     }
 
                     transaction.commit().await?;
-                    crate::database::models::user_item::User::clear_caches(
+                    crate::database::models::user_item::DBUser::clear_caches(
                         &[(metadata.user_item.id, None)],
                         &redis,
                     )
@@ -1992,9 +1995,18 @@ pub async fn stripe_webhook(
                         let _ = send_email(
                             email,
                             "Payment Failed for Modrinth",
-                            &format!("Our attempt to collect payment for {money} from the payment card on file was unsuccessful."),
+                            &format!(
+                                "Our attempt to collect payment for {money} from the payment card on file was unsuccessful."
+                            ),
                             "Please visit the following link below to update your payment method or contact your card provider. If the button does not work, you can copy the link and paste it into your browser.",
-                            Some(("Update billing settings", &format!("{}/{}", dotenvy::var("SITE_URL")?,  dotenvy::var("SITE_BILLING_PATH")?))),
+                            Some((
+                                "Update billing settings",
+                                &format!(
+                                    "{}/{}",
+                                    dotenvy::var("SITE_URL")?,
+                                    dotenvy::var("SITE_BILLING_PATH")?
+                                ),
+                            )),
                         );
                     }
 
@@ -2052,7 +2064,7 @@ pub async fn stripe_webhook(
 }
 
 async fn get_or_create_customer(
-    user_id: crate::models::ids::UserId,
+    user_id: ariadne::ids::UserId,
     stripe_customer_id: Option<&str>,
     user_email: Option<&str>,
     client: &stripe::Client,
@@ -2089,7 +2101,7 @@ async fn get_or_create_customer(
         .execute(pool)
         .await?;
 
-        crate::database::models::user_item::User::clear_caches(
+        crate::database::models::user_item::DBUser::clear_caches(
             &[(user_id.into(), None)],
             redis,
         )
@@ -2107,10 +2119,10 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
         let mut clear_cache_users = Vec::new();
 
         // If an active subscription has a canceled charge OR a failed charge more than two days ago, it should be cancelled
-        let all_charges = ChargeItem::get_unprovision(&pool).await?;
+        let all_charges = DBCharge::get_unprovision(&pool).await?;
 
         let mut all_subscriptions =
-            user_subscription_item::UserSubscriptionItem::get_many(
+            user_subscription_item::DBUserSubscription::get_many(
                 &all_charges
                     .iter()
                     .filter_map(|x| x.subscription_id)
@@ -2120,7 +2132,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
                 &pool,
             )
             .await?;
-        let subscription_prices = product_item::ProductPriceItem::get_many(
+        let subscription_prices = product_item::DBProductPrice::get_many(
             &all_subscriptions
                 .iter()
                 .map(|x| x.price_id)
@@ -2130,7 +2142,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
             &pool,
         )
         .await?;
-        let subscription_products = product_item::ProductItem::get_many(
+        let subscription_products = product_item::DBProduct::get_many(
             &subscription_prices
                 .iter()
                 .map(|x| x.product_id)
@@ -2140,7 +2152,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
             &pool,
         )
         .await?;
-        let users = crate::database::models::User::get_many_ids(
+        let users = crate::database::models::DBUser::get_many_ids(
             &all_subscriptions
                 .iter()
                 .map(|x| x.user_id)
@@ -2203,7 +2215,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
                         WHERE (id = $2)
                         ",
                         badges.bits() as i64,
-                        user.id as crate::database::models::ids::UserId,
+                        user.id as crate::database::models::ids::DBUserId,
                     )
                     .execute(&mut *transaction)
                     .await?;
@@ -2251,7 +2263,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
             clear_cache_users.push(user.id);
         }
 
-        crate::database::models::User::clear_caches(
+        crate::database::models::DBUser::clear_caches(
             &clear_cache_users
                 .into_iter()
                 .map(|x| (x, None))
@@ -2278,14 +2290,21 @@ pub async fn index_billing(
 ) {
     info!("Indexing billing queue");
     let res = async {
-        // If a charge is open and due or has been attempted more than two days ago, it should be processed
-        let charges_to_do =
-            crate::database::models::charge_item::ChargeItem::get_chargeable(
-                &pool,
-            )
-            .await?;
+        // If a charge has continuously failed for more than a month, it should be cancelled
+        let charges_to_cancel = DBCharge::get_cancellable(&pool).await?;
 
-        let prices = product_item::ProductPriceItem::get_many(
+        for mut charge in charges_to_cancel {
+            charge.status = ChargeStatus::Cancelled;
+
+            let mut transaction = pool.begin().await?;
+            charge.upsert(&mut transaction).await?;
+            transaction.commit().await?;
+        }
+
+        // If a charge is open and due or has been attempted more than two days ago, it should be processed
+        let charges_to_do = DBCharge::get_chargeable(&pool).await?;
+
+        let prices = product_item::DBProductPrice::get_many(
             &charges_to_do
                 .iter()
                 .map(|x| x.price_id)
@@ -2296,7 +2315,7 @@ pub async fn index_billing(
         )
         .await?;
 
-        let users = crate::database::models::User::get_many_ids(
+        let users = crate::database::models::DBUser::get_many_ids(
             &charges_to_do
                 .iter()
                 .map(|x| x.user_id)
diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index 31e3c620..2707693f 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -1,29 +1,29 @@
 use crate::auth::email::send_email;
 use crate::auth::validate::get_user_record_from_bearer_token;
-use crate::auth::{get_user_from_headers, AuthProvider, AuthenticationError};
-use crate::database::models::flow_item::Flow;
+use crate::auth::{AuthProvider, AuthenticationError, get_user_from_headers};
+use crate::database::models::flow_item::DBFlow;
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
 use crate::models::pats::Scopes;
 use crate::models::users::{Badges, Role};
 use crate::queue::session::AuthQueue;
-use crate::routes::internal::session::issue_session;
 use crate::routes::ApiError;
+use crate::routes::internal::session::issue_session;
 use crate::util::captcha::check_hcaptcha;
 use crate::util::env::parse_strings_from_var;
 use crate::util::ext::get_image_ext;
 use crate::util::img::upload_image_optimized;
-use crate::util::validate::{validation_errors_to_string, RE_URL_SAFE};
-use actix_web::web::{scope, Data, Query, ServiceConfig};
-use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
+use crate::util::validate::validation_errors_to_string;
+use actix_web::web::{Data, Query, ServiceConfig, scope};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use argon2::password_hash::SaltString;
 use argon2::{Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
 use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use ariadne::ids::random_base62_rng;
 use base64::Engine;
 use chrono::{Duration, Utc};
-use rand_chacha::rand_core::SeedableRng;
 use rand_chacha::ChaCha20Rng;
+use rand_chacha::rand_core::SeedableRng;
 use reqwest::header::AUTHORIZATION;
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgPool;
@@ -31,6 +31,7 @@ use std::collections::HashMap;
 use std::str::FromStr;
 use std::sync::Arc;
 use validator::Validate;
+use zxcvbn::Score;
 
 pub fn config(cfg: &mut ServiceConfig) {
     cfg.service(
@@ -73,9 +74,9 @@ impl TempUser {
         client: &PgPool,
         file_host: &Arc<dyn FileHost + Send + Sync>,
         redis: &RedisPool,
-    ) -> Result<crate::database::models::UserId, AuthenticationError> {
+    ) -> Result<crate::database::models::DBUserId, AuthenticationError> {
         if let Some(email) = &self.email {
-            if crate::database::models::User::get_email(email, client)
+            if crate::database::models::DBUser::get_email(email, client)
                 .await?
                 .is_some()
             {
@@ -100,7 +101,7 @@ impl TempUser {
                 }
             );
 
-            let new_id = crate::database::models::User::get(
+            let new_id = crate::database::models::DBUser::get(
                 &test_username,
                 client,
                 redis,
@@ -114,50 +115,48 @@ impl TempUser {
             }
         }
 
-        let (avatar_url, raw_avatar_url) =
-            if let Some(avatar_url) = self.avatar_url {
-                let res = reqwest::get(&avatar_url).await?;
-                let headers = res.headers().clone();
+        let (avatar_url, raw_avatar_url) = if let Some(avatar_url) =
+            self.avatar_url
+        {
+            let res = reqwest::get(&avatar_url).await?;
+            let headers = res.headers().clone();
 
-                let img_data = if let Some(content_type) = headers
-                    .get(reqwest::header::CONTENT_TYPE)
-                    .and_then(|ct| ct.to_str().ok())
-                {
-                    get_image_ext(content_type)
-                } else {
-                    avatar_url.rsplit('.').next()
-                };
+            let img_data = if let Some(content_type) = headers
+                .get(reqwest::header::CONTENT_TYPE)
+                .and_then(|ct| ct.to_str().ok())
+            {
+                get_image_ext(content_type)
+            } else {
+                avatar_url.rsplit('.').next()
+            };
 
-                if let Some(ext) = img_data {
-                    let bytes = res.bytes().await?;
+            if let Some(ext) = img_data {
+                let bytes = res.bytes().await?;
 
-                    let upload_result = upload_image_optimized(
-                        &format!(
-                            "user/{}",
-                            crate::models::users::UserId::from(user_id)
-                        ),
-                        bytes,
-                        ext,
-                        Some(96),
-                        Some(1.0),
-                        &**file_host,
-                    )
-                    .await;
+                let upload_result = upload_image_optimized(
+                    &format!("user/{}", ariadne::ids::UserId::from(user_id)),
+                    bytes,
+                    ext,
+                    Some(96),
+                    Some(1.0),
+                    &**file_host,
+                )
+                .await;
 
-                    if let Ok(upload_result) = upload_result {
-                        (Some(upload_result.url), Some(upload_result.raw_url))
-                    } else {
-                        (None, None)
-                    }
+                if let Ok(upload_result) = upload_result {
+                    (Some(upload_result.url), Some(upload_result.raw_url))
                 } else {
                     (None, None)
                 }
             } else {
                 (None, None)
-            };
+            }
+        } else {
+            (None, None)
+        };
 
         if let Some(username) = username {
-            crate::database::models::User {
+            crate::database::models::DBUser {
                 id: user_id,
                 github_id: if provider == AuthProvider::GitHub {
                     Some(
@@ -247,7 +246,7 @@ impl AuthProvider {
         state: String,
     ) -> Result<String, AuthenticationError> {
         let self_addr = dotenvy::var("SELF_ADDR")?;
-        let raw_redirect_uri = format!("{}/v2/auth/callback", self_addr);
+        let raw_redirect_uri = format!("{self_addr}/v2/auth/callback");
         let redirect_uri = urlencoding::encode(&raw_redirect_uri);
 
         Ok(match self {
@@ -255,30 +254,28 @@ impl AuthProvider {
                 let client_id = dotenvy::var("GITHUB_CLIENT_ID")?;
 
                 format!(
-                    "https://github.com/login/oauth/authorize?client_id={}&prompt=select_account&state={}&scope=read%3Auser%20user%3Aemail&redirect_uri={}",
-                    client_id,
-                    state,
-                    redirect_uri,
+                    "https://github.com/login/oauth/authorize?client_id={client_id}&prompt=select_account&state={state}&scope=read%3Auser%20user%3Aemail&redirect_uri={redirect_uri}",
                 )
             }
             AuthProvider::Discord => {
                 let client_id = dotenvy::var("DISCORD_CLIENT_ID")?;
 
-                format!("https://discord.com/api/oauth2/authorize?client_id={}&state={}&response_type=code&scope=identify%20email&redirect_uri={}", client_id, state, redirect_uri)
+                format!(
+                    "https://discord.com/api/oauth2/authorize?client_id={client_id}&state={state}&response_type=code&scope=identify%20email&redirect_uri={redirect_uri}"
+                )
             }
             AuthProvider::Microsoft => {
                 let client_id = dotenvy::var("MICROSOFT_CLIENT_ID")?;
 
-                format!("https://login.live.com/oauth20_authorize.srf?client_id={}&response_type=code&scope=user.read&state={}&prompt=select_account&redirect_uri={}", client_id, state, redirect_uri)
+                format!(
+                    "https://login.live.com/oauth20_authorize.srf?client_id={client_id}&response_type=code&scope=user.read&state={state}&prompt=select_account&redirect_uri={redirect_uri}"
+                )
             }
             AuthProvider::GitLab => {
                 let client_id = dotenvy::var("GITLAB_CLIENT_ID")?;
 
                 format!(
-                    "https://gitlab.com/oauth/authorize?client_id={}&state={}&scope=read_user+profile+email&response_type=code&redirect_uri={}",
-                    client_id,
-                    state,
-                    redirect_uri,
+                    "https://gitlab.com/oauth/authorize?client_id={client_id}&state={state}&scope=read_user+profile+email&response_type=code&redirect_uri={redirect_uri}",
                 )
             }
             AuthProvider::Google => {
@@ -288,7 +285,9 @@ impl AuthProvider {
                     "https://accounts.google.com/o/oauth2/v2/auth?client_id={}&state={}&scope={}&response_type=code&redirect_uri={}",
                     client_id,
                     state,
-                    urlencoding::encode("https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"),
+                    urlencoding::encode(
+                        "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
+                    ),
                     redirect_uri,
                 )
             }
@@ -297,7 +296,9 @@ impl AuthProvider {
                     "https://steamcommunity.com/openid/login?openid.ns={}&openid.mode={}&openid.return_to={}{}{}&openid.realm={}&openid.identity={}&openid.claimed_id={}",
                     urlencoding::encode("http://specs.openid.net/auth/2.0"),
                     "checkid_setup",
-                    redirect_uri, urlencoding::encode("?state="), state,
+                    redirect_uri,
+                    urlencoding::encode("?state="),
+                    state,
                     self_addr,
                     "http://specs.openid.net/auth/2.0/identifier_select",
                     "http://specs.openid.net/auth/2.0/identifier_select",
@@ -315,7 +316,9 @@ impl AuthProvider {
 
                 format!(
                     "https://{auth_url}/connect?flowEntry=static&client_id={client_id}&scope={}&response_type=code&redirect_uri={redirect_uri}&state={state}",
-                    urlencoding::encode("openid email address https://uri.paypal.com/services/paypalattributes"),
+                    urlencoding::encode(
+                        "openid email address https://uri.paypal.com/services/paypalattributes"
+                    ),
                 )
             }
         })
@@ -342,8 +345,7 @@ impl AuthProvider {
                 let client_secret = dotenvy::var("GITHUB_CLIENT_SECRET")?;
 
                 let url = format!(
-                    "https://github.com/login/oauth/access_token?client_id={}&client_secret={}&code={}&redirect_uri={}",
-                    client_id, client_secret, code, redirect_uri
+                    "https://github.com/login/oauth/access_token?client_id={client_id}&client_secret={client_secret}&code={code}&redirect_uri={redirect_uri}"
                 );
 
                 let token: AccessToken = reqwest::Client::new()
@@ -482,9 +484,8 @@ impl AuthProvider {
                 form.insert("openid.mode".to_string(), "check_authentication");
 
                 for val in signed.split(',') {
-                    if let Some(arr_val) = query.get(&format!("openid.{}", val))
-                    {
-                        form.insert(format!("openid.{}", val), &**arr_val);
+                    if let Some(arr_val) = query.get(&format!("openid.{val}")) {
+                        form.insert(format!("openid.{val}"), &**arr_val);
                     }
                 }
 
@@ -621,8 +622,7 @@ impl AuthProvider {
                     email: discord_user.email,
                     avatar_url: discord_user.avatar.map(|x| {
                         format!(
-                            "https://cdn.discordapp.com/avatars/{}/{}.webp",
-                            id, x
+                            "https://cdn.discordapp.com/avatars/{id}/{x}.webp"
                         )
                     }),
                     bio: None,
@@ -741,9 +741,7 @@ impl AuthProvider {
 
                 let response: String = reqwest::get(
                     &format!(
-                        "https://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key={}&steamids={}",
-                        api_key,
-                        token
+                        "https://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key={api_key}&steamids={token}"
                     )
                 )
                     .await?
@@ -823,7 +821,7 @@ impl AuthProvider {
         &self,
         id: &str,
         executor: E,
-    ) -> Result<Option<crate::database::models::UserId>, AuthenticationError>
+    ) -> Result<Option<crate::database::models::DBUserId>, AuthenticationError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
@@ -837,7 +835,7 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
             AuthProvider::Discord => {
                 let value = sqlx::query!(
@@ -848,7 +846,7 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
             AuthProvider::Microsoft => {
                 let value = sqlx::query!(
@@ -858,7 +856,7 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
             AuthProvider::GitLab => {
                 let value = sqlx::query!(
@@ -869,7 +867,7 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
             AuthProvider::Google => {
                 let value = sqlx::query!(
@@ -879,7 +877,7 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
             AuthProvider::Steam => {
                 let value = sqlx::query!(
@@ -890,7 +888,7 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
             AuthProvider::PayPal => {
                 let value = sqlx::query!(
@@ -900,14 +898,14 @@ impl AuthProvider {
                 .fetch_optional(executor)
                 .await?;
 
-                value.map(|x| crate::database::models::UserId(x.id))
+                value.map(|x| crate::database::models::DBUserId(x.id))
             }
         })
     }
 
     pub async fn update_user_id(
         &self,
-        user_id: crate::database::models::UserId,
+        user_id: crate::database::models::DBUserId,
         id: Option<&str>,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), AuthenticationError> {
@@ -919,7 +917,7 @@ impl AuthProvider {
                     SET github_id = $2
                     WHERE (id = $1)
                     ",
-                    user_id as crate::database::models::UserId,
+                    user_id as crate::database::models::DBUserId,
                     id.and_then(|x| x.parse::<i64>().ok())
                 )
                 .execute(&mut **transaction)
@@ -932,7 +930,7 @@ impl AuthProvider {
                     SET discord_id = $2
                     WHERE (id = $1)
                     ",
-                    user_id as crate::database::models::UserId,
+                    user_id as crate::database::models::DBUserId,
                     id.and_then(|x| x.parse::<i64>().ok())
                 )
                 .execute(&mut **transaction)
@@ -945,7 +943,7 @@ impl AuthProvider {
                     SET microsoft_id = $2
                     WHERE (id = $1)
                     ",
-                    user_id as crate::database::models::UserId,
+                    user_id as crate::database::models::DBUserId,
                     id,
                 )
                 .execute(&mut **transaction)
@@ -958,7 +956,7 @@ impl AuthProvider {
                     SET gitlab_id = $2
                     WHERE (id = $1)
                     ",
-                    user_id as crate::database::models::UserId,
+                    user_id as crate::database::models::DBUserId,
                     id.and_then(|x| x.parse::<i64>().ok())
                 )
                 .execute(&mut **transaction)
@@ -971,7 +969,7 @@ impl AuthProvider {
                     SET google_id = $2
                     WHERE (id = $1)
                     ",
-                    user_id as crate::database::models::UserId,
+                    user_id as crate::database::models::DBUserId,
                     id,
                 )
                 .execute(&mut **transaction)
@@ -984,7 +982,7 @@ impl AuthProvider {
                     SET steam_id = $2
                     WHERE (id = $1)
                     ",
-                    user_id as crate::database::models::UserId,
+                    user_id as crate::database::models::DBUserId,
                     id.and_then(|x| x.parse::<i64>().ok())
                 )
                 .execute(&mut **transaction)
@@ -998,7 +996,7 @@ impl AuthProvider {
                         SET paypal_country = NULL, paypal_email = NULL, paypal_id = NULL
                         WHERE (id = $1)
                         ",
-                        user_id as crate::database::models::UserId,
+                        user_id as crate::database::models::DBUserId,
                     )
                     .execute(&mut **transaction)
                     .await?;
@@ -1009,7 +1007,7 @@ impl AuthProvider {
                         SET paypal_id = $2
                         WHERE (id = $1)
                         ",
-                        user_id as crate::database::models::UserId,
+                        user_id as crate::database::models::DBUserId,
                         id,
                     )
                     .execute(&mut **transaction)
@@ -1085,7 +1083,7 @@ pub async fn init(
         None
     };
 
-    let state = Flow::OAuth {
+    let state = DBFlow::OAuth {
         user_id,
         url: info.url,
         provider: info.provider,
@@ -1114,16 +1112,16 @@ pub async fn auth_callback(
 
     let state = state_string.clone();
     let res: Result<HttpResponse, AuthenticationError> = async move {
-        let flow = Flow::get(&state, &redis).await?;
+        let flow = DBFlow::get(&state, &redis).await?;
 
         // Extract cookie header from request
-        if let Some(Flow::OAuth {
+        if let Some(DBFlow::OAuth {
                         user_id,
                         provider,
                         url,
                     }) = flow
         {
-            Flow::remove(&state, &redis).await?;
+            DBFlow::remove(&state, &redis).await?;
 
             let token = provider.get_token(query).await?;
             let oauth_user = provider.get_user(&token).await?;
@@ -1140,7 +1138,7 @@ pub async fn auth_callback(
                     .update_user_id(id, Some(&oauth_user.id), &mut transaction)
                     .await?;
 
-                let user = crate::database::models::User::get_id(id, &**client, &redis).await?;
+                let user = crate::database::models::DBUser::get_id(id, &**client, &redis).await?;
 
                 if provider == AuthProvider::PayPal  {
                     sqlx::query!(
@@ -1152,7 +1150,7 @@ pub async fn auth_callback(
                         oauth_user.country,
                         oauth_user.email,
                         oauth_user.id,
-                        id as crate::database::models::ids::UserId,
+                        id as crate::database::models::ids::DBUserId,
                     )
                         .execute(&mut *transaction)
                         .await?;
@@ -1167,19 +1165,19 @@ pub async fn auth_callback(
                 }
 
                 transaction.commit().await?;
-                crate::database::models::User::clear_caches(&[(id, None)], &redis).await?;
+                crate::database::models::DBUser::clear_caches(&[(id, None)], &redis).await?;
 
                 Ok(HttpResponse::TemporaryRedirect()
                     .append_header(("Location", &*url))
                     .json(serde_json::json!({ "url": url })))
             } else {
                 let user_id = if let Some(user_id) = user_id_opt {
-                    let user = crate::database::models::User::get_id(user_id, &**client, &redis)
+                    let user = crate::database::models::DBUser::get_id(user_id, &**client, &redis)
                         .await?
                         .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
                     if user.totp_secret.is_some() {
-                        let flow = Flow::Login2FA { user_id: user.id }
+                        let flow = DBFlow::Login2FA { user_id: user.id }
                             .insert(Duration::minutes(30), &redis)
                             .await?;
 
@@ -1270,7 +1268,10 @@ pub async fn delete_auth_provider(
             send_email(
                 email,
                 "Authentication method removed",
-                &format!("When logging into Modrinth, you can no longer log in using the {} authentication provider.", delete_provider.provider.as_str()),
+                &format!(
+                    "When logging into Modrinth, you can no longer log in using the {} authentication provider.",
+                    delete_provider.provider.as_str()
+                ),
                 "If you did not make this change, please contact us immediately through our support channels on Discord or via email (support@modrinth.com).",
                 None,
             )?;
@@ -1278,7 +1279,7 @@ pub async fn delete_auth_provider(
     }
 
     transaction.commit().await?;
-    crate::database::models::User::clear_caches(
+    crate::database::models::DBUser::clear_caches(
         &[(user.id.into(), None)],
         &redis,
     )
@@ -1293,6 +1294,11 @@ pub async fn sign_up_sendy(email: &str) -> Result<(), AuthenticationError> {
     let api_key = dotenvy::var("SENDY_API_KEY")?;
     let site_url = dotenvy::var("SITE_URL")?;
 
+    if url.is_empty() || url == "none" {
+        tracing::info!("Sendy URL not set, skipping signup");
+        return Ok(());
+    }
+
     let mut form = HashMap::new();
 
     form.insert("api_key", &*api_key);
@@ -1315,7 +1321,7 @@ pub async fn sign_up_sendy(email: &str) -> Result<(), AuthenticationError> {
 
 #[derive(Deserialize, Validate)]
 pub struct NewAccount {
-    #[validate(length(min = 1, max = 39), regex = "RE_URL_SAFE")]
+    #[validate(length(min = 1, max = 39), regex(path = *crate::util::validate::RE_URL_SAFE))]
     pub username: String,
     #[validate(length(min = 8, max = 256))]
     pub password: String,
@@ -1340,7 +1346,7 @@ pub async fn create_account_with_password(
         return Err(ApiError::Turnstile);
     }
 
-    if crate::database::models::User::get(
+    if crate::database::models::DBUser::get(
         &new_account.username,
         &**pool,
         &redis,
@@ -1360,14 +1366,12 @@ pub async fn create_account_with_password(
     let score = zxcvbn::zxcvbn(
         &new_account.password,
         &[&new_account.username, &new_account.email],
-    )?;
+    );
 
-    if score.score() < 3 {
+    if score.score() < Score::Three {
         return Err(ApiError::InvalidInput(
-            if let Some(feedback) =
-                score.feedback().clone().and_then(|x| x.warning())
-            {
-                format!("Password too weak: {}", feedback)
+            if let Some(feedback) = score.feedback().and_then(|x| x.warning()) {
+                format!("Password too weak: {feedback}")
             } else {
                 "Specified password is too weak! Please improve its strength."
                     .to_string()
@@ -1381,7 +1385,7 @@ pub async fn create_account_with_password(
         .hash_password(new_account.password.as_bytes(), &salt)?
         .to_string();
 
-    if crate::database::models::User::get_email(&new_account.email, &**pool)
+    if crate::database::models::DBUser::get_email(&new_account.email, &**pool)
         .await?
         .is_some()
     {
@@ -1390,7 +1394,7 @@ pub async fn create_account_with_password(
         ));
     }
 
-    crate::database::models::User {
+    crate::database::models::DBUser {
         id: user_id,
         github_id: None,
         discord_id: None,
@@ -1422,7 +1426,7 @@ pub async fn create_account_with_password(
     let session = issue_session(req, user_id, &mut transaction, &redis).await?;
     let res = crate::models::sessions::Session::from(session, true, None);
 
-    let flow = Flow::ConfirmEmail {
+    let flow = DBFlow::ConfirmEmail {
         user_id,
         confirm_email: new_account.email.clone(),
     }
@@ -1463,17 +1467,19 @@ pub async fn login_password(
     }
 
     let user = if let Some(user) =
-        crate::database::models::User::get(&login.username, &**pool, &redis)
+        crate::database::models::DBUser::get(&login.username, &**pool, &redis)
             .await?
     {
         user
     } else {
-        let user =
-            crate::database::models::User::get_email(&login.username, &**pool)
-                .await?
-                .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        let user = crate::database::models::DBUser::get_email(
+            &login.username,
+            &**pool,
+        )
+        .await?
+        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
-        crate::database::models::User::get_id(user, &**pool, &redis)
+        crate::database::models::DBUser::get_id(user, &**pool, &redis)
             .await?
             .ok_or_else(|| AuthenticationError::InvalidCredentials)?
     };
@@ -1491,7 +1497,7 @@ pub async fn login_password(
         .map_err(|_| AuthenticationError::InvalidCredentials)?;
 
     if user.totp_secret.is_some() {
-        let flow = Flow::Login2FA { user_id: user.id }
+        let flow = DBFlow::Login2FA { user_id: user.id }
             .insert(Duration::minutes(30), &redis)
             .await?;
 
@@ -1521,7 +1527,7 @@ async fn validate_2fa_code(
     input: String,
     secret: String,
     allow_backup: bool,
-    user_id: crate::database::models::UserId,
+    user_id: crate::database::models::DBUserId,
     redis: &RedisPool,
     pool: &PgPool,
     transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
@@ -1564,7 +1570,7 @@ async fn validate_2fa_code(
         Ok(true)
     } else if allow_backup {
         let backup_codes =
-            crate::database::models::User::get_backup_codes(user_id, pool)
+            crate::database::models::DBUser::get_backup_codes(user_id, pool)
                 .await?;
 
         if !backup_codes.contains(&input) {
@@ -1577,13 +1583,13 @@ async fn validate_2fa_code(
                     DELETE FROM user_backup_codes
                     WHERE user_id = $1 AND code = $2
                     ",
-                user_id as crate::database::models::ids::UserId,
+                user_id as crate::database::models::ids::DBUserId,
                 code as i64,
             )
             .execute(&mut **transaction)
             .await?;
 
-            crate::database::models::User::clear_caches(
+            crate::database::models::DBUser::clear_caches(
                 &[(user_id, None)],
                 redis,
             )
@@ -1603,13 +1609,13 @@ pub async fn login_2fa(
     redis: Data<RedisPool>,
     login: web::Json<Login2FA>,
 ) -> Result<HttpResponse, ApiError> {
-    let flow = Flow::get(&login.flow, &redis)
+    let flow = DBFlow::get(&login.flow, &redis)
         .await?
         .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
-    if let Flow::Login2FA { user_id } = flow {
+    if let DBFlow::Login2FA { user_id } = flow {
         let user =
-            crate::database::models::User::get_id(user_id, &**pool, &redis)
+            crate::database::models::DBUser::get_id(user_id, &**pool, &redis)
                 .await?
                 .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
@@ -1630,7 +1636,7 @@ pub async fn login_2fa(
                 AuthenticationError::InvalidCredentials,
             ));
         }
-        Flow::remove(&login.flow, &redis).await?;
+        DBFlow::remove(&login.flow, &redis).await?;
 
         let session =
             issue_session(req, user_id, &mut transaction, &redis).await?;
@@ -1666,7 +1672,7 @@ pub async fn begin_2fa_flow(
         let string = totp_rs::Secret::generate_secret();
         let encoded = string.to_encoded();
 
-        let flow = Flow::Initialize2FA {
+        let flow = DBFlow::Initialize2FA {
             user_id: user.id.into(),
             secret: encoded.to_string(),
         }
@@ -1692,11 +1698,11 @@ pub async fn finish_2fa_flow(
     login: web::Json<Login2FA>,
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let flow = Flow::get(&login.flow, &redis)
+    let flow = DBFlow::get(&login.flow, &redis)
         .await?
         .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
-    if let Flow::Initialize2FA { user_id, secret } = flow {
+    if let DBFlow::Initialize2FA { user_id, secret } = flow {
         let user = get_user_from_headers(
             &req,
             &**pool,
@@ -1731,7 +1737,7 @@ pub async fn finish_2fa_flow(
             ));
         }
 
-        Flow::remove(&login.flow, &redis).await?;
+        DBFlow::remove(&login.flow, &redis).await?;
 
         sqlx::query!(
             "
@@ -1740,7 +1746,7 @@ pub async fn finish_2fa_flow(
             WHERE (id = $2)
             ",
             secret,
-            user_id as crate::database::models::ids::UserId,
+            user_id as crate::database::models::ids::DBUserId,
         )
         .execute(&mut *transaction)
         .await?;
@@ -1750,7 +1756,7 @@ pub async fn finish_2fa_flow(
             DELETE FROM user_backup_codes
             WHERE user_id = $1
             ",
-            user_id as crate::database::models::ids::UserId,
+            user_id as crate::database::models::ids::DBUserId,
         )
         .execute(&mut *transaction)
         .await?;
@@ -1770,7 +1776,7 @@ pub async fn finish_2fa_flow(
                     $1, $2
                 )
                 ",
-                user_id as crate::database::models::ids::UserId,
+                user_id as crate::database::models::ids::DBUserId,
                 val as i64,
             )
             .execute(&mut *transaction)
@@ -1790,7 +1796,7 @@ pub async fn finish_2fa_flow(
         }
 
         transaction.commit().await?;
-        crate::database::models::User::clear_caches(
+        crate::database::models::DBUser::clear_caches(
             &[(user.id.into(), None)],
             &redis,
         )
@@ -1863,7 +1869,7 @@ pub async fn remove_2fa(
         SET totp_secret = NULL
         WHERE (id = $1)
         ",
-        user.id as crate::database::models::ids::UserId,
+        user.id as crate::database::models::ids::DBUserId,
     )
     .execute(&mut *transaction)
     .await?;
@@ -1873,7 +1879,7 @@ pub async fn remove_2fa(
         DELETE FROM user_backup_codes
         WHERE user_id = $1
         ",
-        user.id as crate::database::models::ids::UserId,
+        user.id as crate::database::models::ids::DBUserId,
     )
     .execute(&mut *transaction)
     .await?;
@@ -1889,7 +1895,7 @@ pub async fn remove_2fa(
     }
 
     transaction.commit().await?;
-    crate::database::models::User::clear_caches(&[(user.id, None)], &redis)
+    crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
         .await?;
 
     Ok(HttpResponse::NoContent().finish())
@@ -1912,15 +1918,17 @@ pub async fn reset_password_begin(
         return Err(ApiError::Turnstile);
     }
 
-    let user = if let Some(user_id) = crate::database::models::User::get_email(
-        &reset_password.username,
-        &**pool,
-    )
-    .await?
+    let user = if let Some(user_id) =
+        crate::database::models::DBUser::get_email(
+            &reset_password.username,
+            &**pool,
+        )
+        .await?
     {
-        crate::database::models::User::get_id(user_id, &**pool, &redis).await?
+        crate::database::models::DBUser::get_id(user_id, &**pool, &redis)
+            .await?
     } else {
-        crate::database::models::User::get(
+        crate::database::models::DBUser::get(
             &reset_password.username,
             &**pool,
             &redis,
@@ -1929,7 +1937,7 @@ pub async fn reset_password_begin(
     };
 
     if let Some(user) = user {
-        let flow = Flow::ForgotPassword { user_id: user.id }
+        let flow = DBFlow::ForgotPassword { user_id: user.id }
             .insert(Duration::hours(24), &redis)
             .await?;
 
@@ -1939,7 +1947,15 @@ pub async fn reset_password_begin(
                 "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))),
+                Some((
+                    "Reset password",
+                    &format!(
+                        "{}/{}?flow={}",
+                        dotenvy::var("SITE_URL")?,
+                        dotenvy::var("SITE_RESET_PASSWORD_PATH")?,
+                        flow
+                    ),
+                )),
             )?;
         }
     }
@@ -1963,13 +1979,14 @@ pub async fn change_password(
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let user = if let Some(flow) = &change_password.flow {
-        let flow = Flow::get(flow, &redis).await?;
+        let flow = DBFlow::get(flow, &redis).await?;
 
-        if let Some(Flow::ForgotPassword { user_id }) = flow {
-            let user =
-                crate::database::models::User::get_id(user_id, &**pool, &redis)
-                    .await?
-                    .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        if let Some(DBFlow::ForgotPassword { user_id }) = flow {
+            let user = crate::database::models::DBUser::get_id(
+                user_id, &**pool, &redis,
+            )
+            .await?
+            .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
             Some(user)
         } else {
@@ -2023,14 +2040,14 @@ pub async fn change_password(
         let score = zxcvbn::zxcvbn(
             new_password,
             &[&user.username, &user.email.clone().unwrap_or_default()],
-        )?;
+        );
 
-        if score.score() < 3 {
+        if score.score() < Score::Three {
             return Err(ApiError::InvalidInput(
                 if let Some(feedback) =
-                    score.feedback().clone().and_then(|x| x.warning())
+                    score.feedback().and_then(|x| x.warning())
                 {
-                    format!("Password too weak: {}", feedback)
+                    format!("Password too weak: {feedback}")
                 } else {
                     "Specified password is too weak! Please improve its strength.".to_string()
                 },
@@ -2067,13 +2084,13 @@ pub async fn change_password(
         WHERE (id = $2)
         ",
         update_password,
-        user.id as crate::database::models::ids::UserId,
+        user.id as crate::database::models::ids::DBUserId,
     )
     .execute(&mut *transaction)
     .await?;
 
     if let Some(flow) = &change_password.flow {
-        Flow::remove(flow, &redis).await?;
+        DBFlow::remove(flow, &redis).await?;
     }
 
     if let Some(email) = user.email {
@@ -2085,15 +2102,15 @@ pub async fn change_password(
 
         send_email(
             email,
-            &format!("Password {}", changed),
-            &format!("Your password has been {} on your account.", changed),
+            &format!("Password {changed}"),
+            &format!("Your password has been {changed} on your account."),
             "If you did not make this change, please contact us immediately through our support channels on Discord or via email (support@modrinth.com).",
             None,
         )?;
     }
 
     transaction.commit().await?;
-    crate::database::models::User::clear_caches(&[(user.id, None)], &redis)
+    crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
         .await?;
 
     Ok(HttpResponse::Ok().finish())
@@ -2146,7 +2163,10 @@ pub async fn set_email(
         send_email(
             user_email,
             "Email changed",
-            &format!("Your email has been updated to {} on your account.", email.email),
+            &format!(
+                "Your email has been updated to {} on your account.",
+                email.email
+            ),
             "If you did not make this change, please contact us immediately through our support channels on Discord or via email (support@modrinth.com).",
             None,
         )?;
@@ -2168,7 +2188,7 @@ pub async fn set_email(
         .await?;
     }
 
-    let flow = Flow::ConfirmEmail {
+    let flow = DBFlow::ConfirmEmail {
         user_id: user.id.into(),
         confirm_email: email.email.clone(),
     }
@@ -2182,7 +2202,7 @@ pub async fn set_email(
     )?;
 
     transaction.commit().await?;
-    crate::database::models::User::clear_caches(
+    crate::database::models::DBUser::clear_caches(
         &[(user.id.into(), None)],
         &redis,
     )
@@ -2215,7 +2235,7 @@ pub async fn resend_verify_email(
             ));
         }
 
-        let flow = Flow::ConfirmEmail {
+        let flow = DBFlow::ConfirmEmail {
             user_id: user.id.into(),
             confirm_email: email.clone(),
         }
@@ -2247,15 +2267,15 @@ pub async fn verify_email(
     redis: Data<RedisPool>,
     email: web::Json<VerifyEmail>,
 ) -> Result<HttpResponse, ApiError> {
-    let flow = Flow::get(&email.flow, &redis).await?;
+    let flow = DBFlow::get(&email.flow, &redis).await?;
 
-    if let Some(Flow::ConfirmEmail {
+    if let Some(DBFlow::ConfirmEmail {
         user_id,
         confirm_email,
     }) = flow
     {
         let user =
-            crate::database::models::User::get_id(user_id, &**pool, &redis)
+            crate::database::models::DBUser::get_id(user_id, &**pool, &redis)
                 .await?
                 .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
 
@@ -2274,15 +2294,18 @@ pub async fn verify_email(
             SET email_verified = TRUE
             WHERE (id = $1)
             ",
-            user.id as crate::database::models::ids::UserId,
+            user.id as crate::database::models::ids::DBUserId,
         )
         .execute(&mut *transaction)
         .await?;
 
-        Flow::remove(&email.flow, &redis).await?;
+        DBFlow::remove(&email.flow, &redis).await?;
         transaction.commit().await?;
-        crate::database::models::User::clear_caches(&[(user.id, None)], &redis)
-            .await?;
+        crate::database::models::DBUser::clear_caches(
+            &[(user.id, None)],
+            &redis,
+        )
+        .await?;
 
         Ok(HttpResponse::NoContent().finish())
     } else {
@@ -2331,6 +2354,14 @@ fn send_email_verify(
         "Verify your email",
         opener,
         "Please visit the following link below to verify your email. If the button does not work, you can copy the link and paste it into your browser. This link expires in 24 hours.",
-        Some(("Verify email", &format!("{}/{}?flow={}", dotenvy::var("SITE_URL")?,  dotenvy::var("SITE_VERIFY_EMAIL_PATH")?, flow))),
+        Some((
+            "Verify email",
+            &format!(
+                "{}/{}?flow={}",
+                dotenvy::var("SITE_URL")?,
+                dotenvy::var("SITE_VERIFY_EMAIL_PATH")?,
+                flow
+            ),
+        )),
     )
 }
diff --git a/apps/labrinth/src/routes/internal/gdpr.rs b/apps/labrinth/src/routes/internal/gdpr.rs
index 6f1d3e61..37ac90af 100644
--- a/apps/labrinth/src/routes/internal/gdpr.rs
+++ b/apps/labrinth/src/routes/internal/gdpr.rs
@@ -3,7 +3,7 @@ use crate::database::redis::RedisPool;
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
-use actix_web::{post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, post, web};
 use sqlx::PgPool;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
@@ -30,9 +30,9 @@ pub async fn export(
     let user_id = user.id.into();
 
     let collection_ids =
-        crate::database::models::User::get_collections(user_id, &**pool)
+        crate::database::models::DBUser::get_collections(user_id, &**pool)
             .await?;
-    let collections = crate::database::models::Collection::get_many(
+    let collections = crate::database::models::DBCollection::get_many(
         &collection_ids,
         &**pool,
         &redis,
@@ -42,24 +42,25 @@ pub async fn export(
     .map(crate::models::collections::Collection::from)
     .collect::<Vec<_>>();
 
-    let follows = crate::database::models::User::get_follows(user_id, &**pool)
-        .await?
-        .into_iter()
-        .map(crate::models::ids::ProjectId::from)
-        .collect::<Vec<_>>();
+    let follows =
+        crate::database::models::DBUser::get_follows(user_id, &**pool)
+            .await?
+            .into_iter()
+            .map(crate::models::ids::ProjectId::from)
+            .collect::<Vec<_>>();
 
     let projects =
-        crate::database::models::User::get_projects(user_id, &**pool, &redis)
+        crate::database::models::DBUser::get_projects(user_id, &**pool, &redis)
             .await?
             .into_iter()
             .map(crate::models::ids::ProjectId::from)
             .collect::<Vec<_>>();
 
     let org_ids =
-        crate::database::models::User::get_organizations(user_id, &**pool)
+        crate::database::models::DBUser::get_organizations(user_id, &**pool)
             .await?;
     let orgs =
-        crate::database::models::organization_item::Organization::get_many_ids(
+        crate::database::models::organization_item::DBOrganization::get_many_ids(
             &org_ids, &**pool, &redis,
         )
         .await?
@@ -68,7 +69,7 @@ pub async fn export(
         .map(|x| crate::models::organizations::Organization::from(x, vec![]))
         .collect::<Vec<_>>();
 
-    let notifs = crate::database::models::notification_item::Notification::get_many_user(
+    let notifs = crate::database::models::notification_item::DBNotification::get_many_user(
         user_id, &**pool, &redis,
     )
     .await?
@@ -77,7 +78,7 @@ pub async fn export(
     .collect::<Vec<_>>();
 
     let oauth_clients =
-        crate::database::models::oauth_client_item::OAuthClient::get_all_user_clients(
+        crate::database::models::oauth_client_item::DBOAuthClient::get_all_user_clients(
             user_id, &**pool,
         )
         .await?
@@ -85,7 +86,7 @@ pub async fn export(
         .map(crate::models::oauth_clients::OAuthClient::from)
         .collect::<Vec<_>>();
 
-    let oauth_authorizations = crate::database::models::oauth_client_authorization_item::OAuthClientAuthorization::get_all_for_user(
+    let oauth_authorizations = crate::database::models::oauth_client_authorization_item::DBOAuthClientAuthorization::get_all_for_user(
         user_id, &**pool,
     )
         .await?
@@ -94,12 +95,12 @@ pub async fn export(
         .collect::<Vec<_>>();
 
     let pat_ids =
-        crate::database::models::pat_item::PersonalAccessToken::get_user_pats(
+        crate::database::models::pat_item::DBPersonalAccessToken::get_user_pats(
             user_id, &**pool, &redis,
         )
         .await?;
     let pats =
-        crate::database::models::pat_item::PersonalAccessToken::get_many_ids(
+        crate::database::models::pat_item::DBPersonalAccessToken::get_many_ids(
             &pat_ids, &**pool, &redis,
         )
         .await?
@@ -108,12 +109,12 @@ pub async fn export(
         .collect::<Vec<_>>();
 
     let payout_ids =
-        crate::database::models::payout_item::Payout::get_all_for_user(
+        crate::database::models::payout_item::DBPayout::get_all_for_user(
             user_id, &**pool,
         )
         .await?;
 
-    let payouts = crate::database::models::payout_item::Payout::get_many(
+    let payouts = crate::database::models::payout_item::DBPayout::get_many(
         &payout_ids,
         &**pool,
     )
@@ -122,10 +123,11 @@ pub async fn export(
     .map(crate::models::payouts::Payout::from)
     .collect::<Vec<_>>();
 
-    let report_ids =
-        crate::database::models::user_item::User::get_reports(user_id, &**pool)
-            .await?;
-    let reports = crate::database::models::report_item::Report::get_many(
+    let report_ids = crate::database::models::user_item::DBUser::get_reports(
+        user_id, &**pool,
+    )
+    .await?;
+    let reports = crate::database::models::report_item::DBReport::get_many(
         &report_ids,
         &**pool,
     )
@@ -143,11 +145,11 @@ pub async fn export(
     .fetch_all(pool.as_ref())
     .await?
     .into_iter()
-    .map(|x| crate::database::models::ids::ThreadMessageId(x.id))
+    .map(|x| crate::database::models::ids::DBThreadMessageId(x.id))
     .collect::<Vec<_>>();
 
     let messages =
-        crate::database::models::thread_item::ThreadMessage::get_many(
+        crate::database::models::thread_item::DBThreadMessage::get_many(
             &message_ids,
             &**pool,
         )
@@ -163,21 +165,22 @@ pub async fn export(
     .fetch_all(pool.as_ref())
     .await?
     .into_iter()
-    .map(|x| crate::database::models::ids::ImageId(x.id))
+    .map(|x| crate::database::models::ids::DBImageId(x.id))
     .collect::<Vec<_>>();
 
-    let uploaded_images = crate::database::models::image_item::Image::get_many(
-        &uploaded_images_ids,
-        &**pool,
-        &redis,
-    )
-    .await?
-    .into_iter()
-    .map(crate::models::images::Image::from)
-    .collect::<Vec<_>>();
+    let uploaded_images =
+        crate::database::models::image_item::DBImage::get_many(
+            &uploaded_images_ids,
+            &**pool,
+            &redis,
+        )
+        .await?
+        .into_iter()
+        .map(crate::models::images::Image::from)
+        .collect::<Vec<_>>();
 
     let subscriptions =
-        crate::database::models::user_subscription_item::UserSubscriptionItem::get_all_user(
+        crate::database::models::user_subscription_item::DBUserSubscription::get_all_user(
             user_id, &**pool,
         )
         .await?
diff --git a/apps/labrinth/src/routes/internal/mod.rs b/apps/labrinth/src/routes/internal/mod.rs
index 7e61fe79..a658a9c7 100644
--- a/apps/labrinth/src/routes/internal/mod.rs
+++ b/apps/labrinth/src/routes/internal/mod.rs
@@ -8,8 +8,8 @@ pub mod session;
 
 pub mod statuses;
 
-use super::v3::oauth_clients;
 pub use super::ApiError;
+use super::v3::oauth_clients;
 use crate::util::cors::default_cors;
 
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
diff --git a/apps/labrinth/src/routes/internal/moderation.rs b/apps/labrinth/src/routes/internal/moderation.rs
index 06654100..e889f873 100644
--- a/apps/labrinth/src/routes/internal/moderation.rs
+++ b/apps/labrinth/src/routes/internal/moderation.rs
@@ -5,7 +5,7 @@ use crate::models::projects::ProjectStatus;
 use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata};
 use crate::queue::session::AuthQueue;
 use crate::{auth::check_is_moderator_from_headers, models::pats::Scopes};
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use ariadne::ids::random_base62;
 use serde::Deserialize;
 use sqlx::PgPool;
@@ -56,12 +56,12 @@ pub async fn get_projects(
         count.count as i64
     )
     .fetch(&**pool)
-    .map_ok(|m| database::models::ProjectId(m.id))
-    .try_collect::<Vec<database::models::ProjectId>>()
+    .map_ok(|m| database::models::DBProjectId(m.id))
+    .try_collect::<Vec<database::models::DBProjectId>>()
     .await?;
 
     let projects: Vec<_> =
-        database::Project::get_many_ids(&project_ids, &**pool, &redis)
+        database::DBProject::get_many_ids(&project_ids, &**pool, &redis)
             .await?
             .into_iter()
             .map(crate::models::projects::Project::from)
@@ -88,7 +88,7 @@ pub async fn get_project_meta(
 
     let project_id = info.into_inner().0;
     let project =
-        database::models::Project::get(&project_id, &**pool, &redis).await?;
+        database::models::DBProject::get(&project_id, &**pool, &redis).await?;
 
     if let Some(project) = project {
         let rows = sqlx::query!(
diff --git a/apps/labrinth/src/routes/internal/pats.rs b/apps/labrinth/src/routes/internal/pats.rs
index 818d1ca8..aa111682 100644
--- a/apps/labrinth/src/routes/internal/pats.rs
+++ b/apps/labrinth/src/routes/internal/pats.rs
@@ -6,12 +6,12 @@ use crate::routes::ApiError;
 
 use crate::database::redis::RedisPool;
 use actix_web::web::{self, Data};
-use actix_web::{delete, get, patch, post, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post};
 use chrono::{DateTime, Utc};
-use rand::distributions::Alphanumeric;
 use rand::Rng;
-use rand_chacha::rand_core::SeedableRng;
+use rand::distributions::Alphanumeric;
 use rand_chacha::ChaCha20Rng;
+use rand_chacha::rand_core::SeedableRng;
 
 use crate::models::pats::{PersonalAccessToken, Scopes};
 use crate::queue::session::AuthQueue;
@@ -45,13 +45,13 @@ pub async fn get_pats(
     .1;
 
     let pat_ids =
-        database::models::pat_item::PersonalAccessToken::get_user_pats(
+        database::models::pat_item::DBPersonalAccessToken::get_user_pats(
             user.id.into(),
             &**pool,
             &redis,
         )
         .await?;
-    let pats = database::models::pat_item::PersonalAccessToken::get_many_ids(
+    let pats = database::models::pat_item::DBPersonalAccessToken::get_many_ids(
         &pat_ids, &**pool, &redis,
     )
     .await?;
@@ -113,10 +113,10 @@ pub async fn create_pat(
         .take(60)
         .map(char::from)
         .collect::<String>();
-    let token = format!("mrp_{}", token);
+    let token = format!("mrp_{token}");
 
     let name = info.name.clone();
-    database::models::pat_item::PersonalAccessToken {
+    database::models::pat_item::DBPersonalAccessToken {
         id,
         name: name.clone(),
         access_token: token.clone(),
@@ -130,7 +130,7 @@ pub async fn create_pat(
     .await?;
 
     transaction.commit().await?;
-    database::models::pat_item::PersonalAccessToken::clear_cache(
+    database::models::pat_item::DBPersonalAccessToken::clear_cache(
         vec![(None, None, Some(user.id.into()))],
         &redis,
     )
@@ -180,7 +180,7 @@ pub async fn edit_pat(
     .1;
 
     let id = id.into_inner().0;
-    let pat = database::models::pat_item::PersonalAccessToken::get(
+    let pat = database::models::pat_item::DBPersonalAccessToken::get(
         &id, &**pool, &redis,
     )
     .await?;
@@ -242,7 +242,7 @@ pub async fn edit_pat(
             }
 
             transaction.commit().await?;
-            database::models::pat_item::PersonalAccessToken::clear_cache(
+            database::models::pat_item::DBPersonalAccessToken::clear_cache(
                 vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
                 &redis,
             )
@@ -271,7 +271,7 @@ pub async fn delete_pat(
     .await?
     .1;
     let id = id.into_inner().0;
-    let pat = database::models::pat_item::PersonalAccessToken::get(
+    let pat = database::models::pat_item::DBPersonalAccessToken::get(
         &id, &**pool, &redis,
     )
     .await?;
@@ -279,13 +279,13 @@ pub async fn delete_pat(
     if let Some(pat) = pat {
         if pat.user_id == user.id.into() {
             let mut transaction = pool.begin().await?;
-            database::models::pat_item::PersonalAccessToken::remove(
+            database::models::pat_item::DBPersonalAccessToken::remove(
                 pat.id,
                 &mut transaction,
             )
             .await?;
             transaction.commit().await?;
-            database::models::pat_item::PersonalAccessToken::clear_cache(
+            database::models::pat_item::DBPersonalAccessToken::clear_cache(
                 vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
                 &redis,
             )
diff --git a/apps/labrinth/src/routes/internal/session.rs b/apps/labrinth/src/routes/internal/session.rs
index b7f638fa..a647206e 100644
--- a/apps/labrinth/src/routes/internal/session.rs
+++ b/apps/labrinth/src/routes/internal/session.rs
@@ -1,7 +1,7 @@
-use crate::auth::{get_user_from_headers, AuthenticationError};
-use crate::database::models::session_item::Session as DBSession;
+use crate::auth::{AuthenticationError, get_user_from_headers};
+use crate::database::models::DBUserId;
+use crate::database::models::session_item::DBSession;
 use crate::database::models::session_item::SessionBuilder;
-use crate::database::models::UserId;
 use crate::database::redis::RedisPool;
 use crate::models::pats::Scopes;
 use crate::models::sessions::Session;
@@ -9,8 +9,8 @@ use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::env::parse_var;
 use actix_web::http::header::AUTHORIZATION;
-use actix_web::web::{scope, Data, ServiceConfig};
-use actix_web::{delete, get, post, web, HttpRequest, HttpResponse};
+use actix_web::web::{Data, ServiceConfig, scope};
+use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use chrono::Utc;
 use rand::distributions::Alphanumeric;
 use rand::{Rng, SeedableRng};
@@ -85,7 +85,7 @@ pub async fn get_session_metadata(
 
 pub async fn issue_session(
     req: HttpRequest,
-    user_id: UserId,
+    user_id: DBUserId,
     transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     redis: &RedisPool,
 ) -> Result<DBSession, AuthenticationError> {
diff --git a/apps/labrinth/src/routes/internal/statuses.rs b/apps/labrinth/src/routes/internal/statuses.rs
index 800bf681..0f4efae4 100644
--- a/apps/labrinth/src/routes/internal/statuses.rs
+++ b/apps/labrinth/src/routes/internal/statuses.rs
@@ -1,6 +1,6 @@
-use crate::auth::validate::get_user_record_from_bearer_token;
 use crate::auth::AuthenticationError;
-use crate::database::models::friend_item::FriendItem;
+use crate::auth::validate::get_user_record_from_bearer_token;
+use crate::database::models::friend_item::DBFriend;
 use crate::database::redis::RedisPool;
 use crate::models::pats::Scopes;
 use crate::models::users::User;
@@ -9,12 +9,12 @@ use crate::queue::socket::{
     ActiveSocket, ActiveSockets, SocketId, TunnelSocketType,
 };
 use crate::routes::ApiError;
-use crate::sync::friends::{RedisFriendsMessage, FRIENDS_CHANNEL_NAME};
+use crate::sync::friends::{FRIENDS_CHANNEL_NAME, RedisFriendsMessage};
 use crate::sync::status::{
     get_user_status, push_back_user_expiry, replace_user_status,
 };
 use actix_web::web::{Data, Payload};
-use actix_web::{get, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, get, web};
 use actix_ws::Message;
 use ariadne::ids::UserId;
 use ariadne::networking::message::{
@@ -31,7 +31,7 @@ use sqlx::PgPool;
 use std::pin::pin;
 use std::sync::atomic::Ordering;
 use tokio::sync::oneshot::error::TryRecvError;
-use tokio::time::{sleep, Duration};
+use tokio::time::{Duration, sleep};
 
 pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.service(ws_init);
@@ -85,14 +85,12 @@ pub async fn ws_init(
     };
 
     let friends =
-        FriendItem::get_user_friends(user.id.into(), Some(true), &**pool)
-            .await?;
+        DBFriend::get_user_friends(user.id.into(), Some(true), &**pool).await?;
 
     let friend_statuses = if !friends.is_empty() {
         let db = db.clone();
         let redis = redis.clone();
-
-        let statuses = tokio_stream::iter(friends.iter())
+        tokio_stream::iter(friends.iter())
             .map(|x| {
                 let db = db.clone();
                 let redis = redis.clone();
@@ -112,9 +110,10 @@ pub async fn ws_init(
             })
             .buffer_unordered(16)
             .collect::<Vec<_>>()
-            .await;
-
-        statuses.into_iter().flatten().collect()
+            .await
+            .into_iter()
+            .flatten()
+            .collect()
     } else {
         Vec::new()
     };
@@ -383,7 +382,7 @@ pub async fn broadcast_to_local_friends(
         user_id,
         message,
         sockets,
-        FriendItem::get_user_friends(user_id.into(), Some(true), pool).await?,
+        DBFriend::get_user_friends(user_id.into(), Some(true), pool).await?,
     )
     .await
 }
@@ -392,7 +391,7 @@ async fn broadcast_to_known_local_friends(
     user_id: UserId,
     message: ServerToClientMessage,
     sockets: &ActiveSockets,
-    friends: Vec<FriendItem>,
+    friends: Vec<DBFriend>,
 ) -> Result<(), crate::database::models::DatabaseError> {
     // FIXME Probably shouldn't be using database errors for this. Maybe ApiError?
 
diff --git a/apps/labrinth/src/routes/maven.rs b/apps/labrinth/src/routes/maven.rs
index bf024784..db209410 100644
--- a/apps/labrinth/src/routes/maven.rs
+++ b/apps/labrinth/src/routes/maven.rs
@@ -1,18 +1,20 @@
 use crate::auth::checks::{is_visible_project, is_visible_version};
 use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
 use crate::database::models::loader_fields::Loader;
-use crate::database::models::project_item::QueryProject;
-use crate::database::models::version_item::{QueryFile, QueryVersion};
+use crate::database::models::project_item::ProjectQueryResult;
+use crate::database::models::version_item::{
+    FileQueryResult, VersionQueryResult,
+};
 use crate::database::redis::RedisPool;
+use crate::models::ids::{ProjectId, VersionId};
 use crate::models::pats::Scopes;
-use crate::models::projects::{ProjectId, VersionId};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::{auth::get_user_from_headers, database};
-use actix_web::{get, route, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, get, route, web};
 use sqlx::PgPool;
 use std::collections::HashSet;
-use yaserde_derive::YaSerialize;
+use yaserde::YaSerialize;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.service(maven_metadata);
@@ -76,7 +78,7 @@ pub async fn maven_metadata(
 ) -> Result<HttpResponse, ApiError> {
     let project_id = params.into_inner().0;
     let Some(project) =
-        database::models::Project::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis).await?
     else {
         return Err(ApiError::NotFound);
     };
@@ -103,7 +105,7 @@ pub async fn maven_metadata(
         WHERE mod_id = $1 AND status = ANY($2)
         ORDER BY ordering ASC NULLS LAST, date_published ASC
         ",
-        project.inner.id as database::models::ids::ProjectId,
+        project.inner.id as database::models::ids::DBProjectId,
         &*crate::models::projects::VersionStatus::iterator()
             .filter(|x| x.is_listed())
             .map(|x| x.to_string())
@@ -159,17 +161,17 @@ pub async fn maven_metadata(
 }
 
 async fn find_version(
-    project: &QueryProject,
+    project: &ProjectQueryResult,
     vcoords: &String,
     pool: &PgPool,
     redis: &RedisPool,
-) -> Result<Option<QueryVersion>, ApiError> {
+) -> Result<Option<VersionQueryResult>, ApiError> {
     let id_option = ariadne::ids::base62_impl::parse_base62(vcoords)
         .ok()
         .map(|x| x as i64);
 
     let all_versions =
-        database::models::Version::get_many(&project.versions, pool, redis)
+        database::models::DBVersion::get_many(&project.versions, pool, redis)
             .await?;
 
     let exact_matches = all_versions
@@ -236,9 +238,9 @@ async fn find_version(
 fn find_file<'a>(
     project_id: &str,
     vcoords: &str,
-    version: &'a QueryVersion,
+    version: &'a VersionQueryResult,
     file: &str,
-) -> Option<&'a QueryFile> {
+) -> Option<&'a FileQueryResult> {
     if let Some(selected_file) =
         version.files.iter().find(|x| x.filename == file)
     {
@@ -282,7 +284,7 @@ pub async fn version_file(
 ) -> Result<HttpResponse, ApiError> {
     let (project_id, vnum, file) = params.into_inner();
     let Some(project) =
-        database::models::Project::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis).await?
     else {
         return Err(ApiError::NotFound);
     };
@@ -348,7 +350,7 @@ pub async fn version_file_sha1(
 ) -> Result<HttpResponse, ApiError> {
     let (project_id, vnum, file) = params.into_inner();
     let Some(project) =
-        database::models::Project::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis).await?
     else {
         return Err(ApiError::NotFound);
     };
@@ -393,7 +395,7 @@ pub async fn version_file_sha512(
 ) -> Result<HttpResponse, ApiError> {
     let (project_id, vnum, file) = params.into_inner();
     let Some(project) =
-        database::models::Project::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis).await?
     else {
         return Err(ApiError::NotFound);
     };
diff --git a/apps/labrinth/src/routes/mod.rs b/apps/labrinth/src/routes/mod.rs
index 131bddab..caa143f2 100644
--- a/apps/labrinth/src/routes/mod.rs
+++ b/apps/labrinth/src/routes/mod.rs
@@ -5,14 +5,14 @@ use crate::util::env::parse_strings_from_var;
 use actix_cors::Cors;
 use actix_files::Files;
 use actix_web::http::StatusCode;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 use futures::FutureExt;
 
 pub mod internal;
 pub mod v2;
 pub mod v3;
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(target_os = "linux")]
 pub mod debug;
 
 pub mod v2_reroute;
@@ -127,8 +127,6 @@ pub enum ApiError {
     ImageParse(#[from] image::ImageError),
     #[error("Password Hashing Error: {0}")]
     PasswordHashing(#[from] argon2::password_hash::Error),
-    #[error("Password strength checking error: {0}")]
-    PasswordStrengthCheck(#[from] zxcvbn::ZxcvbnError),
     #[error("{0}")]
     Mail(#[from] crate::auth::email::MailError),
     #[error("Error while rerouting request: {0}")]
@@ -139,7 +137,9 @@ pub enum ApiError {
     Io(#[from] std::io::Error),
     #[error("Resource not found")]
     NotFound,
-    #[error("You are being rate-limited. Please wait {0} milliseconds. 0/{1} remaining.")]
+    #[error(
+        "You are being rate-limited. Please wait {0} milliseconds. 0/{1} remaining."
+    )]
     RateLimitError(u128, u32),
     #[error("Error while interacting with payment processor: {0}")]
     Stripe(#[from] stripe::StripeError),
@@ -168,7 +168,6 @@ impl ApiError {
                 ApiError::Decoding(..) => "decoding_error",
                 ApiError::ImageParse(..) => "invalid_image",
                 ApiError::PasswordHashing(..) => "password_hashing_error",
-                ApiError::PasswordStrengthCheck(..) => "strength_check_error",
                 ApiError::Mail(..) => "mail_error",
                 ApiError::Clickhouse(..) => "clickhouse_error",
                 ApiError::Reroute(..) => "reroute_error",
@@ -206,7 +205,6 @@ impl actix_web::ResponseError for ApiError {
             ApiError::Decoding(..) => StatusCode::BAD_REQUEST,
             ApiError::ImageParse(..) => StatusCode::BAD_REQUEST,
             ApiError::PasswordHashing(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            ApiError::PasswordStrengthCheck(..) => StatusCode::BAD_REQUEST,
             ApiError::Mail(..) => StatusCode::INTERNAL_SERVER_ERROR,
             ApiError::Reroute(..) => StatusCode::INTERNAL_SERVER_ERROR,
             ApiError::NotFound => StatusCode::NOT_FOUND,
diff --git a/apps/labrinth/src/routes/updates.rs b/apps/labrinth/src/routes/updates.rs
index 64ee7b21..05d9b240 100644
--- a/apps/labrinth/src/routes/updates.rs
+++ b/apps/labrinth/src/routes/updates.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use actix_web::{get, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, get, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 
@@ -42,7 +42,7 @@ pub async fn forge_updates(
 
     let (id,) = info.into_inner();
 
-    let project = database::models::Project::get(&id, &**pool, &redis)
+    let project = database::models::DBProject::get(&id, &**pool, &redis)
         .await?
         .ok_or_else(|| ApiError::InvalidInput(ERROR.to_string()))?;
 
@@ -61,9 +61,12 @@ pub async fn forge_updates(
         return Err(ApiError::InvalidInput(ERROR.to_string()));
     }
 
-    let versions =
-        database::models::Version::get_many(&project.versions, &**pool, &redis)
-            .await?;
+    let versions = database::models::DBVersion::get_many(
+        &project.versions,
+        &**pool,
+        &redis,
+    )
+    .await?;
 
     let loaders = match &*neo.neoforge {
         "only" => |x: &String| *x == "neoforge",
@@ -116,7 +119,7 @@ pub async fn forge_updates(
             for game_version in &game_versions {
                 response
                     .promos
-                    .entry(format!("{}-recommended", game_version))
+                    .entry(format!("{game_version}-recommended"))
                     .or_insert_with(|| version.version_number.clone());
             }
         }
@@ -124,7 +127,7 @@ pub async fn forge_updates(
         for game_version in &game_versions {
             response
                 .promos
-                .entry(format!("{}-latest", game_version))
+                .entry(format!("{game_version}-latest"))
                 .or_insert_with(|| version.version_number.clone());
         }
     }
diff --git a/apps/labrinth/src/routes/v2/moderation.rs b/apps/labrinth/src/routes/v2/moderation.rs
index e961da24..7b5240c1 100644
--- a/apps/labrinth/src/routes/v2/moderation.rs
+++ b/apps/labrinth/src/routes/v2/moderation.rs
@@ -4,7 +4,7 @@ use crate::models::v2::projects::LegacyProject;
 use crate::queue::session::AuthQueue;
 use crate::routes::internal;
 use crate::{database::redis::RedisPool, routes::v2_reroute};
-use actix_web::{get, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, get, web};
 use serde::Deserialize;
 use sqlx::PgPool;
 
diff --git a/apps/labrinth/src/routes/v2/notifications.rs b/apps/labrinth/src/routes/v2/notifications.rs
index 85810d61..4cce65b4 100644
--- a/apps/labrinth/src/routes/v2/notifications.rs
+++ b/apps/labrinth/src/routes/v2/notifications.rs
@@ -3,10 +3,10 @@ use crate::models::ids::NotificationId;
 use crate::models::notifications::Notification;
 use crate::models::v2::notifications::LegacyNotification;
 use crate::queue::session::AuthQueue;
+use crate::routes::ApiError;
 use crate::routes::v2_reroute;
 use crate::routes::v3;
-use crate::routes::ApiError;
-use actix_web::{delete, get, patch, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 
diff --git a/apps/labrinth/src/routes/v2/project_creation.rs b/apps/labrinth/src/routes/v2/project_creation.rs
index decc71a3..540b3a6e 100644
--- a/apps/labrinth/src/routes/v2/project_creation.rs
+++ b/apps/labrinth/src/routes/v2/project_creation.rs
@@ -13,7 +13,7 @@ use crate::routes::v3::project_creation::{CreateError, NewGalleryItem};
 use crate::routes::{v2_reroute, v3};
 use actix_multipart::Multipart;
 use actix_web::web::Data;
-use actix_web::{post, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, post};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sqlx::postgres::PgPool;
@@ -47,7 +47,7 @@ struct ProjectCreateData {
     pub project_type: String,
     #[validate(
         length(min = 3, max = 64),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     #[serde(alias = "mod_slug")]
     /// The slug of a project, used for vanity URLs
@@ -66,8 +66,7 @@ struct ProjectCreateData {
     /// The support range for the server project
     pub server_side: LegacySideType,
 
-    #[validate(length(max = 32))]
-    #[validate]
+    #[validate(nested, length(max = 32))]
     /// A list of initial versions to upload with the created project
     pub initial_versions: Vec<InitialVersionData>,
     #[validate(length(max = 3))]
@@ -109,7 +108,7 @@ struct ProjectCreateData {
     /// An optional link to the project's discord.
     pub discord_url: Option<String>,
     /// An optional list of all donation links the project has\
-    #[validate]
+    #[validate(nested)]
     pub donation_urls: Option<Vec<DonationLink>>,
 
     /// An optional boolean. If true, the project will be created as a draft.
@@ -118,8 +117,7 @@ struct ProjectCreateData {
     /// The license id that the project follows
     pub license_id: String,
 
-    #[validate(length(max = 64))]
-    #[validate]
+    #[validate(nested, length(max = 64))]
     /// The multipart names of the gallery items to upload
     pub gallery_items: Option<Vec<NewGalleryItem>>,
     #[serde(default = "default_requested_status")]
@@ -260,8 +258,12 @@ pub async fn project_create(
         Ok(project) => {
             let version_item = match project.versions.first() {
                 Some(vid) => {
-                    version_item::Version::get((*vid).into(), &**client, &redis)
-                        .await?
+                    version_item::DBVersion::get(
+                        (*vid).into(),
+                        &**client,
+                        &redis,
+                    )
+                    .await?
                 }
                 None => None,
             };
diff --git a/apps/labrinth/src/routes/v2/projects.rs b/apps/labrinth/src/routes/v2/projects.rs
index c7b128ef..4915b3ad 100644
--- a/apps/labrinth/src/routes/v2/projects.rs
+++ b/apps/labrinth/src/routes/v2/projects.rs
@@ -12,9 +12,9 @@ use crate::models::v2::search::LegacySearchResults;
 use crate::queue::moderation::AutomatedModerationQueue;
 use crate::queue::session::AuthQueue;
 use crate::routes::v3::projects::ProjectIds;
-use crate::routes::{v2_reroute, v3, ApiError};
-use crate::search::{search_for_project, SearchConfig, SearchError};
-use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
+use crate::routes::{ApiError, v2_reroute, v3};
+use crate::search::{SearchConfig, SearchError, search_for_project};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use std::collections::HashMap;
@@ -229,7 +229,7 @@ pub async fn project_get(
         Ok(project) => {
             let version_item = match project.versions.first() {
                 Some(vid) => {
-                    version_item::Version::get((*vid).into(), &**pool, &redis)
+                    version_item::DBVersion::get((*vid).into(), &**pool, &redis)
                         .await?
                 }
                 None => None,
@@ -371,14 +371,14 @@ pub struct EditProject {
         length(max = 2048)
     )]
     pub discord_url: Option<Option<String>>,
-    #[validate]
+    #[validate(nested)]
     pub donation_urls: Option<Vec<DonationLink>>,
     pub license_id: Option<String>,
     pub client_side: Option<LegacySideType>,
     pub server_side: Option<LegacySideType>,
     #[validate(
         length(min = 3, max = 64),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub slug: Option<String>,
     pub status: Option<ProjectStatus>,
@@ -469,7 +469,7 @@ pub async fn project_edit(
     if let Some(donation_urls) = v2_new_project.donation_urls {
         // Fetch current donation links from project so we know what to delete
         let fetched_example_project =
-            project_item::Project::get(&info.0, &**pool, &redis).await?;
+            project_item::DBProject::get(&info.0, &**pool, &redis).await?;
         let donation_links = fetched_example_project
             .map(|x| {
                 x.urls
@@ -533,7 +533,7 @@ pub async fn project_edit(
     if response.status().is_success()
         && (client_side.is_some() || server_side.is_some())
     {
-        let project_item = project_item::Project::get(
+        let project_item = project_item::DBProject::get(
             &new_slug.unwrap_or(project_id),
             &**pool,
             &redis,
@@ -541,7 +541,7 @@ pub async fn project_edit(
         .await?;
         let version_ids = project_item.map(|x| x.versions).unwrap_or_default();
         let versions =
-            version_item::Version::get_many(&version_ids, &**pool, &redis)
+            version_item::DBVersion::get_many(&version_ids, &**pool, &redis)
                 .await?;
         for version in versions {
             let version = Version::from(version);
@@ -586,11 +586,11 @@ pub struct BulkEditProject {
     pub add_additional_categories: Option<Vec<String>>,
     pub remove_additional_categories: Option<Vec<String>>,
 
-    #[validate]
+    #[validate(nested)]
     pub donation_urls: Option<Vec<DonationLink>>,
-    #[validate]
+    #[validate(nested)]
     pub add_donation_urls: Option<Vec<DonationLink>>,
-    #[validate]
+    #[validate(nested)]
     pub remove_donation_urls: Option<Vec<DonationLink>>,
 
     #[serde(
diff --git a/apps/labrinth/src/routes/v2/reports.rs b/apps/labrinth/src/routes/v2/reports.rs
index 35173102..2f09ed3c 100644
--- a/apps/labrinth/src/routes/v2/reports.rs
+++ b/apps/labrinth/src/routes/v2/reports.rs
@@ -2,8 +2,8 @@ use crate::database::redis::RedisPool;
 use crate::models::reports::Report;
 use crate::models::v2::reports::LegacyReport;
 use crate::queue::session::AuthQueue;
-use crate::routes::{v2_reroute, v3, ApiError};
-use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
+use crate::routes::{ApiError, v2_reroute, v3};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use serde::Deserialize;
 use sqlx::PgPool;
 use validator::Validate;
@@ -126,7 +126,7 @@ pub async fn report_get(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
-    info: web::Path<(crate::models::reports::ReportId,)>,
+    info: web::Path<(crate::models::ids::ReportId,)>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let response =
@@ -156,7 +156,7 @@ pub async fn report_edit(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
-    info: web::Path<(crate::models::reports::ReportId,)>,
+    info: web::Path<(crate::models::ids::ReportId,)>,
     session_queue: web::Data<AuthQueue>,
     edit_report: web::Json<EditReport>,
 ) -> Result<HttpResponse, ApiError> {
@@ -181,7 +181,7 @@ pub async fn report_edit(
 pub async fn report_delete(
     req: HttpRequest,
     pool: web::Data<PgPool>,
-    info: web::Path<(crate::models::reports::ReportId,)>,
+    info: web::Path<(crate::models::ids::ReportId,)>,
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
diff --git a/apps/labrinth/src/routes/v2/statistics.rs b/apps/labrinth/src/routes/v2/statistics.rs
index bd98da12..78bb9d62 100644
--- a/apps/labrinth/src/routes/v2/statistics.rs
+++ b/apps/labrinth/src/routes/v2/statistics.rs
@@ -1,9 +1,8 @@
 use crate::routes::{
-    v2_reroute,
+    ApiError, v2_reroute,
     v3::{self, statistics::V3Stats},
-    ApiError,
 };
-use actix_web::{get, web, HttpResponse};
+use actix_web::{HttpResponse, get, web};
 use sqlx::PgPool;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
diff --git a/apps/labrinth/src/routes/v2/tags.rs b/apps/labrinth/src/routes/v2/tags.rs
index 3233e9ae..1a9ae9a3 100644
--- a/apps/labrinth/src/routes/v2/tags.rs
+++ b/apps/labrinth/src/routes/v2/tags.rs
@@ -7,7 +7,7 @@ use crate::models::v2::projects::LegacySideType;
 use crate::routes::v2_reroute::capitalize_first;
 use crate::routes::v3::tags::{LinkPlatformQueryData, LoaderFieldsEnumQuery};
 use crate::routes::{v2_reroute, v3};
-use actix_web::{get, web, HttpResponse};
+use actix_web::{HttpResponse, get, web};
 use chrono::{DateTime, Utc};
 use itertools::Itertools;
 use sqlx::PgPool;
diff --git a/apps/labrinth/src/routes/v2/teams.rs b/apps/labrinth/src/routes/v2/teams.rs
index 444ff13e..36d924ab 100644
--- a/apps/labrinth/src/routes/v2/teams.rs
+++ b/apps/labrinth/src/routes/v2/teams.rs
@@ -1,12 +1,13 @@
 use crate::database::redis::RedisPool;
+use crate::models::ids::TeamId;
 use crate::models::teams::{
-    OrganizationPermissions, ProjectPermissions, TeamId, TeamMember,
+    OrganizationPermissions, ProjectPermissions, TeamMember,
 };
-use crate::models::users::UserId;
 use crate::models::v2::teams::LegacyTeamMember;
 use crate::queue::session::AuthQueue;
-use crate::routes::{v2_reroute, v3, ApiError};
-use actix_web::{delete, get, patch, post, web, HttpRequest, HttpResponse};
+use crate::routes::{ApiError, v2_reroute, v3};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
+use ariadne::ids::UserId;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
diff --git a/apps/labrinth/src/routes/v2/threads.rs b/apps/labrinth/src/routes/v2/threads.rs
index ab5e781a..164de21a 100644
--- a/apps/labrinth/src/routes/v2/threads.rs
+++ b/apps/labrinth/src/routes/v2/threads.rs
@@ -2,12 +2,12 @@ use std::sync::Arc;
 
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
-use crate::models::ids::ThreadMessageId;
-use crate::models::threads::{MessageBody, Thread, ThreadId};
+use crate::models::ids::{ThreadId, ThreadMessageId};
+use crate::models::threads::{MessageBody, Thread};
 use crate::models::v2::threads::LegacyThread;
 use crate::queue::session::AuthQueue;
-use crate::routes::{v2_reroute, v3, ApiError};
-use actix_web::{delete, get, post, web, HttpRequest, HttpResponse};
+use crate::routes::{ApiError, v2_reroute, v3};
+use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use serde::Deserialize;
 use sqlx::PgPool;
 
diff --git a/apps/labrinth/src/routes/v2/users.rs b/apps/labrinth/src/routes/v2/users.rs
index 0fcc4b62..952717ee 100644
--- a/apps/labrinth/src/routes/v2/users.rs
+++ b/apps/labrinth/src/routes/v2/users.rs
@@ -7,10 +7,8 @@ use crate::models::v2::notifications::LegacyNotification;
 use crate::models::v2::projects::LegacyProject;
 use crate::models::v2::user::LegacyUser;
 use crate::queue::session::AuthQueue;
-use crate::routes::{v2_reroute, v3, ApiError};
-use actix_web::{delete, get, patch, web, HttpRequest, HttpResponse};
-use lazy_static::lazy_static;
-use regex::Regex;
+use crate::routes::{ApiError, v2_reroute, v3};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use std::sync::Arc;
@@ -135,20 +133,16 @@ pub async fn projects_list(
     }
 }
 
-lazy_static! {
-    static ref RE_URL_SAFE: Regex = Regex::new(r"^[a-zA-Z0-9_-]*$").unwrap();
-}
-
 #[derive(Serialize, Deserialize, Validate)]
 pub struct EditUser {
-    #[validate(length(min = 1, max = 39), regex = "RE_URL_SAFE")]
+    #[validate(length(min = 1, max = 39), regex(path = *crate::util::validate::RE_USERNAME))]
     pub username: Option<String>,
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
         with = "::serde_with::rust::double_option"
     )]
-    #[validate(length(min = 1, max = 64), regex = "RE_URL_SAFE")]
+    #[validate(length(min = 1, max = 64), regex(path = *crate::util::validate::RE_USERNAME))]
     pub name: Option<Option<String>>,
     #[serde(
         default,
diff --git a/apps/labrinth/src/routes/v2/version_creation.rs b/apps/labrinth/src/routes/v2/version_creation.rs
index c86b2eb1..093f1736 100644
--- a/apps/labrinth/src/routes/v2/version_creation.rs
+++ b/apps/labrinth/src/routes/v2/version_creation.rs
@@ -2,10 +2,9 @@ use crate::database::models::loader_fields::VersionField;
 use crate::database::models::{project_item, version_item};
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
-use crate::models::ids::ImageId;
+use crate::models::ids::{ImageId, ProjectId, VersionId};
 use crate::models::projects::{
-    Dependency, FileType, Loader, ProjectId, Version, VersionId, VersionStatus,
-    VersionType,
+    Dependency, FileType, Loader, Version, VersionStatus, VersionType,
 };
 use crate::models::v2::projects::LegacyVersion;
 use crate::queue::moderation::AutomatedModerationQueue;
@@ -16,7 +15,7 @@ use crate::routes::{v2_reroute, v3};
 use actix_multipart::Multipart;
 use actix_web::http::header::ContentDisposition;
 use actix_web::web::Data;
-use actix_web::{post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, post, web};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sqlx::postgres::PgPool;
@@ -36,7 +35,7 @@ pub struct InitialVersionData {
     pub file_parts: Vec<String>,
     #[validate(
         length(min = 1, max = 32),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub version_number: String,
     #[validate(
@@ -289,17 +288,20 @@ async fn get_example_version_fields(
         None => return Ok(None),
     };
 
-    let vid =
-        match project_item::Project::get_id(project_id.into(), &**pool, redis)
-            .await?
-            .and_then(|p| p.versions.first().cloned())
-        {
-            Some(vid) => vid,
-            None => 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 example_version =
-        match version_item::Version::get(vid, &**pool, redis).await? {
+        match version_item::DBVersion::get(vid, &**pool, redis).await? {
             Some(version) => version,
             None => return Ok(None),
         };
diff --git a/apps/labrinth/src/routes/v2/version_file.rs b/apps/labrinth/src/routes/v2/version_file.rs
index bb998b66..11d4a50f 100644
--- a/apps/labrinth/src/routes/v2/version_file.rs
+++ b/apps/labrinth/src/routes/v2/version_file.rs
@@ -5,7 +5,7 @@ use crate::models::v2::projects::{LegacyProject, LegacyVersion};
 use crate::queue::session::AuthQueue;
 use crate::routes::v3::version_file::HashQuery;
 use crate::routes::{v2_reroute, v3};
-use actix_web::{delete, get, post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use std::collections::HashMap;
diff --git a/apps/labrinth/src/routes/v2/versions.rs b/apps/labrinth/src/routes/v2/versions.rs
index 4d642542..6e91f8a3 100644
--- a/apps/labrinth/src/routes/v2/versions.rs
+++ b/apps/labrinth/src/routes/v2/versions.rs
@@ -11,7 +11,7 @@ use crate::models::v2::projects::LegacyVersion;
 use crate::queue::session::AuthQueue;
 use crate::routes::{v2_reroute, v3};
 use crate::search::SearchConfig;
-use actix_web::{delete, get, patch, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use validator::Validate;
@@ -219,7 +219,7 @@ pub struct EditVersion {
     pub name: Option<String>,
     #[validate(
         length(min = 1, max = 32),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub version_number: Option<String>,
     #[validate(length(max = 65536))]
diff --git a/apps/labrinth/src/routes/v2_reroute.rs b/apps/labrinth/src/routes/v2_reroute.rs
index fc0fc57e..a73baac4 100644
--- a/apps/labrinth/src/routes/v2_reroute.rs
+++ b/apps/labrinth/src/routes/v2_reroute.rs
@@ -1,18 +1,18 @@
 use std::collections::HashMap;
 
-use super::v3::project_creation::CreateError;
 use super::ApiError;
+use super::v3::project_creation::CreateError;
 use crate::models::v2::projects::LegacySideType;
 use crate::util::actix::{
-    generate_multipart, MultipartSegment, MultipartSegmentData,
+    MultipartSegment, MultipartSegmentData, generate_multipart,
 };
 use actix_multipart::Multipart;
+use actix_web::HttpResponse;
 use actix_web::http::header::{
     ContentDisposition, HeaderMap, TryIntoHeaderPair,
 };
-use actix_web::HttpResponse;
-use futures::{stream, Future, StreamExt};
-use serde_json::{json, Value};
+use futures::{Future, StreamExt, stream};
+use serde_json::{Value, json};
 
 pub async fn extract_ok_json<T>(
     response: HttpResponse,
@@ -73,7 +73,7 @@ where
 
     if let Some(field) = multipart.next().await {
         let mut field = field?;
-        let content_disposition = field.content_disposition().clone();
+        let content_disposition = field.content_disposition().unwrap().clone();
         let field_name = content_disposition.get_name().unwrap_or("");
         let field_filename = content_disposition.get_filename();
         let field_content_type = field.content_type();
@@ -100,7 +100,7 @@ where
 
     while let Some(field) = multipart.next().await {
         let mut field = field?;
-        let content_disposition = field.content_disposition().clone();
+        let content_disposition = field.content_disposition().unwrap().clone();
         let field_name = content_disposition.get_name().unwrap_or("");
         let field_filename = content_disposition.get_filename();
         let field_content_type = field.content_type();
@@ -144,7 +144,7 @@ where
 
     match (
         "Content-Type",
-        format!("multipart/form-data; boundary={}", boundary).as_str(),
+        format!("multipart/form-data; boundary={boundary}").as_str(),
     )
         .try_into_pair()
     {
@@ -153,8 +153,7 @@ where
         }
         Err(err) => {
             CreateError::InvalidInput(format!(
-                "Error inserting test header: {:?}.",
-                err
+                "Error inserting test header: {err:?}."
             ));
         }
     };
diff --git a/apps/labrinth/src/routes/v3/analytics_get.rs b/apps/labrinth/src/routes/v3/analytics_get.rs
index 85a3de60..2696a5a2 100644
--- a/apps/labrinth/src/routes/v3/analytics_get.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get.rs
@@ -11,14 +11,15 @@ use crate::{
     },
     queue::session::AuthQueue,
 };
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use ariadne::ids::base62_impl::to_base62;
 use chrono::{DateTime, Duration, Utc};
 use serde::{Deserialize, Serialize};
-use sqlx::postgres::types::PgInterval;
 use sqlx::PgPool;
+use sqlx::postgres::types::PgInterval;
 use std::collections::HashMap;
 use std::convert::TryInto;
+use std::num::NonZeroU32;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.service(
@@ -48,7 +49,7 @@ pub struct GetData {
     pub start_date: Option<DateTime<Utc>>, // defaults to 2 weeks ago
     pub end_date: Option<DateTime<Utc>>,   // defaults to now
 
-    pub resolution_minutes: Option<u32>, // defaults to 1 day. Ignored in routes that do not aggregate over a resolution (eg: /countries)
+    pub resolution_minutes: Option<NonZeroU32>, // defaults to 1 day. Ignored in routes that do not aggregate over a resolution (eg: /countries)
 }
 
 /// Get playtime data for a set of projects or versions
@@ -94,7 +95,9 @@ pub async fn playtimes_get(
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
-    let resolution_minutes = data.resolution_minutes.unwrap_or(60 * 24);
+    let resolution_minutes = data
+        .resolution_minutes
+        .map_or(60 * 24, |minutes| minutes.get());
 
     // Convert String list to list of ProjectIds or VersionIds
     // - Filter out unauthorized projects/versions
@@ -161,7 +164,9 @@ pub async fn views_get(
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
-    let resolution_minutes = data.resolution_minutes.unwrap_or(60 * 24);
+    let resolution_minutes = data
+        .resolution_minutes
+        .map_or(60 * 24, |minutes| minutes.get());
 
     // Convert String list to list of ProjectIds or VersionIds
     // - Filter out unauthorized projects/versions
@@ -228,7 +233,9 @@ pub async fn downloads_get(
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
-    let resolution_minutes = data.resolution_minutes.unwrap_or(60 * 24);
+    let resolution_minutes = data
+        .resolution_minutes
+        .map_or(60 * 24, |minutes| minutes.get());
 
     // Convert String list to list of ProjectIds or VersionIds
     // - Filter out unauthorized projects/versions
@@ -295,7 +302,9 @@ pub async fn revenue_get(
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
-    let resolution_minutes = data.resolution_minutes.unwrap_or(60 * 24);
+    let resolution_minutes = data
+        .resolution_minutes
+        .map_or(60 * 24, |minutes| minutes.get());
 
     // Round up/down to nearest duration as we are using pgadmin, does not have rounding in the fetch command
     // Round start_date down to nearest resolution
@@ -569,7 +578,7 @@ async fn filter_allowed_ids(
     // If no project_ids or version_ids are provided, we default to all projects the user has *public* access to
     if project_ids.is_none() && !remove_defaults.unwrap_or(false) {
         project_ids = Some(
-            user_item::User::get_projects(user.id.into(), &***pool, redis)
+            user_item::DBUser::get_projects(user.id.into(), &***pool, redis)
                 .await?
                 .into_iter()
                 .map(|x| ProjectId::from(x).to_string())
@@ -580,7 +589,7 @@ async fn filter_allowed_ids(
     // Convert String list to list of ProjectIds or VersionIds
     // - Filter out unauthorized projects/versions
     let project_ids = if let Some(project_strings) = project_ids {
-        let projects_data = database::models::Project::get_many(
+        let projects_data = database::models::DBProject::get_many(
             &project_strings,
             &***pool,
             redis,
@@ -590,9 +599,9 @@ async fn filter_allowed_ids(
         let team_ids = projects_data
             .iter()
             .map(|x| x.inner.team_id)
-            .collect::<Vec<database::models::TeamId>>();
+            .collect::<Vec<database::models::DBTeamId>>();
         let team_members =
-            database::models::TeamMember::get_from_team_full_many(
+            database::models::DBTeamMember::get_from_team_full_many(
                 &team_ids, &***pool, redis,
             )
             .await?;
@@ -600,8 +609,8 @@ async fn filter_allowed_ids(
         let organization_ids = projects_data
             .iter()
             .filter_map(|x| x.inner.organization_id)
-            .collect::<Vec<database::models::OrganizationId>>();
-        let organizations = database::models::Organization::get_many_ids(
+            .collect::<Vec<database::models::DBOrganizationId>>();
+        let organizations = database::models::DBOrganization::get_many_ids(
             &organization_ids,
             &***pool,
             redis,
@@ -611,9 +620,9 @@ async fn filter_allowed_ids(
         let organization_team_ids = organizations
             .iter()
             .map(|x| x.team_id)
-            .collect::<Vec<database::models::TeamId>>();
+            .collect::<Vec<database::models::DBTeamId>>();
         let organization_team_members =
-            database::models::TeamMember::get_from_team_full_many(
+            database::models::DBTeamMember::get_from_team_full_many(
                 &organization_team_ids,
                 &***pool,
                 redis,
diff --git a/apps/labrinth/src/routes/v3/collections.rs b/apps/labrinth/src/routes/v3/collections.rs
index 3e03fd9b..5d9268e0 100644
--- a/apps/labrinth/src/routes/v3/collections.rs
+++ b/apps/labrinth/src/routes/v3/collections.rs
@@ -9,14 +9,14 @@ use crate::models::collections::{Collection, CollectionStatus};
 use crate::models::ids::{CollectionId, ProjectId};
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
-use crate::routes::v3::project_creation::CreateError;
 use crate::routes::ApiError;
+use crate::routes::v3::project_creation::CreateError;
 use crate::util::img::delete_old_images;
 use crate::util::routes::read_from_payload;
 use crate::util::validate::validation_errors_to_string;
 use crate::{database, models};
 use actix_web::web::Data;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use ariadne::ids::base62_impl::parse_base62;
 use chrono::Utc;
 use itertools::Itertools;
@@ -85,7 +85,7 @@ pub async fn collection_create(
     let collection_id: CollectionId =
         generate_collection_id(&mut transaction).await?.into();
 
-    let initial_project_ids = project_item::Project::get_many(
+    let initial_project_ids = project_item::DBProject::get_many(
         &collection_create_data.projects,
         &mut *transaction,
         &redis,
@@ -144,12 +144,12 @@ pub async fn collections_get(
     let ids = ids
         .into_iter()
         .map(|x| {
-            parse_base62(x).map(|x| database::models::CollectionId(x as i64))
+            parse_base62(x).map(|x| database::models::DBCollectionId(x as i64))
         })
         .collect::<Result<Vec<_>, _>>()?;
 
     let collections_data =
-        database::models::Collection::get_many(&ids, &**pool, &redis).await?;
+        database::models::DBCollection::get_many(&ids, &**pool, &redis).await?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -177,9 +177,9 @@ pub async fn collection_get(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
 
-    let id = database::models::CollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
     let collection_data =
-        database::models::Collection::get(id, &**pool, &redis).await?;
+        database::models::DBCollection::get(id, &**pool, &redis).await?;
     let user_option = get_user_from_headers(
         &req,
         &**pool,
@@ -241,8 +241,9 @@ pub async fn collection_edit(
     })?;
 
     let string = info.into_inner().0;
-    let id = database::models::CollectionId(parse_base62(&string)? as i64);
-    let result = database::models::Collection::get(id, &**pool, &redis).await?;
+    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
+    let result =
+        database::models::DBCollection::get(id, &**pool, &redis).await?;
 
     if let Some(collection_item) = result {
         if !can_modify_collection(&collection_item, &user) {
@@ -261,7 +262,7 @@ pub async fn collection_edit(
                 WHERE (id = $2)
                 ",
                 name.trim(),
-                id as database::models::ids::CollectionId,
+                id as database::models::ids::DBCollectionId,
             )
             .execute(&mut *transaction)
             .await?;
@@ -275,7 +276,7 @@ pub async fn collection_edit(
                 WHERE (id = $2)
                 ",
                 description.as_ref(),
-                id as database::models::ids::CollectionId,
+                id as database::models::ids::DBCollectionId,
             )
             .execute(&mut *transaction)
             .await?;
@@ -298,7 +299,7 @@ pub async fn collection_edit(
                 WHERE (id = $2)
                 ",
                 status.to_string(),
-                id as database::models::ids::CollectionId,
+                id as database::models::ids::DBCollectionId,
             )
             .execute(&mut *transaction)
             .await?;
@@ -311,7 +312,7 @@ pub async fn collection_edit(
                 DELETE FROM collections_mods
                 WHERE collection_id = $1
                 ",
-                collection_item.id as database::models::ids::CollectionId,
+                collection_item.id as database::models::ids::DBCollectionId,
             )
             .execute(&mut *transaction)
             .await?;
@@ -322,14 +323,15 @@ pub async fn collection_edit(
                 .collect_vec();
             let mut validated_project_ids = Vec::new();
             for project_id in new_project_ids {
-                let project =
-                    database::models::Project::get(project_id, &**pool, &redis)
-                        .await?
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(format!(
-                            "The specified project {project_id} does not exist!"
-                        ))
-                        })?;
+                let project = database::models::DBProject::get(
+                    project_id, &**pool, &redis,
+                )
+                .await?
+                .ok_or_else(|| {
+                    ApiError::InvalidInput(format!(
+                        "The specified project {project_id} does not exist!"
+                    ))
+                })?;
                 validated_project_ids.push(project.inner.id.0);
             }
             // Insert- don't throw an error if it already exists
@@ -351,14 +353,14 @@ pub async fn collection_edit(
                 SET updated = NOW()
                 WHERE id = $1
                 ",
-                collection_item.id as database::models::ids::CollectionId,
+                collection_item.id as database::models::ids::DBCollectionId,
             )
             .execute(&mut *transaction)
             .await?;
         }
 
         transaction.commit().await?;
-        database::models::Collection::clear_cache(collection_item.id, &redis)
+        database::models::DBCollection::clear_cache(collection_item.id, &redis)
             .await?;
 
         Ok(HttpResponse::NoContent().body(""))
@@ -394,9 +396,9 @@ pub async fn collection_icon_edit(
     .1;
 
     let string = info.into_inner().0;
-    let id = database::models::CollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
     let collection_item =
-        database::models::Collection::get(id, &**pool, &redis)
+        database::models::DBCollection::get(id, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -424,7 +426,7 @@ pub async fn collection_icon_edit(
 
     let collection_id: CollectionId = collection_item.id.into();
     let upload_result = crate::util::img::upload_image_optimized(
-        &format!("data/{}", collection_id),
+        &format!("data/{collection_id}"),
         bytes.freeze(),
         &ext.ext,
         Some(96),
@@ -444,13 +446,13 @@ pub async fn collection_icon_edit(
         upload_result.url,
         upload_result.raw_url,
         upload_result.color.map(|x| x as i32),
-        collection_item.id as database::models::ids::CollectionId,
+        collection_item.id as database::models::ids::DBCollectionId,
     )
     .execute(&mut *transaction)
     .await?;
 
     transaction.commit().await?;
-    database::models::Collection::clear_cache(collection_item.id, &redis)
+    database::models::DBCollection::clear_cache(collection_item.id, &redis)
         .await?;
 
     Ok(HttpResponse::NoContent().body(""))
@@ -475,9 +477,9 @@ pub async fn delete_collection_icon(
     .1;
 
     let string = info.into_inner().0;
-    let id = database::models::CollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
     let collection_item =
-        database::models::Collection::get(id, &**pool, &redis)
+        database::models::DBCollection::get(id, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -502,13 +504,13 @@ pub async fn delete_collection_icon(
         SET icon_url = NULL, raw_icon_url = NULL, color = NULL
         WHERE (id = $1)
         ",
-        collection_item.id as database::models::ids::CollectionId,
+        collection_item.id as database::models::ids::DBCollectionId,
     )
     .execute(&mut *transaction)
     .await?;
 
     transaction.commit().await?;
-    database::models::Collection::clear_cache(collection_item.id, &redis)
+    database::models::DBCollection::clear_cache(collection_item.id, &redis)
         .await?;
 
     Ok(HttpResponse::NoContent().body(""))
@@ -532,8 +534,8 @@ pub async fn collection_delete(
     .1;
 
     let string = info.into_inner().0;
-    let id = database::models::CollectionId(parse_base62(&string)? as i64);
-    let collection = database::models::Collection::get(id, &**pool, &redis)
+    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
+    let collection = database::models::DBCollection::get(id, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -545,7 +547,7 @@ pub async fn collection_delete(
     }
     let mut transaction = pool.begin().await?;
 
-    let result = database::models::Collection::remove(
+    let result = database::models::DBCollection::remove(
         collection.id,
         &mut transaction,
         &redis,
@@ -553,7 +555,7 @@ pub async fn collection_delete(
     .await?;
 
     transaction.commit().await?;
-    database::models::Collection::clear_cache(collection.id, &redis).await?;
+    database::models::DBCollection::clear_cache(collection.id, &redis).await?;
 
     if result.is_some() {
         Ok(HttpResponse::NoContent().body(""))
@@ -563,7 +565,7 @@ pub async fn collection_delete(
 }
 
 fn can_modify_collection(
-    collection: &database::models::Collection,
+    collection: &database::models::DBCollection,
     user: &models::users::User,
 ) -> bool {
     collection.user_id == user.id.into() || user.role.is_mod()
diff --git a/apps/labrinth/src/routes/v3/friends.rs b/apps/labrinth/src/routes/v3/friends.rs
index 56d70d56..ee57a2b4 100644
--- a/apps/labrinth/src/routes/v3/friends.rs
+++ b/apps/labrinth/src/routes/v3/friends.rs
@@ -1,17 +1,17 @@
 use crate::auth::get_user_from_headers;
-use crate::database::models::UserId;
+use crate::database::models::DBUserId;
 use crate::database::redis::RedisPool;
 use crate::models::pats::Scopes;
 use crate::models::users::UserFriend;
 use crate::queue::session::AuthQueue;
 use crate::queue::socket::ActiveSockets;
+use crate::routes::ApiError;
 use crate::routes::internal::statuses::{
     broadcast_friends_message, send_message_to_user,
 };
-use crate::routes::ApiError;
 use crate::sync::friends::RedisFriendsMessage;
 use crate::sync::status::get_user_status;
-use actix_web::{delete, get, post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use ariadne::networking::message::ServerToClientMessage;
 use chrono::Utc;
 use sqlx::PgPool;
@@ -43,13 +43,13 @@ pub async fn add_friend(
 
     let string = info.into_inner().0;
     let friend =
-        crate::database::models::User::get(&string, &**pool, &redis).await?;
+        crate::database::models::DBUser::get(&string, &**pool, &redis).await?;
 
     if let Some(friend) = friend {
         let mut transaction = pool.begin().await?;
 
         if let Some(friend) =
-            crate::database::models::friend_item::FriendItem::get_friend(
+            crate::database::models::friend_item::DBFriend::get_friend(
                 user.id.into(),
                 friend.id,
                 &**pool,
@@ -68,7 +68,7 @@ pub async fn add_friend(
                 ));
             }
 
-            crate::database::models::friend_item::FriendItem::update_friend(
+            crate::database::models::friend_item::DBFriend::update_friend(
                 friend.user_id,
                 friend.friend_id,
                 true,
@@ -77,8 +77,8 @@ pub async fn add_friend(
             .await?;
 
             async fn send_friend_status(
-                user_id: UserId,
-                friend_id: UserId,
+                user_id: DBUserId,
+                friend_id: DBUserId,
                 sockets: &ActiveSockets,
                 redis: &RedisPool,
             ) -> Result<(), ApiError> {
@@ -115,7 +115,7 @@ pub async fn add_friend(
                 ));
             }
 
-            crate::database::models::friend_item::FriendItem {
+            crate::database::models::friend_item::DBFriend {
                 user_id: user.id.into(),
                 friend_id: friend.id,
                 created: Utc::now(),
@@ -161,12 +161,12 @@ pub async fn remove_friend(
 
     let string = info.into_inner().0;
     let friend =
-        crate::database::models::User::get(&string, &**pool, &redis).await?;
+        crate::database::models::DBUser::get(&string, &**pool, &redis).await?;
 
     if let Some(friend) = friend {
         let mut transaction = pool.begin().await?;
 
-        crate::database::models::friend_item::FriendItem::remove(
+        crate::database::models::friend_item::DBFriend::remove(
             user.id.into(),
             friend.id,
             &mut transaction,
@@ -206,7 +206,7 @@ pub async fn friends(
     .1;
 
     let friends =
-        crate::database::models::friend_item::FriendItem::get_user_friends(
+        crate::database::models::friend_item::DBFriend::get_user_friends(
             user.id.into(),
             None,
             &**pool,
diff --git a/apps/labrinth/src/routes/v3/images.rs b/apps/labrinth/src/routes/v3/images.rs
index a1c2c841..2c8e2dae 100644
--- a/apps/labrinth/src/routes/v3/images.rs
+++ b/apps/labrinth/src/routes/v3/images.rs
@@ -9,14 +9,13 @@ use crate::database::models::{
 };
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
-use crate::models::ids::{ThreadMessageId, VersionId};
+use crate::models::ids::{ReportId, ThreadMessageId, VersionId};
 use crate::models::images::{Image, ImageContext};
-use crate::models::reports::ReportId;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::img::upload_image_optimized;
 use crate::util::routes::read_from_payload;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 
@@ -68,7 +67,7 @@ pub async fn images_add(
         ImageContext::Project { project_id } => {
             if let Some(id) = data.project_id {
                 let project =
-                    project_item::Project::get(&id, &**pool, &redis).await?;
+                    project_item::DBProject::get(&id, &**pool, &redis).await?;
                 if let Some(project) = project {
                     if is_team_member_project(
                         &project.inner,
@@ -93,7 +92,7 @@ pub async fn images_add(
         ImageContext::Version { version_id } => {
             if let Some(id) = data.version_id {
                 let version =
-                    version_item::Version::get(id.into(), &**pool, &redis)
+                    version_item::DBVersion::get(id.into(), &**pool, &redis)
                         .await?;
                 if let Some(version) = version {
                     if is_team_member_version(
@@ -120,7 +119,7 @@ pub async fn images_add(
         ImageContext::ThreadMessage { thread_message_id } => {
             if let Some(id) = data.thread_message_id {
                 let thread_message =
-                    thread_item::ThreadMessage::get(id.into(), &**pool)
+                    thread_item::DBThreadMessage::get(id.into(), &**pool)
                         .await?
                         .ok_or_else(|| {
                             ApiError::InvalidInput(
@@ -128,7 +127,7 @@ pub async fn images_add(
                                     .to_string(),
                             )
                         })?;
-                let thread = thread_item::Thread::get(thread_message.thread_id, &**pool)
+                let thread = thread_item::DBThread::get(thread_message.thread_id, &**pool)
                     .await?
                     .ok_or_else(|| {
                         ApiError::InvalidInput(
@@ -148,14 +147,14 @@ pub async fn images_add(
         }
         ImageContext::Report { report_id } => {
             if let Some(id) = data.report_id {
-                let report = report_item::Report::get(id.into(), &**pool)
+                let report = report_item::DBReport::get(id.into(), &**pool)
                     .await?
                     .ok_or_else(|| {
                         ApiError::InvalidInput(
                             "The report could not be found.".to_string(),
                         )
                     })?;
-                let thread = thread_item::Thread::get(report.thread_id, &**pool)
+                let thread = thread_item::DBThread::get(report.thread_id, &**pool)
                     .await?
                     .ok_or_else(|| {
                         ApiError::InvalidInput(
@@ -199,19 +198,19 @@ pub async fn images_add(
 
     let mut transaction = pool.begin().await?;
 
-    let db_image: database::models::Image = database::models::Image {
+    let db_image: database::models::DBImage = database::models::DBImage {
         id: database::models::generate_image_id(&mut transaction).await?,
         url: upload_result.url,
         raw_url: upload_result.raw_url,
         size: content_length as u64,
         created: chrono::Utc::now(),
-        owner_id: database::models::UserId::from(user.id),
+        owner_id: database::models::DBUserId::from(user.id),
         context: context.context_as_str().to_string(),
         project_id: if let ImageContext::Project {
             project_id: Some(id),
         } = context
         {
-            Some(crate::database::models::ProjectId::from(id))
+            Some(crate::database::models::DBProjectId::from(id))
         } else {
             None
         },
@@ -219,7 +218,7 @@ pub async fn images_add(
             version_id: Some(id),
         } = context
         {
-            Some(database::models::VersionId::from(id))
+            Some(database::models::DBVersionId::from(id))
         } else {
             None
         },
@@ -227,7 +226,7 @@ pub async fn images_add(
             thread_message_id: Some(id),
         } = context
         {
-            Some(database::models::ThreadMessageId::from(id))
+            Some(database::models::DBThreadMessageId::from(id))
         } else {
             None
         },
@@ -235,7 +234,7 @@ pub async fn images_add(
             report_id: Some(id),
         } = context
         {
-            Some(database::models::ReportId::from(id))
+            Some(database::models::DBReportId::from(id))
         } else {
             None
         },
diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs
index 3233d88a..336a773f 100644
--- a/apps/labrinth/src/routes/v3/mod.rs
+++ b/apps/labrinth/src/routes/v3/mod.rs
@@ -1,6 +1,6 @@
 pub use super::ApiError;
 use crate::util::cors::default_cors;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 use serde_json::json;
 
 pub mod analytics_get;
diff --git a/apps/labrinth/src/routes/v3/notifications.rs b/apps/labrinth/src/routes/v3/notifications.rs
index abff2e58..daab7513 100644
--- a/apps/labrinth/src/routes/v3/notifications.rs
+++ b/apps/labrinth/src/routes/v3/notifications.rs
@@ -6,7 +6,7 @@ use crate::models::notifications::Notification;
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 
@@ -45,8 +45,8 @@ pub async fn notifications_get(
     .await?
     .1;
 
-    use database::models::notification_item::Notification as DBNotification;
-    use database::models::NotificationId as DBNotificationId;
+    use database::models::DBNotificationId;
+    use database::models::notification_item::DBNotification;
 
     let notification_ids: Vec<DBNotificationId> =
         serde_json::from_str::<Vec<NotificationId>>(ids.ids.as_str())?
@@ -55,7 +55,7 @@ pub async fn notifications_get(
             .collect();
 
     let notifications_data: Vec<DBNotification> =
-        database::models::notification_item::Notification::get_many(
+        database::models::notification_item::DBNotification::get_many(
             &notification_ids,
             &**pool,
         )
@@ -90,7 +90,7 @@ pub async fn notification_get(
     let id = info.into_inner().0;
 
     let notification_data =
-        database::models::notification_item::Notification::get(
+        database::models::notification_item::DBNotification::get(
             id.into(),
             &**pool,
         )
@@ -127,7 +127,7 @@ pub async fn notification_read(
     let id = info.into_inner().0;
 
     let notification_data =
-        database::models::notification_item::Notification::get(
+        database::models::notification_item::DBNotification::get(
             id.into(),
             &**pool,
         )
@@ -137,7 +137,7 @@ pub async fn notification_read(
         if data.user_id == user.id.into() || user.role.is_admin() {
             let mut transaction = pool.begin().await?;
 
-            database::models::notification_item::Notification::read(
+            database::models::notification_item::DBNotification::read(
                 id.into(),
                 &mut transaction,
                 &redis,
@@ -177,7 +177,7 @@ pub async fn notification_delete(
     let id = info.into_inner().0;
 
     let notification_data =
-        database::models::notification_item::Notification::get(
+        database::models::notification_item::DBNotification::get(
             id.into(),
             &**pool,
         )
@@ -187,7 +187,7 @@ pub async fn notification_delete(
         if data.user_id == user.id.into() || user.role.is_admin() {
             let mut transaction = pool.begin().await?;
 
-            database::models::notification_item::Notification::remove(
+            database::models::notification_item::DBNotification::remove(
                 id.into(),
                 &mut transaction,
                 &redis,
@@ -234,13 +234,13 @@ pub async fn notifications_read(
     let mut transaction = pool.begin().await?;
 
     let notifications_data =
-        database::models::notification_item::Notification::get_many(
+        database::models::notification_item::DBNotification::get_many(
             &notification_ids,
             &**pool,
         )
         .await?;
 
-    let mut notifications: Vec<database::models::ids::NotificationId> =
+    let mut notifications: Vec<database::models::ids::DBNotificationId> =
         Vec::new();
 
     for notification in notifications_data {
@@ -249,7 +249,7 @@ pub async fn notifications_read(
         }
     }
 
-    database::models::notification_item::Notification::read_many(
+    database::models::notification_item::DBNotification::read_many(
         &notifications,
         &mut transaction,
         &redis,
@@ -287,13 +287,13 @@ pub async fn notifications_delete(
     let mut transaction = pool.begin().await?;
 
     let notifications_data =
-        database::models::notification_item::Notification::get_many(
+        database::models::notification_item::DBNotification::get_many(
             &notification_ids,
             &**pool,
         )
         .await?;
 
-    let mut notifications: Vec<database::models::ids::NotificationId> =
+    let mut notifications: Vec<database::models::ids::DBNotificationId> =
         Vec::new();
 
     for notification in notifications_data {
@@ -302,7 +302,7 @@ pub async fn notifications_delete(
         }
     }
 
-    database::models::notification_item::Notification::remove_many(
+    database::models::notification_item::DBNotification::remove_many(
         &notifications,
         &mut transaction,
         &redis,
diff --git a/apps/labrinth/src/routes/v3/oauth_clients.rs b/apps/labrinth/src/routes/v3/oauth_clients.rs
index b196b510..d1750ae2 100644
--- a/apps/labrinth/src/routes/v3/oauth_clients.rs
+++ b/apps/labrinth/src/routes/v3/oauth_clients.rs
@@ -5,10 +5,10 @@ use crate::{
     auth::{checks::ValidateAuthorized, get_user_from_headers},
     database::{
         models::{
-            generate_oauth_client_id, generate_oauth_redirect_id,
-            oauth_client_authorization_item::OAuthClientAuthorization,
-            oauth_client_item::{OAuthClient, OAuthRedirectUri},
-            DatabaseError, OAuthClientId, User,
+            DBOAuthClientId, DBUser, DatabaseError, generate_oauth_client_id,
+            generate_oauth_redirect_id,
+            oauth_client_authorization_item::DBOAuthClientAuthorization,
+            oauth_client_item::{DBOAuthClient, DBOAuthRedirectUri},
         },
         redis::RedisPool,
     },
@@ -26,21 +26,19 @@ use crate::{
     util::routes::read_from_payload,
 };
 use actix_web::{
-    delete, get, patch, post,
+    HttpRequest, HttpResponse, delete, get, patch, post,
     web::{self, scope},
-    HttpRequest, HttpResponse,
 };
 use ariadne::ids::base62_impl::parse_base62;
 use chrono::Utc;
 use itertools::Itertools;
-use rand::{distributions::Alphanumeric, Rng, SeedableRng};
+use rand::{Rng, SeedableRng, distributions::Alphanumeric};
 use rand_chacha::ChaCha20Rng;
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use validator::Validate;
 
-use crate::database::models::oauth_client_item::OAuthClient as DBOAuthClient;
-use crate::models::ids::OAuthClientId as ApiOAuthClientId;
+use crate::models::ids::OAuthClientId;
 use crate::util::img::{delete_old_images, upload_image_optimized};
 
 pub fn config(cfg: &mut web::ServiceConfig) {
@@ -76,7 +74,7 @@ pub async fn get_user_clients(
     .await?
     .1;
 
-    let target_user = User::get(&info.into_inner(), &**pool, &redis).await?;
+    let target_user = DBUser::get(&info.into_inner(), &**pool, &redis).await?;
 
     if let Some(target_user) = target_user {
         if target_user.id != current_user.id.into()
@@ -88,7 +86,8 @@ pub async fn get_user_clients(
         }
 
         let clients =
-            OAuthClient::get_all_user_clients(target_user.id, &**pool).await?;
+            DBOAuthClient::get_all_user_clients(target_user.id, &**pool)
+                .await?;
 
         let response = clients
             .into_iter()
@@ -103,7 +102,7 @@ pub async fn get_user_clients(
 
 #[get("app/{id}")]
 pub async fn get_client(
-    id: web::Path<ApiOAuthClientId>,
+    id: web::Path<OAuthClientId>,
     pool: web::Data<PgPool>,
 ) -> Result<HttpResponse, ApiError> {
     let clients = get_clients_inner(&[id.into_inner()], pool).await?;
@@ -122,7 +121,7 @@ pub async fn get_clients(
     let ids: Vec<_> = info
         .ids
         .iter()
-        .map(|id| parse_base62(id).map(ApiOAuthClientId))
+        .map(|id| parse_base62(id).map(OAuthClientId))
         .collect::<Result<_, _>>()?;
 
     let clients = get_clients_inner(&ids, pool).await?;
@@ -191,7 +190,7 @@ pub async fn oauth_client_create(
     )
     .await?;
 
-    let client = OAuthClient {
+    let client = DBOAuthClient {
         id: client_id,
         icon_url: None,
         raw_icon_url: None,
@@ -219,7 +218,7 @@ pub async fn oauth_client_create(
 #[delete("app/{id}")]
 pub async fn oauth_client_delete(
     req: HttpRequest,
-    client_id: web::Path<ApiOAuthClientId>,
+    client_id: web::Path<OAuthClientId>,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
@@ -235,10 +234,10 @@ pub async fn oauth_client_delete(
     .1;
 
     let client =
-        OAuthClient::get(client_id.into_inner().into(), &**pool).await?;
+        DBOAuthClient::get(client_id.into_inner().into(), &**pool).await?;
     if let Some(client) = client {
         client.validate_authorized(Some(&current_user))?;
-        OAuthClient::remove(client.id, &**pool).await?;
+        DBOAuthClient::remove(client.id, &**pool).await?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
@@ -275,7 +274,7 @@ pub struct OAuthClientEdit {
 #[patch("app/{id}")]
 pub async fn oauth_client_edit(
     req: HttpRequest,
-    client_id: web::Path<ApiOAuthClientId>,
+    client_id: web::Path<OAuthClientId>,
     client_updates: web::Json<OAuthClientEdit>,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
@@ -296,7 +295,7 @@ pub async fn oauth_client_edit(
     })?;
 
     if let Some(existing_client) =
-        OAuthClient::get(client_id.into_inner().into(), &**pool).await?
+        DBOAuthClient::get(client_id.into_inner().into(), &**pool).await?
     {
         existing_client.validate_authorized(Some(&current_user))?;
 
@@ -352,7 +351,7 @@ pub struct Extension {
 pub async fn oauth_client_icon_edit(
     web::Query(ext): web::Query<Extension>,
     req: HttpRequest,
-    client_id: web::Path<ApiOAuthClientId>,
+    client_id: web::Path<OAuthClientId>,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
     file_host: web::Data<Arc<dyn FileHost + Send + Sync>>,
@@ -369,7 +368,7 @@ pub async fn oauth_client_icon_edit(
     .await?
     .1;
 
-    let client = OAuthClient::get((*client_id).into(), &**pool)
+    let client = DBOAuthClient::get((*client_id).into(), &**pool)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -393,7 +392,7 @@ pub async fn oauth_client_icon_edit(
     )
     .await?;
     let upload_result = upload_image_optimized(
-        &format!("data/{}", client_id),
+        &format!("data/{client_id}"),
         bytes.freeze(),
         &ext.ext,
         Some(96),
@@ -420,7 +419,7 @@ pub async fn oauth_client_icon_edit(
 #[delete("app/{id}/icon")]
 pub async fn oauth_client_icon_delete(
     req: HttpRequest,
-    client_id: web::Path<ApiOAuthClientId>,
+    client_id: web::Path<OAuthClientId>,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
     file_host: web::Data<Arc<dyn FileHost + Send + Sync>>,
@@ -436,7 +435,7 @@ pub async fn oauth_client_icon_delete(
     .await?
     .1;
 
-    let client = OAuthClient::get((*client_id).into(), &**pool)
+    let client = DBOAuthClient::get((*client_id).into(), &**pool)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -483,7 +482,7 @@ pub async fn get_user_oauth_authorizations(
     .await?
     .1;
 
-    let authorizations = OAuthClientAuthorization::get_all_for_user(
+    let authorizations = DBOAuthClientAuthorization::get_all_for_user(
         current_user.id.into(),
         &**pool,
     )
@@ -513,7 +512,7 @@ pub async fn revoke_oauth_authorization(
     .await?
     .1;
 
-    OAuthClientAuthorization::remove(
+    DBOAuthClientAuthorization::remove(
         info.client_id.into(),
         current_user.id.into(),
         &**pool,
@@ -533,13 +532,13 @@ fn generate_oauth_client_secret() -> String {
 
 async fn create_redirect_uris(
     uri_strings: impl IntoIterator<Item = impl Display>,
-    client_id: OAuthClientId,
+    client_id: DBOAuthClientId,
     transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-) -> Result<Vec<OAuthRedirectUri>, DatabaseError> {
+) -> Result<Vec<DBOAuthRedirectUri>, DatabaseError> {
     let mut redirect_uris = vec![];
     for uri in uri_strings.into_iter() {
         let id = generate_oauth_redirect_id(transaction).await?;
-        redirect_uris.push(OAuthRedirectUri {
+        redirect_uris.push(DBOAuthRedirectUri {
             id,
             client_id,
             uri: uri.to_string(),
@@ -551,7 +550,7 @@ async fn create_redirect_uris(
 
 async fn edit_redirects(
     redirects: Vec<String>,
-    existing_client: &OAuthClient,
+    existing_client: &DBOAuthClient,
     transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
 ) -> Result<(), DatabaseError> {
     let updated_redirects: HashSet<String> = redirects.into_iter().collect();
@@ -567,12 +566,12 @@ async fn edit_redirects(
         &mut *transaction,
     )
     .await?;
-    OAuthClient::insert_redirect_uris(&redirects_to_add, &mut **transaction)
+    DBOAuthClient::insert_redirect_uris(&redirects_to_add, &mut **transaction)
         .await?;
 
     let mut redirects_to_remove = existing_client.redirect_uris.clone();
     redirects_to_remove.retain(|r| !updated_redirects.contains(&r.uri));
-    OAuthClient::remove_redirect_uris(
+    DBOAuthClient::remove_redirect_uris(
         redirects_to_remove.iter().map(|r| r.id),
         &mut **transaction,
     )
@@ -582,11 +581,11 @@ async fn edit_redirects(
 }
 
 pub async fn get_clients_inner(
-    ids: &[ApiOAuthClientId],
+    ids: &[OAuthClientId],
     pool: web::Data<PgPool>,
 ) -> Result<Vec<models::oauth_clients::OAuthClient>, ApiError> {
-    let ids: Vec<OAuthClientId> = ids.iter().map(|i| (*i).into()).collect();
-    let clients = OAuthClient::get_many(&ids, &**pool).await?;
+    let ids: Vec<DBOAuthClientId> = ids.iter().map(|i| (*i).into()).collect();
+    let clients = DBOAuthClient::get_many(&ids, &**pool).await?;
 
     Ok(clients.into_iter().map(|c| c.into()).collect_vec())
 }
diff --git a/apps/labrinth/src/routes/v3/organizations.rs b/apps/labrinth/src/routes/v3/organizations.rs
index 06711e74..4fbc03e2 100644
--- a/apps/labrinth/src/routes/v3/organizations.rs
+++ b/apps/labrinth/src/routes/v3/organizations.rs
@@ -3,14 +3,13 @@ use std::sync::Arc;
 
 use super::ApiError;
 use crate::auth::{filter_visible_projects, get_user_from_headers};
-use crate::database::models::team_item::TeamMember;
+use crate::database::models::team_item::DBTeamMember;
 use crate::database::models::{
-    generate_organization_id, team_item, Organization,
+    DBOrganization, generate_organization_id, team_item,
 };
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
-use crate::models::ids::UserId;
-use crate::models::organizations::OrganizationId;
+use crate::models::ids::OrganizationId;
 use crate::models::pats::Scopes;
 use crate::models::teams::{OrganizationPermissions, ProjectPermissions};
 use crate::queue::session::AuthQueue;
@@ -19,7 +18,8 @@ use crate::util::img::delete_old_images;
 use crate::util::routes::read_from_payload;
 use crate::util::validate::validation_errors_to_string;
 use crate::{database, models};
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
+use ariadne::ids::UserId;
 use ariadne::ids::base62_impl::parse_base62;
 use futures::TryStreamExt;
 use rust_decimal::Decimal;
@@ -57,7 +57,7 @@ pub async fn organization_projects_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let info = info.into_inner().0;
+    let id = info.into_inner().0;
     let current_user = get_user_from_headers(
         &req,
         &**pool,
@@ -69,40 +69,43 @@ pub async fn organization_projects_get(
     .map(|x| x.1)
     .ok();
 
-    let possible_organization_id: Option<u64> = parse_base62(&info).ok();
+    let organization_data = DBOrganization::get(&id, &**pool, &redis).await?;
+    if let Some(organization) = organization_data {
+        let project_ids = sqlx::query!(
+            "
+            SELECT m.id FROM organizations o
+            INNER JOIN mods m ON m.organization_id = o.id
+            WHERE o.id = $1
+            ",
+            organization.id as database::models::ids::DBOrganizationId
+        )
+        .fetch(&**pool)
+        .map_ok(|m| database::models::DBProjectId(m.id))
+        .try_collect::<Vec<_>>()
+        .await?;
 
-    let project_ids = sqlx::query!(
-        "
-        SELECT m.id FROM organizations o
-        INNER JOIN mods m ON m.organization_id = o.id
-        WHERE (o.id = $1 AND $1 IS NOT NULL) OR (o.slug = $2 AND $2 IS NOT NULL)
-        ",
-        possible_organization_id.map(|x| x as i64),
-        info
-    )
-    .fetch(&**pool)
-    .map_ok(|m| database::models::ProjectId(m.id))
-    .try_collect::<Vec<database::models::ProjectId>>()
-    .await?;
+        let projects_data = crate::database::models::DBProject::get_many_ids(
+            &project_ids,
+            &**pool,
+            &redis,
+        )
+        .await?;
 
-    let projects_data = crate::database::models::Project::get_many_ids(
-        &project_ids,
-        &**pool,
-        &redis,
-    )
-    .await?;
+        let projects =
+            filter_visible_projects(projects_data, &current_user, &pool, true)
+                .await?;
 
-    let projects =
-        filter_visible_projects(projects_data, &current_user, &pool, true)
-            .await?;
-    Ok(HttpResponse::Ok().json(projects))
+        Ok(HttpResponse::Ok().json(projects))
+    } else {
+        Err(ApiError::NotFound)
+    }
 }
 
 #[derive(Deserialize, Validate)]
 pub struct NewOrganization {
     #[validate(
         length(min = 3, max = 64),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub slug: String,
     // Title of the organization
@@ -143,7 +146,7 @@ pub async fn organization_create(
         organization_strings.push(name_organization_id.to_string());
     }
     organization_strings.push(new_organization.slug.clone());
-    let results = Organization::get_many(
+    let results = DBOrganization::get_many(
         &organization_strings,
         &mut *transaction,
         &redis,
@@ -171,7 +174,7 @@ pub async fn organization_create(
     let team_id = team.insert(&mut transaction).await?;
 
     // Create organization
-    let organization = Organization {
+    let organization = DBOrganization {
         id: organization_id,
         slug: new_organization.slug.clone(),
         name: new_organization.name.clone(),
@@ -185,10 +188,11 @@ pub async fn organization_create(
     transaction.commit().await?;
 
     // Only member is the owner, the logged in one
-    let member_data = TeamMember::get_from_team_full(team_id, &**pool, &redis)
-        .await?
-        .into_iter()
-        .next();
+    let member_data =
+        DBTeamMember::get_from_team_full(team_id, &**pool, &redis)
+            .await?
+            .into_iter()
+            .next();
     let members_data = if let Some(member_data) = member_data {
         vec![crate::models::teams::TeamMember::from_model(
             member_data,
@@ -227,13 +231,13 @@ pub async fn organization_get(
     .ok();
     let user_id = current_user.as_ref().map(|x| x.id.into());
 
-    let organization_data = Organization::get(&id, &**pool, &redis).await?;
+    let organization_data = DBOrganization::get(&id, &**pool, &redis).await?;
     if let Some(data) = organization_data {
         let members_data =
-            TeamMember::get_from_team_full(data.team_id, &**pool, &redis)
+            DBTeamMember::get_from_team_full(data.team_id, &**pool, &redis)
                 .await?;
 
-        let users = crate::database::models::User::get_many_ids(
+        let users = crate::database::models::DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
@@ -253,7 +257,7 @@ pub async fn organization_get(
                 logged_in
                     || x.accepted
                     || user_id
-                        .map(|y: crate::database::models::UserId| {
+                        .map(|y: crate::database::models::DBUserId| {
                             y == x.user_id
                         })
                         .unwrap_or(false)
@@ -290,15 +294,16 @@ pub async fn organizations_get(
 ) -> Result<HttpResponse, ApiError> {
     let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)?;
     let organizations_data =
-        Organization::get_many(&ids, &**pool, &redis).await?;
+        DBOrganization::get_many(&ids, &**pool, &redis).await?;
     let team_ids = organizations_data
         .iter()
         .map(|x| x.team_id)
         .collect::<Vec<_>>();
 
     let teams_data =
-        TeamMember::get_from_team_full_many(&team_ids, &**pool, &redis).await?;
-    let users = crate::database::models::User::get_many_ids(
+        DBTeamMember::get_from_team_full_many(&team_ids, &**pool, &redis)
+            .await?;
+    let users = crate::database::models::DBUser::get_many_ids(
         &teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
@@ -341,7 +346,7 @@ pub async fn organizations_get(
                 logged_in
                     || x.accepted
                     || user_id
-                        .map(|y: crate::database::models::UserId| {
+                        .map(|y: crate::database::models::DBUserId| {
                             y == x.user_id
                         })
                         .unwrap_or(false)
@@ -371,7 +376,7 @@ pub struct OrganizationEdit {
     pub description: Option<String>,
     #[validate(
         length(min = 3, max = 64),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub slug: Option<String>,
     #[validate(length(min = 3, max = 64))]
@@ -402,11 +407,11 @@ pub async fn organizations_edit(
 
     let string = info.into_inner().0;
     let result =
-        database::models::Organization::get(&string, &**pool, &redis).await?;
+        database::models::DBOrganization::get(&string, &**pool, &redis).await?;
     if let Some(organization_item) = result {
         let id = organization_item.id;
 
-        let team_member = database::models::TeamMember::get_from_user_id(
+        let team_member = database::models::DBTeamMember::get_from_user_id(
             organization_item.team_id,
             user.id.into(),
             &**pool,
@@ -434,7 +439,7 @@ pub async fn organizations_edit(
                     WHERE (id = $2)
                     ",
                     description,
-                    id as database::models::ids::OrganizationId,
+                    id as database::models::ids::DBOrganizationId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -454,7 +459,7 @@ pub async fn organizations_edit(
                     WHERE (id = $2)
                     ",
                     name,
-                    id as database::models::ids::OrganizationId,
+                    id as database::models::ids::DBOrganizationId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -516,14 +521,14 @@ pub async fn organizations_edit(
                     WHERE (id = $2)
                     ",
                     Some(slug),
-                    id as database::models::ids::OrganizationId,
+                    id as database::models::ids::DBOrganizationId,
                 )
                 .execute(&mut *transaction)
                 .await?;
             }
 
             transaction.commit().await?;
-            database::models::Organization::clear_cache(
+            database::models::DBOrganization::clear_cache(
                 organization_item.id,
                 Some(organization_item.slug),
                 &redis,
@@ -561,7 +566,7 @@ pub async fn organization_delete(
     let string = info.into_inner().0;
 
     let organization =
-        database::models::Organization::get(&string, &**pool, &redis)
+        database::models::DBOrganization::get(&string, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -571,7 +576,7 @@ pub async fn organization_delete(
 
     if !user.role.is_admin() {
         let team_member =
-            database::models::TeamMember::get_from_user_id_organization(
+            database::models::DBTeamMember::get_from_user_id_organization(
                 organization.id,
                 user.id.into(),
                 false,
@@ -604,12 +609,12 @@ pub async fn organization_delete(
         SELECT user_id FROM team_members
         WHERE team_id = $1 AND is_owner = TRUE
         ",
-        organization.team_id as database::models::ids::TeamId
+        organization.team_id as database::models::ids::DBTeamId
     )
     .fetch_one(&**pool)
     .await?
     .user_id;
-    let owner_id = database::models::ids::UserId(owner_id);
+    let owner_id = database::models::ids::DBUserId(owner_id);
 
     let mut transaction = pool.begin().await?;
 
@@ -623,10 +628,10 @@ pub async fn organization_delete(
         INNER JOIN teams t ON t.id = m.team_id
         WHERE o.id = $1 AND $1 IS NOT NULL
         ",
-        organization.id as database::models::ids::OrganizationId
+        organization.id as database::models::ids::DBOrganizationId
     )
     .fetch(&mut *transaction)
-    .map_ok(|c| database::models::TeamId(c.id))
+    .map_ok(|c| database::models::DBTeamId(c.id))
     .try_collect::<Vec<_>>()
     .await?;
 
@@ -635,7 +640,7 @@ pub async fn organization_delete(
             &mut transaction,
         )
         .await?;
-        let member = TeamMember {
+        let member = DBTeamMember {
             id: new_id,
             team_id: *organization_project_team,
             user_id: owner_id,
@@ -650,7 +655,7 @@ pub async fn organization_delete(
         member.insert(&mut transaction).await?;
     }
     // Safely remove the organization
-    let result = database::models::Organization::remove(
+    let result = database::models::DBOrganization::remove(
         organization.id,
         &mut transaction,
         &redis,
@@ -659,7 +664,7 @@ pub async fn organization_delete(
 
     transaction.commit().await?;
 
-    database::models::Organization::clear_cache(
+    database::models::DBOrganization::clear_cache(
         organization.id,
         Some(organization.slug),
         &redis,
@@ -667,7 +672,7 @@ pub async fn organization_delete(
     .await?;
 
     for team_id in organization_project_teams {
-        database::models::TeamMember::clear_cache(team_id, &redis).await?;
+        database::models::DBTeamMember::clear_cache(team_id, &redis).await?;
     }
 
     if result.is_some() {
@@ -701,7 +706,7 @@ pub async fn organization_projects_add(
     .1;
 
     let organization =
-        database::models::Organization::get(&info, &**pool, &redis)
+        database::models::DBOrganization::get(&info, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -709,7 +714,7 @@ pub async fn organization_projects_add(
                 )
             })?;
 
-    let project_item = database::models::Project::get(
+    let project_item = database::models::DBProject::get(
         &project_info.project_id,
         &**pool,
         &redis,
@@ -728,7 +733,7 @@ pub async fn organization_projects_add(
     }
 
     let project_team_member =
-        database::models::TeamMember::get_from_user_id_project(
+        database::models::DBTeamMember::get_from_user_id_project(
             project_item.inner.id,
             current_user.id.into(),
             false,
@@ -741,7 +746,7 @@ pub async fn organization_projects_add(
             )
         })?;
     let organization_team_member =
-        database::models::TeamMember::get_from_user_id_organization(
+        database::models::DBTeamMember::get_from_user_id_organization(
             organization.id,
             current_user.id.into(),
             false,
@@ -774,8 +779,8 @@ pub async fn organization_projects_add(
             SET organization_id = $1
             WHERE (id = $2)
             ",
-            organization.id as database::models::OrganizationId,
-            project_item.inner.id as database::models::ids::ProjectId
+            organization.id as database::models::DBOrganizationId,
+            project_item.inner.id as database::models::ids::DBProjectId
         )
         .execute(&mut *transaction)
         .await?;
@@ -791,37 +796,37 @@ pub async fn organization_projects_add(
             INNER JOIN users u ON u.id = team_members.user_id
             WHERE team_id = $1 AND is_owner = TRUE
             ",
-            organization.team_id as database::models::ids::TeamId
+            organization.team_id as database::models::ids::DBTeamId
         )
         .fetch_one(&mut *transaction)
         .await?;
         let organization_owner_user_id =
-            database::models::ids::UserId(organization_owner_user_id.id);
+            database::models::ids::DBUserId(organization_owner_user_id.id);
 
         sqlx::query!(
             "
             DELETE FROM team_members
             WHERE team_id = $1 AND (is_owner = TRUE OR user_id = $2)
             ",
-            project_item.inner.team_id as database::models::ids::TeamId,
-            organization_owner_user_id as database::models::ids::UserId,
+            project_item.inner.team_id as database::models::ids::DBTeamId,
+            organization_owner_user_id as database::models::ids::DBUserId,
         )
         .execute(&mut *transaction)
         .await?;
 
         transaction.commit().await?;
 
-        database::models::User::clear_project_cache(
+        database::models::DBUser::clear_project_cache(
             &[current_user.id.into()],
             &redis,
         )
         .await?;
-        database::models::TeamMember::clear_cache(
+        database::models::DBTeamMember::clear_cache(
             project_item.inner.team_id,
             &redis,
         )
         .await?;
-        database::models::Project::clear_cache(
+        database::models::DBProject::clear_cache(
             project_item.inner.id,
             project_item.inner.slug,
             None,
@@ -863,17 +868,20 @@ pub async fn organization_projects_remove(
     .await?
     .1;
 
-    let organization =
-        database::models::Organization::get(&organization_id, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified organization does not exist!".to_string(),
-                )
-            })?;
+    let organization = database::models::DBOrganization::get(
+        &organization_id,
+        &**pool,
+        &redis,
+    )
+    .await?
+    .ok_or_else(|| {
+        ApiError::InvalidInput(
+            "The specified organization does not exist!".to_string(),
+        )
+    })?;
 
     let project_item =
-        database::models::Project::get(&project_id, &**pool, &redis)
+        database::models::DBProject::get(&project_id, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -893,7 +901,7 @@ pub async fn organization_projects_remove(
     }
 
     let organization_team_member =
-        database::models::TeamMember::get_from_user_id_organization(
+        database::models::DBTeamMember::get_from_user_id_organization(
             organization.id,
             current_user.id.into(),
             false,
@@ -913,7 +921,7 @@ pub async fn organization_projects_remove(
     .unwrap_or_default();
     if permissions.contains(OrganizationPermissions::REMOVE_PROJECT) {
         // Now that permissions are confirmed, we confirm the veracity of the new user as an org member
-        database::models::TeamMember::get_from_user_id_organization(
+        database::models::DBTeamMember::get_from_user_id_organization(
             organization.id,
             data.new_owner.into(),
             false,
@@ -929,13 +937,14 @@ pub async fn organization_projects_remove(
 
         // Then, we get the team member of the project and that user (if it exists)
         // We use the team member get directly
-        let new_owner = database::models::TeamMember::get_from_user_id_project(
-            project_item.inner.id,
-            data.new_owner.into(),
-            true,
-            &**pool,
-        )
-        .await?;
+        let new_owner =
+            database::models::DBTeamMember::get_from_user_id_project(
+                project_item.inner.id,
+                data.new_owner.into(),
+                true,
+                &**pool,
+            )
+            .await?;
 
         let mut transaction = pool.begin().await?;
 
@@ -948,7 +957,7 @@ pub async fn organization_projects_remove(
                         &mut transaction,
                     )
                     .await?;
-                let member = TeamMember {
+                let member = DBTeamMember {
                     id: new_id,
                     team_id: project_item.inner.team_id,
                     user_id: data.new_owner.into(),
@@ -977,7 +986,7 @@ pub async fn organization_projects_remove(
                 role = 'Inherited Owner'
             WHERE (id = $1)
             ",
-            new_owner.id as database::models::ids::TeamMemberId,
+            new_owner.id as database::models::ids::DBTeamMemberId,
             ProjectPermissions::all().bits() as i64
         )
         .execute(&mut *transaction)
@@ -989,23 +998,23 @@ pub async fn organization_projects_remove(
             SET organization_id = NULL
             WHERE (id = $1)
             ",
-            project_item.inner.id as database::models::ids::ProjectId
+            project_item.inner.id as database::models::ids::DBProjectId
         )
         .execute(&mut *transaction)
         .await?;
 
         transaction.commit().await?;
-        database::models::User::clear_project_cache(
+        database::models::DBUser::clear_project_cache(
             &[current_user.id.into()],
             &redis,
         )
         .await?;
-        database::models::TeamMember::clear_cache(
+        database::models::DBTeamMember::clear_cache(
             project_item.inner.team_id,
             &redis,
         )
         .await?;
-        database::models::Project::clear_cache(
+        database::models::DBProject::clear_cache(
             project_item.inner.id,
             project_item.inner.slug,
             None,
@@ -1049,7 +1058,7 @@ pub async fn organization_icon_edit(
     let string = info.into_inner().0;
 
     let organization_item =
-        database::models::Organization::get(&string, &**pool, &redis)
+        database::models::DBOrganization::get(&string, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -1058,7 +1067,7 @@ pub async fn organization_icon_edit(
             })?;
 
     if !user.role.is_mod() {
-        let team_member = database::models::TeamMember::get_from_user_id(
+        let team_member = database::models::DBTeamMember::get_from_user_id(
             organization_item.team_id,
             user.id.into(),
             &**pool,
@@ -1096,7 +1105,7 @@ pub async fn organization_icon_edit(
 
     let organization_id: OrganizationId = organization_item.id.into();
     let upload_result = crate::util::img::upload_image_optimized(
-        &format!("data/{}", organization_id),
+        &format!("data/{organization_id}"),
         bytes.freeze(),
         &ext.ext,
         Some(96),
@@ -1116,13 +1125,13 @@ pub async fn organization_icon_edit(
         upload_result.url,
         upload_result.raw_url,
         upload_result.color.map(|x| x as i32),
-        organization_item.id as database::models::ids::OrganizationId,
+        organization_item.id as database::models::ids::DBOrganizationId,
     )
     .execute(&mut *transaction)
     .await?;
 
     transaction.commit().await?;
-    database::models::Organization::clear_cache(
+    database::models::DBOrganization::clear_cache(
         organization_item.id,
         Some(organization_item.slug),
         &redis,
@@ -1152,7 +1161,7 @@ pub async fn delete_organization_icon(
     let string = info.into_inner().0;
 
     let organization_item =
-        database::models::Organization::get(&string, &**pool, &redis)
+        database::models::DBOrganization::get(&string, &**pool, &redis)
             .await?
             .ok_or_else(|| {
                 ApiError::InvalidInput(
@@ -1161,7 +1170,7 @@ pub async fn delete_organization_icon(
             })?;
 
     if !user.role.is_mod() {
-        let team_member = database::models::TeamMember::get_from_user_id(
+        let team_member = database::models::DBTeamMember::get_from_user_id(
             organization_item.team_id,
             user.id.into(),
             &**pool,
@@ -1198,14 +1207,14 @@ pub async fn delete_organization_icon(
         SET icon_url = NULL, raw_icon_url = NULL, color = NULL
         WHERE (id = $1)
         ",
-        organization_item.id as database::models::ids::OrganizationId,
+        organization_item.id as database::models::ids::DBOrganizationId,
     )
     .execute(&mut *transaction)
     .await?;
 
     transaction.commit().await?;
 
-    database::models::Organization::clear_cache(
+    database::models::DBOrganization::clear_cache(
         organization_item.id,
         Some(organization_item.slug),
         &redis,
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 1ed74e32..3e86cc9d 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -1,17 +1,17 @@
 use crate::auth::validate::get_user_record_from_bearer_token;
-use crate::auth::{get_user_from_headers, AuthenticationError};
+use crate::auth::{AuthenticationError, get_user_from_headers};
 use crate::database::models::generate_payout_id;
 use crate::database::redis::RedisPool;
 use crate::models::ids::PayoutId;
 use crate::models::pats::Scopes;
 use crate::models::payouts::{PayoutMethodType, PayoutStatus};
-use crate::queue::payouts::{make_aditude_request, PayoutsQueue};
+use crate::queue::payouts::{PayoutsQueue, make_aditude_request};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
-use actix_web::{delete, get, post, web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use chrono::{DateTime, Datelike, Duration, TimeZone, Utc, Weekday};
 use hex::ToHex;
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use reqwest::Method;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -160,8 +160,11 @@ pub async fn paypal_webhook(
 
                 transaction.commit().await?;
 
-                crate::database::models::user_item::User::clear_caches(
-                    &[(crate::database::models::UserId(result.user_id), None)],
+                crate::database::models::user_item::DBUser::clear_caches(
+                    &[(
+                        crate::database::models::DBUserId(result.user_id),
+                        None,
+                    )],
                     &redis,
                 )
                 .await?;
@@ -267,8 +270,11 @@ pub async fn tremendous_webhook(
 
                 transaction.commit().await?;
 
-                crate::database::models::user_item::User::clear_caches(
-                    &[(crate::database::models::UserId(result.user_id), None)],
+                crate::database::models::user_item::DBUser::clear_caches(
+                    &[(
+                        crate::database::models::DBUserId(result.user_id),
+                        None,
+                    )],
                     &redis,
                 )
                 .await?;
@@ -313,12 +319,12 @@ pub async fn user_payouts(
     .1;
 
     let payout_ids =
-        crate::database::models::payout_item::Payout::get_all_for_user(
+        crate::database::models::payout_item::DBPayout::get_all_for_user(
             user.id.into(),
             &**pool,
         )
         .await?;
-    let payouts = crate::database::models::payout_item::Payout::get_many(
+    let payouts = crate::database::models::payout_item::DBPayout::get_many(
         &payout_ids,
         &**pool,
     )
@@ -471,7 +477,7 @@ pub async fn create_payout(
             }
 
             let mut payout_item =
-                crate::database::models::payout_item::Payout {
+                crate::database::models::payout_item::DBPayout {
                     id: payout_id,
                     user_id: user.id,
                     created: Utc::now(),
@@ -544,7 +550,7 @@ pub async fn create_payout(
             if let Some(email) = user.email {
                 if user.email_verified {
                     let mut payout_item =
-                        crate::database::models::payout_item::Payout {
+                        crate::database::models::payout_item::DBPayout {
                             id: payout_id,
                             user_id: user.id,
                             created: Utc::now(),
@@ -620,14 +626,14 @@ pub async fn create_payout(
         PayoutMethodType::Unknown => {
             return Err(ApiError::Payments(
                 "Invalid payment method specified!".to_string(),
-            ))
+            ));
         }
     };
 
     payout_item.insert(&mut transaction).await?;
 
     transaction.commit().await?;
-    crate::database::models::User::clear_caches(&[(user.id, None)], &redis)
+    crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
         .await?;
 
     Ok(HttpResponse::NoContent().finish())
@@ -654,7 +660,7 @@ pub async fn cancel_payout(
 
     let id = info.into_inner().0;
     let payout =
-        crate::database::models::payout_item::Payout::get(id.into(), &**pool)
+        crate::database::models::payout_item::DBPayout::get(id.into(), &**pool)
             .await?;
 
     if let Some(payout) = payout {
@@ -676,8 +682,7 @@ pub async fn cancel_payout(
                             .make_paypal_request::<(), ()>(
                                 Method::POST,
                                 &format!(
-                                    "payments/payouts-item/{}/cancel",
-                                    platform_id
+                                    "payments/payouts-item/{platform_id}/cancel"
                                 ),
                                 None,
                                 None,
@@ -689,7 +694,7 @@ pub async fn cancel_payout(
                         payouts
                             .make_tremendous_request::<(), ()>(
                                 Method::POST,
-                                &format!("rewards/{}/cancel", platform_id),
+                                &format!("rewards/{platform_id}/cancel"),
                                 None,
                             )
                             .await?;
@@ -697,7 +702,7 @@ pub async fn cancel_payout(
                     PayoutMethodType::Unknown => {
                         return Err(ApiError::InvalidInput(
                             "Payout cannot be cancelled!".to_string(),
-                        ))
+                        ));
                     }
                 }
 
@@ -789,7 +794,7 @@ pub async fn get_balance(
 }
 
 async fn get_user_balance(
-    user_id: crate::database::models::ids::UserId,
+    user_id: crate::database::models::ids::DBUserId,
     pool: &PgPool,
 ) -> Result<UserBalance, sqlx::Error> {
     let payouts = sqlx::query!(
diff --git a/apps/labrinth/src/routes/v3/project_creation.rs b/apps/labrinth/src/routes/v3/project_creation.rs
index fcd1507e..d1fffe4a 100644
--- a/apps/labrinth/src/routes/v3/project_creation.rs
+++ b/apps/labrinth/src/routes/v3/project_creation.rs
@@ -1,23 +1,21 @@
-use super::version_creation::{try_create_version_fields, InitialVersionData};
-use crate::auth::{get_user_from_headers, AuthenticationError};
+use super::version_creation::{InitialVersionData, try_create_version_fields};
+use crate::auth::{AuthenticationError, get_user_from_headers};
 use crate::database::models::loader_fields::{
     Loader, LoaderField, LoaderFieldEnumValue,
 };
 use crate::database::models::thread_item::ThreadBuilder;
-use crate::database::models::{self, image_item, User};
+use crate::database::models::{self, DBUser, image_item};
 use crate::database::redis::RedisPool;
 use crate::file_hosting::{FileHost, FileHostingError};
 use crate::models::error::ApiError;
-use crate::models::ids::{ImageId, OrganizationId};
+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, ProjectId, ProjectStatus, VersionId,
-    VersionStatus,
+    License, Link, MonetizationStatus, ProjectStatus, VersionStatus,
 };
 use crate::models::teams::{OrganizationPermissions, ProjectPermissions};
 use crate::models::threads::ThreadType;
-use crate::models::users::UserId;
 use crate::queue::session::AuthQueue;
 use crate::search::indexing::IndexingError;
 use crate::util::img::upload_image_optimized;
@@ -27,6 +25,7 @@ use actix_multipart::{Field, Multipart};
 use actix_web::http::StatusCode;
 use actix_web::web::{self, Data};
 use actix_web::{HttpRequest, HttpResponse};
+use ariadne::ids::UserId;
 use ariadne::ids::base62_impl::to_base62;
 use chrono::Utc;
 use futures::stream::StreamExt;
@@ -168,7 +167,7 @@ pub struct ProjectCreateData {
     pub name: String,
     #[validate(
         length(min = 3, max = 64),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     #[serde(alias = "mod_slug")]
     /// The slug of a project, used for vanity URLs
@@ -182,8 +181,7 @@ pub struct ProjectCreateData {
     /// A long description of the project, in markdown.
     pub description: String,
 
-    #[validate(length(max = 32))]
-    #[validate]
+    #[validate(nested, length(max = 32))]
     /// A list of initial versions to upload with the created project
     pub initial_versions: Vec<InitialVersionData>,
     #[validate(length(max = 3))]
@@ -209,8 +207,7 @@ pub struct ProjectCreateData {
     /// The license id that the project follows
     pub license_id: String,
 
-    #[validate(length(max = 64))]
-    #[validate]
+    #[validate(nested, length(max = 64))]
     /// The multipart names of the gallery items to upload
     pub gallery_items: Option<Vec<NewGalleryItem>>,
     #[serde(default = "default_requested_status")]
@@ -373,8 +370,7 @@ async fn project_create_inner(
                 )))
             })?;
 
-        let content_disposition = field.content_disposition();
-        let name = content_disposition.get_name().ok_or_else(|| {
+        let name = field.name().ok_or_else(|| {
             CreateError::MissingValueError(String::from("Missing content name"))
         })?;
 
@@ -400,13 +396,13 @@ async fn project_create_inner(
             serde_json::from_str(&format!("\"{}\"", create_data.slug)).ok();
 
         if let Some(slug_project_id) = slug_project_id_option {
-            let slug_project_id: models::ids::ProjectId =
+            let slug_project_id: models::ids::DBProjectId =
                 slug_project_id.into();
             let results = sqlx::query!(
                 "
                 SELECT EXISTS(SELECT 1 FROM mods WHERE id=$1)
                 ",
-                slug_project_id as models::ids::ProjectId
+                slug_project_id as models::ids::DBProjectId
             )
             .fetch_one(&mut **transaction)
             .await
@@ -472,7 +468,7 @@ async fn project_create_inner(
         }
 
         let result = async {
-            let content_disposition = field.content_disposition().clone();
+            let content_disposition = field.content_disposition().unwrap().clone();
 
             let name = content_disposition.get_name().ok_or_else(|| {
                 CreateError::MissingValueError("Missing content name".to_string())
@@ -650,7 +646,7 @@ async fn project_create_inner(
         let mut members = vec![];
 
         if let Some(organization_id) = project_create_data.organization_id {
-            let org = models::Organization::get_id(
+            let org = models::DBOrganization::get_id(
                 organization_id.into(),
                 pool,
                 redis,
@@ -662,7 +658,7 @@ async fn project_create_inner(
                 )
             })?;
 
-            let team_member = models::TeamMember::get_from_user_id(
+            let team_member = models::DBTeamMember::get_from_user_id(
                 org.team_id,
                 current_user.id.into(),
                 pool,
@@ -777,7 +773,7 @@ async fn project_create_inner(
             link_urls,
             gallery_items: gallery_urls
                 .iter()
-                .map(|x| models::project_item::GalleryItem {
+                .map(|x| models::project_item::DBGalleryItem {
                     image_url: x.url.clone(),
                     raw_image_url: x.raw_url.clone(),
                     featured: x.featured,
@@ -795,10 +791,10 @@ async fn project_create_inner(
         let now = Utc::now();
 
         let id = project_builder_actual.insert(&mut *transaction).await?;
-        User::clear_project_cache(&[current_user.id.into()], redis).await?;
+        DBUser::clear_project_cache(&[current_user.id.into()], redis).await?;
 
         for image_id in project_create_data.uploaded_images {
-            if let Some(db_image) = image_item::Image::get(
+            if let Some(db_image) = image_item::DBImage::get(
                 image_id.into(),
                 &mut **transaction,
                 redis,
@@ -810,8 +806,7 @@ async fn project_create_inner(
                     || image.context.inner_id().is_some()
                 {
                     return Err(CreateError::InvalidInput(format!(
-                        "Image {} is not unused and in the 'project' context",
-                        image_id
+                        "Image {image_id} is not unused and in the 'project' context"
                     )));
                 }
 
@@ -821,17 +816,17 @@ async fn project_create_inner(
                     SET mod_id = $1
                     WHERE id = $2
                     ",
-                    id as models::ids::ProjectId,
+                    id as models::ids::DBProjectId,
                     image_id.0 as i64
                 )
                 .execute(&mut **transaction)
                 .await?;
 
-                image_item::Image::clear_cache(image.id.into(), redis).await?;
+                image_item::DBImage::clear_cache(image.id.into(), redis)
+                    .await?;
             } else {
                 return Err(CreateError::InvalidInput(format!(
-                    "Image {} does not exist",
-                    image_id
+                    "Image {image_id} does not exist"
                 )));
             }
         }
diff --git a/apps/labrinth/src/routes/v3/projects.rs b/apps/labrinth/src/routes/v3/projects.rs
index 237e3b22..b7888534 100644
--- a/apps/labrinth/src/routes/v3/projects.rs
+++ b/apps/labrinth/src/routes/v3/projects.rs
@@ -4,18 +4,19 @@ use std::sync::Arc;
 use crate::auth::checks::{filter_visible_versions, is_visible_project};
 use crate::auth::{filter_visible_projects, get_user_from_headers};
 use crate::database::models::notification_item::NotificationBuilder;
-use crate::database::models::project_item::{GalleryItem, ModCategory};
+use crate::database::models::project_item::{DBGalleryItem, DBModCategory};
 use crate::database::models::thread_item::ThreadMessageBuilder;
-use crate::database::models::{ids as db_ids, image_item, TeamMember};
+use crate::database::models::{DBTeamMember, ids as db_ids, image_item};
 use crate::database::redis::RedisPool;
 use crate::database::{self, models as db_models};
 use crate::file_hosting::FileHost;
 use crate::models;
+use crate::models::ids::ProjectId;
 use crate::models::images::ImageContext;
 use crate::models::notifications::NotificationBody;
 use crate::models::pats::Scopes;
 use crate::models::projects::{
-    MonetizationStatus, Project, ProjectId, ProjectStatus, SearchRequest,
+    MonetizationStatus, Project, ProjectStatus, SearchRequest,
 };
 use crate::models::teams::ProjectPermissions;
 use crate::models::threads::MessageBody;
@@ -23,12 +24,12 @@ use crate::queue::moderation::AutomatedModerationQueue;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::search::indexing::remove_documents;
-use crate::search::{search_for_project, SearchConfig, SearchError};
+use crate::search::{SearchConfig, SearchError, search_for_project};
 use crate::util::img;
 use crate::util::img::{delete_old_images, upload_image_optimized};
 use crate::util::routes::read_from_payload;
 use crate::util::validate::validation_errors_to_string;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use ariadne::ids::base62_impl::parse_base62;
 use chrono::Utc;
 use futures::TryStreamExt;
@@ -103,12 +104,12 @@ pub async fn random_projects_get(
             .collect::<Vec<String>>(),
     )
     .fetch(&**pool)
-    .map_ok(|m| db_ids::ProjectId(m.id))
+    .map_ok(|m| db_ids::DBProjectId(m.id))
     .try_collect::<Vec<_>>()
     .await?;
 
     let projects_data =
-        db_models::Project::get_many_ids(&project_ids, &**pool, &redis)
+        db_models::DBProject::get_many_ids(&project_ids, &**pool, &redis)
             .await?
             .into_iter()
             .map(Project::from)
@@ -131,7 +132,7 @@ pub async fn projects_get(
 ) -> Result<HttpResponse, ApiError> {
     let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)?;
     let projects_data =
-        db_models::Project::get_many(&ids, &**pool, &redis).await?;
+        db_models::DBProject::get_many(&ids, &**pool, &redis).await?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -161,7 +162,7 @@ pub async fn project_get(
     let string = info.into_inner().0;
 
     let project_data =
-        db_models::Project::get(&string, &**pool, &redis).await?;
+        db_models::DBProject::get(&string, &**pool, &redis).await?;
     let user_option = get_user_from_headers(
         &req,
         &**pool,
@@ -214,7 +215,7 @@ pub struct EditProject {
     pub license_id: Option<String>,
     #[validate(
         length(min = 3, max = 64),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub slug: Option<String>,
     pub status: Option<ProjectStatus>,
@@ -267,12 +268,12 @@ pub async fn project_edit(
     })?;
 
     let string = info.into_inner().0;
-    let result = db_models::Project::get(&string, &**pool, &redis).await?;
+    let result = db_models::DBProject::get(&string, &**pool, &redis).await?;
     if let Some(project_item) = result {
         let id = project_item.inner.id;
 
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project_item.inner,
                 user.id.into(),
                 &**pool,
@@ -303,7 +304,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     name.trim(),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -324,7 +325,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     summary,
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -363,7 +364,7 @@ pub async fn project_edit(
                         SET moderation_message = NULL, moderation_message_body = NULL, queued = NOW()
                         WHERE (id = $1)
                         ",
-                        id as db_ids::ProjectId,
+                        id as db_ids::DBProjectId,
                     )
                     .execute(&mut *transaction)
                     .await?;
@@ -382,7 +383,7 @@ pub async fn project_edit(
                         SET approved = NOW()
                         WHERE id = $1 AND approved IS NULL
                         ",
-                        id as db_ids::ProjectId,
+                        id as db_ids::DBProjectId,
                     )
                     .execute(&mut *transaction)
                     .await?;
@@ -407,7 +408,7 @@ pub async fn project_edit(
                             SET webhook_sent = TRUE
                             WHERE id = $1
                             ",
-                            id as db_ids::ProjectId,
+                            id as db_ids::DBProjectId,
                         )
                         .execute(&mut *transaction)
                         .await?;
@@ -447,10 +448,10 @@ pub async fn project_edit(
                         FROM team_members tm
                         WHERE tm.team_id = $1 AND tm.accepted
                         ",
-                        project_item.inner.team_id as db_ids::TeamId
+                        project_item.inner.team_id as db_ids::DBTeamId
                     )
                     .fetch(&mut *transaction)
-                    .map_ok(|c| db_models::UserId(c.id))
+                    .map_ok(|c| db_models::DBUserId(c.id))
                     .try_collect::<Vec<_>>()
                     .await?;
 
@@ -484,7 +485,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     status.as_str(),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -528,7 +529,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     requested_status.map(|x| x.as_str()),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -541,7 +542,7 @@ pub async fn project_edit(
                         DELETE FROM mods_categories
                         WHERE joining_mod_id = $1 AND is_additional = FALSE
                         ",
-                        id as db_ids::ProjectId,
+                        id as db_ids::DBProjectId,
                     )
                     .execute(&mut *transaction)
                     .await?;
@@ -553,7 +554,7 @@ pub async fn project_edit(
                         DELETE FROM mods_categories
                         WHERE joining_mod_id = $1 AND is_additional = TRUE
                         ",
-                        id as db_ids::ProjectId,
+                        id as db_ids::DBProjectId,
                     )
                     .execute(&mut *transaction)
                     .await?;
@@ -564,7 +565,7 @@ pub async fn project_edit(
                 edit_project_categories(
                     categories,
                     &perms,
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                     false,
                     &mut transaction,
                 )
@@ -575,7 +576,7 @@ pub async fn project_edit(
                 edit_project_categories(
                     categories,
                     &perms,
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                     true,
                     &mut transaction,
                 )
@@ -597,7 +598,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     license_url.as_deref(),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -663,7 +664,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     Some(slug),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -696,7 +697,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     license,
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -710,10 +711,8 @@ pub async fn project_edit(
                         ));
                     }
 
-                    let ids_to_delete = links
-                        .iter()
-                        .map(|(name, _)| name.clone())
-                        .collect::<Vec<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!(
                         "
@@ -722,7 +721,7 @@ pub async fn project_edit(
                             SELECT id FROM link_platforms WHERE name = ANY($2)
                         )
                         ",
-                        id as db_ids::ProjectId,
+                        id as db_ids::DBProjectId,
                         &ids_to_delete
                     )
                     .execute(&mut *transaction)
@@ -749,7 +748,7 @@ pub async fn project_edit(
                                 INSERT INTO mods_links (joining_mod_id, joining_platform_id, url)
                                 VALUES ($1, $2, $3)
                                 ",
-                                id as db_ids::ProjectId,
+                                id as db_ids::DBProjectId,
                                 platform_id as db_ids::LinkPlatformId,
                                 url
                             )
@@ -777,7 +776,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     moderation_message.as_deref(),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -803,7 +802,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     moderation_message_body.as_deref(),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -824,7 +823,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     description,
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -858,7 +857,7 @@ pub async fn project_edit(
                     WHERE (id = $2)
                     ",
                     monetization_status.as_str(),
-                    id as db_ids::ProjectId,
+                    id as db_ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -885,7 +884,7 @@ pub async fn project_edit(
             .await?;
 
             transaction.commit().await?;
-            db_models::Project::clear_cache(
+            db_models::DBProject::clear_cache(
                 project_item.inner.id,
                 project_item.inner.slug,
                 None,
@@ -907,12 +906,12 @@ pub async fn project_edit(
 pub async fn edit_project_categories(
     categories: &Vec<String>,
     perms: &ProjectPermissions,
-    project_id: db_ids::ProjectId,
-    additional: bool,
+    project_id: db_ids::DBProjectId,
+    is_additional: bool,
     transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
 ) -> Result<(), ApiError> {
     if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-        let additional_str = if additional { "additional " } else { "" };
+        let additional_str = if is_additional { "additional " } else { "" };
         return Err(ApiError::CustomAuthentication(format!(
             "You do not have the permissions to edit the {additional_str}categories of this project!"
         )));
@@ -930,11 +929,15 @@ pub async fn edit_project_categories(
 
         let mcategories = category_ids
             .values()
-            .map(|x| ModCategory::new(project_id, *x, additional))
+            .map(|&category_id| DBModCategory {
+                project_id,
+                category_id,
+                is_additional,
+            })
             .collect::<Vec<_>>();
         mod_categories.extend(mcategories);
     }
-    ModCategory::insert_many(mod_categories, &mut *transaction).await?;
+    DBModCategory::insert_many(mod_categories, &mut *transaction).await?;
 
     Ok(())
 }
@@ -977,7 +980,8 @@ pub async fn project_get_check(
 ) -> Result<HttpResponse, ApiError> {
     let slug = info.into_inner().0;
 
-    let project_data = db_models::Project::get(&slug, &**pool, &redis).await?;
+    let project_data =
+        db_models::DBProject::get(&slug, &**pool, &redis).await?;
 
     if let Some(project) = project_data {
         Ok(HttpResponse::Ok().json(json! ({
@@ -1003,7 +1007,7 @@ pub async fn dependency_list(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
 
-    let result = db_models::Project::get(&string, &**pool, &redis).await?;
+    let result = db_models::DBProject::get(&string, &**pool, &redis).await?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -1023,7 +1027,7 @@ pub async fn dependency_list(
             return Err(ApiError::NotFound);
         }
 
-        let dependencies = database::Project::get_dependencies(
+        let dependencies = database::DBProject::get_dependencies(
             project.inner.id,
             &**pool,
             &redis,
@@ -1049,10 +1053,10 @@ pub async fn dependency_list(
             .iter()
             .filter_map(|x| x.0)
             .unique()
-            .collect::<Vec<db_models::VersionId>>();
+            .collect::<Vec<db_models::DBVersionId>>();
         let (projects_result, versions_result) = futures::future::try_join(
-            database::Project::get_many_ids(&project_ids, &**pool, &redis),
-            database::Version::get_many(&dep_version_ids, &**pool, &redis),
+            database::DBProject::get_many_ids(&project_ids, &**pool, &redis),
+            database::DBVersion::get_many(&dep_version_ids, &**pool, &redis),
         )
         .await?;
 
@@ -1083,7 +1087,6 @@ pub async fn dependency_list(
     }
 }
 
-#[derive(derive_new::new)]
 pub struct CategoryChanges<'a> {
     pub categories: &'a Option<Vec<String>>,
     pub add_categories: &'a Option<Vec<String>>,
@@ -1132,14 +1135,15 @@ pub async fn projects_edit(
         ApiError::Validation(validation_errors_to_string(err, None))
     })?;
 
-    let project_ids: Vec<db_ids::ProjectId> =
+    let project_ids: Vec<db_ids::DBProjectId> =
         serde_json::from_str::<Vec<ProjectId>>(&ids.ids)?
             .into_iter()
             .map(|x| x.into())
             .collect();
 
     let projects_data =
-        db_models::Project::get_many_ids(&project_ids, &**pool, &redis).await?;
+        db_models::DBProject::get_many_ids(&project_ids, &**pool, &redis)
+            .await?;
 
     if let Some(id) = project_ids
         .iter()
@@ -1154,8 +1158,8 @@ pub async fn projects_edit(
     let team_ids = projects_data
         .iter()
         .map(|x| x.inner.team_id)
-        .collect::<Vec<db_models::TeamId>>();
-    let team_members = db_models::TeamMember::get_from_team_full_many(
+        .collect::<Vec<db_models::DBTeamId>>();
+    let team_members = db_models::DBTeamMember::get_from_team_full_many(
         &team_ids, &**pool, &redis,
     )
     .await?;
@@ -1163,8 +1167,8 @@ pub async fn projects_edit(
     let organization_ids = projects_data
         .iter()
         .filter_map(|x| x.inner.organization_id)
-        .collect::<Vec<db_models::OrganizationId>>();
-    let organizations = db_models::Organization::get_many_ids(
+        .collect::<Vec<db_models::DBOrganizationId>>();
+    let organizations = db_models::DBOrganization::get_many_ids(
         &organization_ids,
         &**pool,
         &redis,
@@ -1174,9 +1178,9 @@ pub async fn projects_edit(
     let organization_team_ids = organizations
         .iter()
         .map(|x| x.team_id)
-        .collect::<Vec<db_models::TeamId>>();
+        .collect::<Vec<db_models::DBTeamId>>();
     let organization_team_members =
-        db_models::TeamMember::get_from_team_full_many(
+        db_models::DBTeamMember::get_from_team_full_many(
             &organization_team_ids,
             &**pool,
             &redis,
@@ -1242,12 +1246,12 @@ pub async fn projects_edit(
         bulk_edit_project_categories(
             &categories,
             &project.categories,
-            project.inner.id as db_ids::ProjectId,
-            CategoryChanges::new(
-                &bulk_edit_project.categories,
-                &bulk_edit_project.add_categories,
-                &bulk_edit_project.remove_categories,
-            ),
+            project.inner.id as db_ids::DBProjectId,
+            CategoryChanges {
+                categories: &bulk_edit_project.categories,
+                add_categories: &bulk_edit_project.add_categories,
+                remove_categories: &bulk_edit_project.remove_categories,
+            },
             3,
             false,
             &mut transaction,
@@ -1257,12 +1261,13 @@ pub async fn projects_edit(
         bulk_edit_project_categories(
             &categories,
             &project.additional_categories,
-            project.inner.id as db_ids::ProjectId,
-            CategoryChanges::new(
-                &bulk_edit_project.additional_categories,
-                &bulk_edit_project.add_additional_categories,
-                &bulk_edit_project.remove_additional_categories,
-            ),
+            project.inner.id as db_ids::DBProjectId,
+            CategoryChanges {
+                categories: &bulk_edit_project.additional_categories,
+                add_categories: &bulk_edit_project.add_additional_categories,
+                remove_categories: &bulk_edit_project
+                    .remove_additional_categories,
+            },
             256,
             true,
             &mut transaction,
@@ -1270,10 +1275,7 @@ pub async fn projects_edit(
         .await?;
 
         if let Some(links) = &bulk_edit_project.link_urls {
-            let ids_to_delete = links
-                .iter()
-                .map(|(name, _)| name.clone())
-                .collect::<Vec<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!(
                 "
@@ -1282,7 +1284,7 @@ pub async fn projects_edit(
                     SELECT id FROM link_platforms WHERE name = ANY($2)
                 )
                 ",
-                project.inner.id as db_ids::ProjectId,
+                project.inner.id as db_ids::DBProjectId,
                 &ids_to_delete
             )
             .execute(&mut *transaction)
@@ -1305,7 +1307,7 @@ pub async fn projects_edit(
                         INSERT INTO mods_links (joining_mod_id, joining_platform_id, url)
                         VALUES ($1, $2, $3)
                         ",
-                        project.inner.id as db_ids::ProjectId,
+                        project.inner.id as db_ids::DBProjectId,
                         platform_id as db_ids::LinkPlatformId,
                         url
                     )
@@ -1315,7 +1317,7 @@ pub async fn projects_edit(
             }
         }
 
-        db_models::Project::clear_cache(
+        db_models::DBProject::clear_cache(
             project.inner.id,
             project.inner.slug,
             None,
@@ -1332,7 +1334,7 @@ pub async fn projects_edit(
 pub async fn bulk_edit_project_categories(
     all_db_categories: &[db_models::categories::Category],
     project_categories: &Vec<String>,
-    project_id: db_ids::ProjectId,
+    project_id: db_ids::DBProjectId,
     bulk_changes: CategoryChanges<'_>,
     max_num_categories: usize,
     is_additional: bool,
@@ -1370,7 +1372,7 @@ pub async fn bulk_edit_project_categories(
             DELETE FROM mods_categories
             WHERE joining_mod_id = $1 AND is_additional = $2
             ",
-            project_id as db_ids::ProjectId,
+            project_id as db_ids::DBProjectId,
             is_additional
         )
         .execute(&mut **transaction)
@@ -1388,13 +1390,13 @@ pub async fn bulk_edit_project_categories(
                     ))
                 })?
                 .id;
-            mod_categories.push(ModCategory::new(
+            mod_categories.push(DBModCategory {
                 project_id,
                 category_id,
                 is_additional,
-            ));
+            });
         }
-        ModCategory::insert_many(mod_categories, &mut *transaction).await?;
+        DBModCategory::insert_many(mod_categories, &mut *transaction).await?;
     }
 
     Ok(())
@@ -1427,7 +1429,7 @@ pub async fn project_icon_edit(
     .1;
     let string = info.into_inner().0;
 
-    let project_item = db_models::Project::get(&string, &**pool, &redis)
+    let project_item = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -1437,7 +1439,7 @@ pub async fn project_icon_edit(
 
     if !user.role.is_mod() {
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project_item.inner,
                 user.id.into(),
                 &**pool,
@@ -1482,7 +1484,7 @@ pub async fn project_icon_edit(
 
     let project_id: ProjectId = project_item.inner.id.into();
     let upload_result = upload_image_optimized(
-        &format!("data/{}", project_id),
+        &format!("data/{project_id}"),
         bytes.freeze(),
         &ext.ext,
         Some(96),
@@ -1502,13 +1504,13 @@ pub async fn project_icon_edit(
         upload_result.url,
         upload_result.raw_url,
         upload_result.color.map(|x| x as i32),
-        project_item.inner.id as db_ids::ProjectId,
+        project_item.inner.id as db_ids::DBProjectId,
     )
     .execute(&mut *transaction)
     .await?;
 
     transaction.commit().await?;
-    db_models::Project::clear_cache(
+    db_models::DBProject::clear_cache(
         project_item.inner.id,
         project_item.inner.slug,
         None,
@@ -1538,7 +1540,7 @@ pub async fn delete_project_icon(
     .1;
     let string = info.into_inner().0;
 
-    let project_item = db_models::Project::get(&string, &**pool, &redis)
+    let project_item = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -1548,7 +1550,7 @@ pub async fn delete_project_icon(
 
     if !user.role.is_mod() {
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project_item.inner,
                 user.id.into(),
                 &**pool,
@@ -1591,13 +1593,13 @@ pub async fn delete_project_icon(
         SET icon_url = NULL, raw_icon_url = NULL, color = NULL
         WHERE (id = $1)
         ",
-        project_item.inner.id as db_ids::ProjectId,
+        project_item.inner.id as db_ids::DBProjectId,
     )
     .execute(&mut *transaction)
     .await?;
 
     transaction.commit().await?;
-    db_models::Project::clear_cache(
+    db_models::DBProject::clear_cache(
         project_item.inner.id,
         project_item.inner.slug,
         None,
@@ -1645,7 +1647,7 @@ pub async fn add_gallery_item(
     .1;
     let string = info.into_inner().0;
 
-    let project_item = db_models::Project::get(&string, &**pool, &redis)
+    let project_item = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -1662,7 +1664,7 @@ pub async fn add_gallery_item(
 
     if !user.role.is_admin() {
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project_item.inner,
                 user.id.into(),
                 &**pool,
@@ -1700,7 +1702,7 @@ pub async fn add_gallery_item(
 
     let id: ProjectId = project_item.inner.id.into();
     let upload_result = upload_image_optimized(
-        &format!("data/{}/images", id),
+        &format!("data/{id}/images"),
         bytes.freeze(),
         &ext.ext,
         Some(350),
@@ -1728,14 +1730,14 @@ pub async fn add_gallery_item(
                 SET featured = $2
                 WHERE mod_id = $1
                 ",
-            project_item.inner.id as db_ids::ProjectId,
+            project_item.inner.id as db_ids::DBProjectId,
             false,
         )
         .execute(&mut *transaction)
         .await?;
     }
 
-    let gallery_item = vec![db_models::project_item::GalleryItem {
+    let gallery_item = vec![db_models::project_item::DBGalleryItem {
         image_url: upload_result.url,
         raw_image_url: upload_result.raw_url,
         featured: item.featured,
@@ -1744,7 +1746,7 @@ pub async fn add_gallery_item(
         created: Utc::now(),
         ordering: item.ordering.unwrap_or(0),
     }];
-    GalleryItem::insert_many(
+    DBGalleryItem::insert_many(
         gallery_item,
         project_item.inner.id,
         &mut transaction,
@@ -1752,7 +1754,7 @@ pub async fn add_gallery_item(
     .await?;
 
     transaction.commit().await?;
-    db_models::Project::clear_cache(
+    db_models::DBProject::clear_cache(
         project_item.inner.id,
         project_item.inner.slug,
         None,
@@ -1822,8 +1824,8 @@ pub async fn edit_gallery_item(
         ))
     })?;
 
-    let project_item = db_models::Project::get_id(
-        database::models::ProjectId(result.mod_id),
+    let project_item = db_models::DBProject::get_id(
+        database::models::DBProjectId(result.mod_id),
         &**pool,
         &redis,
     )
@@ -1836,7 +1838,7 @@ pub async fn edit_gallery_item(
 
     if !user.role.is_mod() {
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project_item.inner,
                 user.id.into(),
                 &**pool,
@@ -1874,7 +1876,7 @@ pub async fn edit_gallery_item(
                 SET featured = $2
                 WHERE mod_id = $1
                 ",
-                project_item.inner.id as db_ids::ProjectId,
+                project_item.inner.id as db_ids::DBProjectId,
                 false,
             )
             .execute(&mut *transaction)
@@ -1935,7 +1937,7 @@ pub async fn edit_gallery_item(
 
     transaction.commit().await?;
 
-    db_models::Project::clear_cache(
+    db_models::DBProject::clear_cache(
         project_item.inner.id,
         project_item.inner.slug,
         None,
@@ -1985,8 +1987,8 @@ pub async fn delete_gallery_item(
         ))
     })?;
 
-    let project_item = db_models::Project::get_id(
-        database::models::ProjectId(item.mod_id),
+    let project_item = db_models::DBProject::get_id(
+        database::models::DBProjectId(item.mod_id),
         &**pool,
         &redis,
     )
@@ -1999,7 +2001,7 @@ pub async fn delete_gallery_item(
 
     if !user.role.is_mod() {
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project_item.inner,
                 user.id.into(),
                 &**pool,
@@ -2049,7 +2051,7 @@ pub async fn delete_gallery_item(
 
     transaction.commit().await?;
 
-    db_models::Project::clear_cache(
+    db_models::DBProject::clear_cache(
         project_item.inner.id,
         project_item.inner.slug,
         None,
@@ -2079,7 +2081,7 @@ pub async fn project_delete(
     .1;
     let string = info.into_inner().0;
 
-    let project = db_models::Project::get(&string, &**pool, &redis)
+    let project = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -2089,7 +2091,7 @@ pub async fn project_delete(
 
     if !user.role.is_admin() {
         let (team_member, organization_team_member) =
-            db_models::TeamMember::get_for_project_permissions(
+            db_models::DBTeamMember::get_for_project_permissions(
                 &project.inner,
                 user.id.into(),
                 &**pool,
@@ -2122,9 +2124,10 @@ pub async fn project_delete(
         project_id: Some(project.inner.id.into()),
     };
     let uploaded_images =
-        db_models::Image::get_many_contexted(context, &mut transaction).await?;
+        db_models::DBImage::get_many_contexted(context, &mut transaction)
+            .await?;
     for image in uploaded_images {
-        image_item::Image::remove(image.id, &mut transaction, &redis).await?;
+        image_item::DBImage::remove(image.id, &mut transaction, &redis).await?;
     }
 
     sqlx::query!(
@@ -2132,14 +2135,17 @@ pub async fn project_delete(
         DELETE FROM collections_mods
         WHERE mod_id = $1
         ",
-        project.inner.id as db_ids::ProjectId,
+        project.inner.id as db_ids::DBProjectId,
     )
     .execute(&mut *transaction)
     .await?;
 
-    let result =
-        db_models::Project::remove(project.inner.id, &mut transaction, &redis)
-            .await?;
+    let result = db_models::DBProject::remove(
+        project.inner.id,
+        &mut transaction,
+        &redis,
+    )
+    .await?;
 
     transaction.commit().await?;
 
@@ -2178,7 +2184,7 @@ pub async fn project_follow(
     .1;
     let string = info.into_inner().0;
 
-    let result = db_models::Project::get(&string, &**pool, &redis)
+    let result = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -2186,8 +2192,8 @@ pub async fn project_follow(
             )
         })?;
 
-    let user_id: db_ids::UserId = user.id.into();
-    let project_id: db_ids::ProjectId = result.inner.id;
+    let user_id: db_ids::DBUserId = user.id.into();
+    let project_id: db_ids::DBProjectId = result.inner.id;
 
     if !is_visible_project(&result.inner, &Some(user), &pool, false).await? {
         return Err(ApiError::NotFound);
@@ -2197,8 +2203,8 @@ pub async fn project_follow(
         "
         SELECT EXISTS(SELECT 1 FROM mod_follows mf WHERE mf.follower_id = $1 AND mf.mod_id = $2)
         ",
-        user_id as db_ids::UserId,
-        project_id as db_ids::ProjectId
+        user_id as db_ids::DBUserId,
+        project_id as db_ids::DBProjectId
     )
     .fetch_one(&**pool)
     .await?
@@ -2214,7 +2220,7 @@ pub async fn project_follow(
             SET follows = follows + 1
             WHERE id = $1
             ",
-            project_id as db_ids::ProjectId,
+            project_id as db_ids::DBProjectId,
         )
         .execute(&mut *transaction)
         .await?;
@@ -2224,8 +2230,8 @@ pub async fn project_follow(
             INSERT INTO mod_follows (follower_id, mod_id)
             VALUES ($1, $2)
             ",
-            user_id as db_ids::UserId,
-            project_id as db_ids::ProjectId
+            user_id as db_ids::DBUserId,
+            project_id as db_ids::DBProjectId
         )
         .execute(&mut *transaction)
         .await?;
@@ -2258,7 +2264,7 @@ pub async fn project_unfollow(
     .1;
     let string = info.into_inner().0;
 
-    let result = db_models::Project::get(&string, &**pool, &redis)
+    let result = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -2266,15 +2272,15 @@ pub async fn project_unfollow(
             )
         })?;
 
-    let user_id: db_ids::UserId = user.id.into();
+    let user_id: db_ids::DBUserId = user.id.into();
     let project_id = result.inner.id;
 
     let following = sqlx::query!(
         "
         SELECT EXISTS(SELECT 1 FROM mod_follows mf WHERE mf.follower_id = $1 AND mf.mod_id = $2)
         ",
-        user_id as db_ids::UserId,
-        project_id as db_ids::ProjectId
+        user_id as db_ids::DBUserId,
+        project_id as db_ids::DBProjectId
     )
     .fetch_one(&**pool)
     .await?
@@ -2290,7 +2296,7 @@ pub async fn project_unfollow(
             SET follows = follows - 1
             WHERE id = $1
             ",
-            project_id as db_ids::ProjectId,
+            project_id as db_ids::DBProjectId,
         )
         .execute(&mut *transaction)
         .await?;
@@ -2300,8 +2306,8 @@ pub async fn project_unfollow(
             DELETE FROM mod_follows
             WHERE follower_id = $1 AND mod_id = $2
             ",
-            user_id as db_ids::UserId,
-            project_id as db_ids::ProjectId
+            user_id as db_ids::DBUserId,
+            project_id as db_ids::DBProjectId
         )
         .execute(&mut *transaction)
         .await?;
@@ -2336,7 +2342,7 @@ pub async fn project_get_organization(
     let user_id = current_user.as_ref().map(|x| x.id.into());
 
     let string = info.into_inner().0;
-    let result = db_models::Project::get(&string, &**pool, &redis)
+    let result = db_models::DBProject::get(&string, &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -2350,7 +2356,7 @@ pub async fn project_get_organization(
         ))
     } else if let Some(organization_id) = result.inner.organization_id {
         let organization =
-            db_models::Organization::get_id(organization_id, &**pool, &redis)
+            db_models::DBOrganization::get_id(organization_id, &**pool, &redis)
                 .await?
                 .ok_or_else(|| {
                     ApiError::InvalidInput(
@@ -2358,14 +2364,14 @@ pub async fn project_get_organization(
                     )
                 })?;
 
-        let members_data = TeamMember::get_from_team_full(
+        let members_data = DBTeamMember::get_from_team_full(
             organization.team_id,
             &**pool,
             &redis,
         )
         .await?;
 
-        let users = crate::database::models::User::get_many_ids(
+        let users = crate::database::models::DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
@@ -2385,7 +2391,7 @@ pub async fn project_get_organization(
                 logged_in
                     || x.accepted
                     || user_id
-                        .map(|y: crate::database::models::UserId| {
+                        .map(|y: crate::database::models::DBUserId| {
                             y == x.user_id
                         })
                         .unwrap_or(false)
diff --git a/apps/labrinth/src/routes/v3/reports.rs b/apps/labrinth/src/routes/v3/reports.rs
index 710cce74..377d7906 100644
--- a/apps/labrinth/src/routes/v3/reports.rs
+++ b/apps/labrinth/src/routes/v3/reports.rs
@@ -6,7 +6,7 @@ use crate::database::models::thread_item::{
 };
 use crate::database::redis::RedisPool;
 use crate::models::ids::ImageId;
-use crate::models::ids::{ProjectId, UserId, VersionId};
+use crate::models::ids::{ProjectId, VersionId};
 use crate::models::images::{Image, ImageContext};
 use crate::models::pats::Scopes;
 use crate::models::reports::{ItemType, Report};
@@ -14,7 +14,8 @@ use crate::models::threads::{MessageBody, ThreadType};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::img;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
+use ariadne::ids::UserId;
 use ariadne::ids::base62_impl::parse_base62;
 use chrono::Utc;
 use futures::StreamExt;
@@ -86,7 +87,7 @@ pub async fn report_create(
         ))
     })?;
 
-    let mut report = crate::database::models::report_item::Report {
+    let mut report = crate::database::models::report_item::DBReport {
         id,
         report_type_id: report_type,
         project_id: None,
@@ -162,7 +163,7 @@ pub async fn report_create(
             return Err(ApiError::InvalidInput(format!(
                 "Invalid report item type: {}",
                 new_report.item_type.as_str()
-            )))
+            )));
         }
     }
 
@@ -170,7 +171,7 @@ pub async fn report_create(
 
     for image_id in new_report.uploaded_images {
         if let Some(db_image) =
-            image_item::Image::get(image_id.into(), &mut *transaction, &redis)
+            image_item::DBImage::get(image_id.into(), &mut *transaction, &redis)
                 .await?
         {
             let image: Image = db_image.into();
@@ -178,8 +179,7 @@ pub async fn report_create(
                 || image.context.inner_id().is_some()
             {
                 return Err(ApiError::InvalidInput(format!(
-                    "Image {} is not unused and in the 'report' context",
-                    image_id
+                    "Image {image_id} is not unused and in the 'report' context"
                 )));
             }
 
@@ -195,11 +195,10 @@ pub async fn report_create(
             .execute(&mut *transaction)
             .await?;
 
-            image_item::Image::clear_cache(image.id.into(), &redis).await?;
+            image_item::DBImage::clear_cache(image.id.into(), &redis).await?;
         } else {
             return Err(ApiError::InvalidInput(format!(
-                "Image {} could not be found",
-                image_id
+                "Image {image_id} could not be found"
             )));
         }
     }
@@ -273,8 +272,8 @@ pub async fn reports(
             count.count as i64
         )
         .fetch(&**pool)
-        .map_ok(|m| crate::database::models::ids::ReportId(m.id))
-        .try_collect::<Vec<crate::database::models::ids::ReportId>>()
+        .map_ok(|m| crate::database::models::ids::DBReportId(m.id))
+        .try_collect::<Vec<crate::database::models::ids::DBReportId>>()
         .await?
     } else {
         sqlx::query!(
@@ -288,16 +287,17 @@ pub async fn reports(
             count.count as i64
         )
         .fetch(&**pool)
-        .map_ok(|m| crate::database::models::ids::ReportId(m.id))
-        .try_collect::<Vec<crate::database::models::ids::ReportId>>()
+        .map_ok(|m| crate::database::models::ids::DBReportId(m.id))
+        .try_collect::<Vec<crate::database::models::ids::DBReportId>>()
         .await?
     };
 
-    let query_reports = crate::database::models::report_item::Report::get_many(
-        &report_ids,
-        &**pool,
-    )
-    .await?;
+    let query_reports =
+        crate::database::models::report_item::DBReport::get_many(
+            &report_ids,
+            &**pool,
+        )
+        .await?;
 
     let mut reports: Vec<Report> = Vec::new();
 
@@ -320,17 +320,18 @@ pub async fn reports_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let report_ids: Vec<crate::database::models::ids::ReportId> =
+    let report_ids: Vec<crate::database::models::ids::DBReportId> =
         serde_json::from_str::<Vec<crate::models::ids::ReportId>>(&ids.ids)?
             .into_iter()
             .map(|x| x.into())
             .collect();
 
-    let reports_data = crate::database::models::report_item::Report::get_many(
-        &report_ids,
-        &**pool,
-    )
-    .await?;
+    let reports_data =
+        crate::database::models::report_item::DBReport::get_many(
+            &report_ids,
+            &**pool,
+        )
+        .await?;
 
     let user = get_user_from_headers(
         &req,
@@ -355,7 +356,7 @@ pub async fn report_get(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
-    info: web::Path<(crate::models::reports::ReportId,)>,
+    info: web::Path<(crate::models::ids::ReportId,)>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let user = get_user_from_headers(
@@ -370,7 +371,8 @@ pub async fn report_get(
     let id = info.into_inner().0.into();
 
     let report =
-        crate::database::models::report_item::Report::get(id, &**pool).await?;
+        crate::database::models::report_item::DBReport::get(id, &**pool)
+            .await?;
 
     if let Some(report) = report {
         if !user.role.is_mod() && report.reporter != user.id.into() {
@@ -395,7 +397,7 @@ pub async fn report_edit(
     req: HttpRequest,
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
-    info: web::Path<(crate::models::reports::ReportId,)>,
+    info: web::Path<(crate::models::ids::ReportId,)>,
     session_queue: web::Data<AuthQueue>,
     edit_report: web::Json<EditReport>,
 ) -> Result<HttpResponse, ApiError> {
@@ -411,7 +413,8 @@ pub async fn report_edit(
     let id = info.into_inner().0.into();
 
     let report =
-        crate::database::models::report_item::Report::get(id, &**pool).await?;
+        crate::database::models::report_item::DBReport::get(id, &**pool)
+            .await?;
 
     if let Some(report) = report {
         if !user.role.is_mod() && report.reporter != user.id.into() {
@@ -428,7 +431,7 @@ pub async fn report_edit(
                 WHERE (id = $2)
                 ",
                 edit_body,
-                id as crate::database::models::ids::ReportId,
+                id as crate::database::models::ids::DBReportId,
             )
             .execute(&mut *transaction)
             .await?;
@@ -461,7 +464,7 @@ pub async fn report_edit(
                 WHERE (id = $2)
                 ",
                 edit_closed,
-                id as crate::database::models::ids::ReportId,
+                id as crate::database::models::ids::DBReportId,
             )
             .execute(&mut *transaction)
             .await?;
@@ -494,7 +497,7 @@ pub async fn report_edit(
 pub async fn report_delete(
     req: HttpRequest,
     pool: web::Data<PgPool>,
-    info: web::Path<(crate::models::reports::ReportId,)>,
+    info: web::Path<(crate::models::ids::ReportId,)>,
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
@@ -513,14 +516,16 @@ pub async fn report_delete(
     let context = ImageContext::Report {
         report_id: Some(id),
     };
-    let uploaded_images =
-        database::models::Image::get_many_contexted(context, &mut transaction)
-            .await?;
+    let uploaded_images = database::models::DBImage::get_many_contexted(
+        context,
+        &mut transaction,
+    )
+    .await?;
     for image in uploaded_images {
-        image_item::Image::remove(image.id, &mut transaction, &redis).await?;
+        image_item::DBImage::remove(image.id, &mut transaction, &redis).await?;
     }
 
-    let result = crate::database::models::report_item::Report::remove_full(
+    let result = crate::database::models::report_item::DBReport::remove_full(
         id.into(),
         &mut transaction,
     )
diff --git a/apps/labrinth/src/routes/v3/statistics.rs b/apps/labrinth/src/routes/v3/statistics.rs
index 51144804..169ff000 100644
--- a/apps/labrinth/src/routes/v3/statistics.rs
+++ b/apps/labrinth/src/routes/v3/statistics.rs
@@ -1,5 +1,5 @@
 use crate::routes::ApiError;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 use sqlx::PgPool;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
diff --git a/apps/labrinth/src/routes/v3/tags.rs b/apps/labrinth/src/routes/v3/tags.rs
index d7d5b251..20b46b83 100644
--- a/apps/labrinth/src/routes/v3/tags.rs
+++ b/apps/labrinth/src/routes/v3/tags.rs
@@ -8,7 +8,7 @@ use crate::database::models::loader_fields::{
     Game, Loader, LoaderField, LoaderFieldEnumValue, LoaderFieldType,
 };
 use crate::database::redis::RedisPool;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 
 use itertools::Itertools;
 use serde_json::Value;
@@ -156,7 +156,7 @@ pub async fn loader_fields_list(
                 "'{}' is not an enumerable field, but an '{}' field.",
                 query.loader_field,
                 loader_field.field_type.to_str()
-            )))
+            )));
         }
     };
 
diff --git a/apps/labrinth/src/routes/v3/teams.rs b/apps/labrinth/src/routes/v3/teams.rs
index e6f9ecd7..aab221c2 100644
--- a/apps/labrinth/src/routes/v3/teams.rs
+++ b/apps/labrinth/src/routes/v3/teams.rs
@@ -1,19 +1,18 @@
 use crate::auth::checks::is_visible_project;
 use crate::auth::get_user_from_headers;
+use crate::database::DBProject;
 use crate::database::models::notification_item::NotificationBuilder;
 use crate::database::models::team_item::TeamAssociationId;
-use crate::database::models::{Organization, Team, TeamMember, User};
+use crate::database::models::{DBOrganization, DBTeam, DBTeamMember, DBUser};
 use crate::database::redis::RedisPool;
-use crate::database::Project;
+use crate::models::ids::TeamId;
 use crate::models::notifications::NotificationBody;
 use crate::models::pats::Scopes;
-use crate::models::teams::{
-    OrganizationPermissions, ProjectPermissions, TeamId,
-};
-use crate::models::users::UserId;
+use crate::models::teams::{OrganizationPermissions, ProjectPermissions};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
+use ariadne::ids::UserId;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
@@ -49,7 +48,8 @@ pub async fn team_members_get_project(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
     let project_data =
-        crate::database::models::Project::get(&string, &**pool, &redis).await?;
+        crate::database::models::DBProject::get(&string, &**pool, &redis)
+            .await?;
 
     if let Some(project) = project_data {
         let current_user = get_user_from_headers(
@@ -68,13 +68,13 @@ pub async fn team_members_get_project(
         {
             return Err(ApiError::NotFound);
         }
-        let members_data = TeamMember::get_from_team_full(
+        let members_data = DBTeamMember::get_from_team_full(
             project.inner.team_id,
             &**pool,
             &redis,
         )
         .await?;
-        let users = User::get_many_ids(
+        let users = DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
@@ -84,7 +84,7 @@ pub async fn team_members_get_project(
         let user_id = current_user.as_ref().map(|x| x.id.into());
         let logged_in = if let Some(user_id) = user_id {
             let (team_member, organization_team_member) =
-                TeamMember::get_for_project_permissions(
+                DBTeamMember::get_for_project_permissions(
                     &project.inner,
                     user_id,
                     &**pool,
@@ -102,7 +102,7 @@ pub async fn team_members_get_project(
                 logged_in
                     || x.accepted
                     || user_id
-                        .map(|y: crate::database::models::UserId| {
+                        .map(|y: crate::database::models::DBUserId| {
                             y == x.user_id
                         })
                         .unwrap_or(false)
@@ -133,7 +133,7 @@ pub async fn team_members_get_organization(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
     let organization_data =
-        crate::database::models::Organization::get(&string, &**pool, &redis)
+        crate::database::models::DBOrganization::get(&string, &**pool, &redis)
             .await?;
 
     if let Some(organization) = organization_data {
@@ -148,13 +148,13 @@ pub async fn team_members_get_organization(
         .map(|x| x.1)
         .ok();
 
-        let members_data = TeamMember::get_from_team_full(
+        let members_data = DBTeamMember::get_from_team_full(
             organization.team_id,
             &**pool,
             &redis,
         )
         .await?;
-        let users = crate::database::models::User::get_many_ids(
+        let users = crate::database::models::DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
@@ -177,7 +177,7 @@ pub async fn team_members_get_organization(
                 logged_in
                     || x.accepted
                     || user_id
-                        .map(|y: crate::database::models::UserId| {
+                        .map(|y: crate::database::models::DBUserId| {
                             y == x.user_id
                         })
                         .unwrap_or(false)
@@ -209,8 +209,8 @@ pub async fn team_members_get(
 ) -> Result<HttpResponse, ApiError> {
     let id = info.into_inner().0;
     let members_data =
-        TeamMember::get_from_team_full(id.into(), &**pool, &redis).await?;
-    let users = crate::database::models::User::get_many_ids(
+        DBTeamMember::get_from_team_full(id.into(), &**pool, &redis).await?;
+    let users = crate::database::models::DBUser::get_many_ids(
         &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
@@ -243,7 +243,7 @@ pub async fn team_members_get(
             logged_in
                 || x.accepted
                 || user_id
-                    .map(|y: crate::database::models::UserId| y == x.user_id)
+                    .map(|y: crate::database::models::DBUserId| y == x.user_id)
                     .unwrap_or(false)
         })
         .flat_map(|data| {
@@ -277,11 +277,12 @@ pub async fn teams_get(
     let team_ids = serde_json::from_str::<Vec<TeamId>>(&ids.ids)?
         .into_iter()
         .map(|x| x.into())
-        .collect::<Vec<crate::database::models::ids::TeamId>>();
+        .collect::<Vec<crate::database::models::ids::DBTeamId>>();
 
     let teams_data =
-        TeamMember::get_from_team_full_many(&team_ids, &**pool, &redis).await?;
-    let users = crate::database::models::User::get_many_ids(
+        DBTeamMember::get_from_team_full_many(&team_ids, &**pool, &redis)
+            .await?;
+    let users = crate::database::models::DBUser::get_many_ids(
         &teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
@@ -299,7 +300,7 @@ pub async fn teams_get(
     .map(|x| x.1)
     .ok();
 
-    let teams_groups = teams_data.into_iter().group_by(|data| data.team_id.0);
+    let teams_groups = teams_data.into_iter().chunk_by(|data| data.team_id.0);
 
     let mut teams: Vec<Vec<crate::models::teams::TeamMember>> = vec![];
 
@@ -352,7 +353,7 @@ pub async fn join_team(
     .await?
     .1;
 
-    let member = TeamMember::get_from_user_id_pending(
+    let member = DBTeamMember::get_from_user_id_pending(
         team_id,
         current_user.id.into(),
         &**pool,
@@ -368,7 +369,7 @@ pub async fn join_team(
         let mut transaction = pool.begin().await?;
 
         // Edit Team Member to set Accepted to True
-        TeamMember::edit_team_member(
+        DBTeamMember::edit_team_member(
             team_id,
             current_user.id.into(),
             None,
@@ -384,8 +385,8 @@ pub async fn join_team(
 
         transaction.commit().await?;
 
-        User::clear_project_cache(&[current_user.id.into()], &redis).await?;
-        TeamMember::clear_cache(team_id, &redis).await?;
+        DBUser::clear_project_cache(&[current_user.id.into()], &redis).await?;
+        DBTeamMember::clear_cache(team_id, &redis).await?;
     } else {
         return Err(ApiError::InvalidInput(
             "There is no pending request from this team".to_string(),
@@ -440,27 +441,30 @@ pub async fn add_team_member(
     )
     .await?
     .1;
-    let team_association = Team::get_association(team_id, &**pool)
+    let team_association = DBTeam::get_association(team_id, &**pool)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
                 "The team specified does not exist".to_string(),
             )
         })?;
-    let member =
-        TeamMember::get_from_user_id(team_id, current_user.id.into(), &**pool)
-            .await?;
+    let member = DBTeamMember::get_from_user_id(
+        team_id,
+        current_user.id.into(),
+        &**pool,
+    )
+    .await?;
     match team_association {
         // If team is associated with a project, check if they have permissions to invite users to that project
         TeamAssociationId::Project(pid) => {
             let organization =
-                Organization::get_associated_organization_project_id(
+                DBOrganization::get_associated_organization_project_id(
                     pid, &**pool,
                 )
                 .await?;
             let organization_team_member =
                 if let Some(organization) = &organization {
-                    TeamMember::get_from_user_id(
+                    DBTeamMember::get_from_user_id(
                         organization.team_id,
                         current_user.id.into(),
                         &**pool,
@@ -538,7 +542,7 @@ pub async fn add_team_member(
         ));
     }
 
-    let request = TeamMember::get_from_user_id_pending(
+    let request = DBTeamMember::get_from_user_id_pending(
         team_id,
         new_member.user_id.into(),
         &**pool,
@@ -557,7 +561,7 @@ pub async fn add_team_member(
             ));
         }
     }
-    let new_user = crate::database::models::User::get_id(
+    let new_user = crate::database::models::DBUser::get_id(
         new_member.user_id.into(),
         &**pool,
         &redis,
@@ -571,11 +575,13 @@ pub async fn add_team_member(
     if let TeamAssociationId::Project(pid) = team_association {
         // We cannot add the owner to a project team in their own org
         let organization =
-            Organization::get_associated_organization_project_id(pid, &**pool)
-                .await?;
+            DBOrganization::get_associated_organization_project_id(
+                pid, &**pool,
+            )
+            .await?;
         let new_user_organization_team_member =
             if let Some(organization) = &organization {
-                TeamMember::get_from_user_id(
+                DBTeamMember::get_from_user_id(
                     organization.team_id,
                     new_user.id,
                     &**pool,
@@ -608,7 +614,7 @@ pub async fn add_team_member(
     let new_id =
         crate::database::models::ids::generate_team_member_id(&mut transaction)
             .await?;
-    TeamMember {
+    DBTeamMember {
         id: new_id,
         team_id,
         user_id: new_member.user_id.into(),
@@ -654,8 +660,8 @@ pub async fn add_team_member(
     }
 
     transaction.commit().await?;
-    TeamMember::clear_cache(team_id, &redis).await?;
-    User::clear_project_cache(&[new_member.user_id.into()], &redis).await?;
+    DBTeamMember::clear_cache(team_id, &redis).await?;
+    DBUser::clear_project_cache(&[new_member.user_id.into()], &redis).await?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -692,16 +698,16 @@ pub async fn edit_team_member(
     .1;
 
     let team_association =
-        Team::get_association(id, &**pool).await?.ok_or_else(|| {
+        DBTeam::get_association(id, &**pool).await?.ok_or_else(|| {
             ApiError::InvalidInput(
                 "The team specified does not exist".to_string(),
             )
         })?;
     let member =
-        TeamMember::get_from_user_id(id, current_user.id.into(), &**pool)
+        DBTeamMember::get_from_user_id(id, current_user.id.into(), &**pool)
             .await?;
     let edit_member_db =
-        TeamMember::get_from_user_id_pending(id, user_id, &**pool)
+        DBTeamMember::get_from_user_id_pending(id, user_id, &**pool)
             .await?
             .ok_or_else(|| {
                 ApiError::CustomAuthentication(
@@ -724,13 +730,13 @@ pub async fn edit_team_member(
     match team_association {
         TeamAssociationId::Project(project_id) => {
             let organization =
-                Organization::get_associated_organization_project_id(
+                DBOrganization::get_associated_organization_project_id(
                     project_id, &**pool,
                 )
                 .await?;
             let organization_team_member =
                 if let Some(organization) = &organization {
-                    TeamMember::get_from_user_id(
+                    DBTeamMember::get_from_user_id(
                         organization.team_id,
                         current_user.id.into(),
                         &**pool,
@@ -832,7 +838,7 @@ pub async fn edit_team_member(
         }
     }
 
-    TeamMember::edit_team_member(
+    DBTeamMember::edit_team_member(
         id,
         user_id,
         edit_member.permissions,
@@ -847,7 +853,7 @@ pub async fn edit_team_member(
     .await?;
 
     transaction.commit().await?;
-    TeamMember::clear_cache(id, &redis).await?;
+    DBTeamMember::clear_cache(id, &redis).await?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -880,9 +886,10 @@ pub async fn transfer_ownership(
     // Forbid transferring ownership of a project team that is owned by an organization
     // These are owned by the organization owner, and must be removed from the organization first
     // There shouldnt be an ownr on these projects in these cases, but just in case.
-    let team_association_id = Team::get_association(id.into(), &**pool).await?;
+    let team_association_id =
+        DBTeam::get_association(id.into(), &**pool).await?;
     if let Some(TeamAssociationId::Project(pid)) = team_association_id {
-        let result = Project::get_id(pid, &**pool, &redis).await?;
+        let result = DBProject::get_id(pid, &**pool, &redis).await?;
         if let Some(project_item) = result {
             if project_item.inner.organization_id.is_some() {
                 return Err(ApiError::InvalidInput(
@@ -894,7 +901,7 @@ pub async fn transfer_ownership(
     }
 
     if !current_user.role.is_admin() {
-        let member = TeamMember::get_from_user_id(
+        let member = DBTeamMember::get_from_user_id(
             id.into(),
             current_user.id.into(),
             &**pool,
@@ -915,7 +922,7 @@ pub async fn transfer_ownership(
         }
     }
 
-    let new_member = TeamMember::get_from_user_id(
+    let new_member = DBTeamMember::get_from_user_id(
         id.into(),
         new_owner.user_id.into(),
         &**pool,
@@ -937,12 +944,12 @@ pub async fn transfer_ownership(
 
     // The following are the only places new_is_owner is modified.
     if let Some(former_owner) =
-        TeamMember::get_from_team_full(id.into(), &**pool, &redis)
+        DBTeamMember::get_from_team_full(id.into(), &**pool, &redis)
             .await?
             .into_iter()
             .find(|x| x.is_owner)
     {
-        TeamMember::edit_team_member(
+        DBTeamMember::edit_team_member(
             id.into(),
             former_owner.user_id,
             None,
@@ -957,7 +964,7 @@ pub async fn transfer_ownership(
         .await?;
     }
 
-    TeamMember::edit_team_member(
+    DBTeamMember::edit_team_member(
         id.into(),
         new_owner.user_id.into(),
         Some(ProjectPermissions::all()),
@@ -997,14 +1004,15 @@ pub async fn transfer_ownership(
             .fetch_all(&mut *transaction)
             .await?;
 
-            let team_ids: Vec<crate::database::models::ids::TeamId> = team_ids
-                .into_iter()
-                .map(|x| TeamId(x.team_id as u64).into())
-                .collect();
+            let team_ids: Vec<crate::database::models::ids::DBTeamId> =
+                team_ids
+                    .into_iter()
+                    .map(|x| TeamId(x.team_id as u64).into())
+                    .collect();
 
             // If the owner of the organization is a member of the project, remove them
             for team_id in team_ids.iter() {
-                TeamMember::delete(
+                DBTeamMember::delete(
                     *team_id,
                     new_owner.user_id.into(),
                     &mut transaction,
@@ -1018,9 +1026,9 @@ pub async fn transfer_ownership(
         };
 
     transaction.commit().await?;
-    TeamMember::clear_cache(id.into(), &redis).await?;
+    DBTeamMember::clear_cache(id.into(), &redis).await?;
     for team_id in project_teams_edited {
-        TeamMember::clear_cache(team_id, &redis).await?;
+        DBTeamMember::clear_cache(team_id, &redis).await?;
     }
 
     Ok(HttpResponse::NoContent().body(""))
@@ -1048,17 +1056,17 @@ pub async fn remove_team_member(
     .1;
 
     let team_association =
-        Team::get_association(id, &**pool).await?.ok_or_else(|| {
+        DBTeam::get_association(id, &**pool).await?.ok_or_else(|| {
             ApiError::InvalidInput(
                 "The team specified does not exist".to_string(),
             )
         })?;
     let member =
-        TeamMember::get_from_user_id(id, current_user.id.into(), &**pool)
+        DBTeamMember::get_from_user_id(id, current_user.id.into(), &**pool)
             .await?;
 
     let delete_member =
-        TeamMember::get_from_user_id_pending(id, user_id, &**pool).await?;
+        DBTeamMember::get_from_user_id_pending(id, user_id, &**pool).await?;
 
     if let Some(delete_member) = delete_member {
         if delete_member.is_owner {
@@ -1074,13 +1082,13 @@ pub async fn remove_team_member(
         match team_association {
             TeamAssociationId::Project(pid) => {
                 let organization =
-                    Organization::get_associated_organization_project_id(
+                    DBOrganization::get_associated_organization_project_id(
                         pid, &**pool,
                     )
                     .await?;
                 let organization_team_member =
                     if let Some(organization) = &organization {
-                        TeamMember::get_from_user_id(
+                        DBTeamMember::get_from_user_id(
                             organization.team_id,
                             current_user.id.into(),
                             &**pool,
@@ -1105,7 +1113,7 @@ pub async fn remove_team_member(
                             .contains(ProjectPermissions::REMOVE_MEMBER)
                     // true as if the permission exists, but the member does not, they are part of an org
                     {
-                        TeamMember::delete(id, user_id, &mut transaction)
+                        DBTeamMember::delete(id, user_id, &mut transaction)
                             .await?;
                     } else {
                         return Err(ApiError::CustomAuthentication(
@@ -1121,7 +1129,7 @@ pub async fn remove_team_member(
                     // This is a pending invite rather than a member, so the
                     // user being invited or team members with the MANAGE_INVITES
                     // permission can remove it.
-                    TeamMember::delete(id, user_id, &mut transaction).await?;
+                    DBTeamMember::delete(id, user_id, &mut transaction).await?;
                 } else {
                     return Err(ApiError::CustomAuthentication(
                         "You do not have permission to cancel a team invite"
@@ -1144,7 +1152,7 @@ pub async fn remove_team_member(
                         || organization_permissions
                             .contains(OrganizationPermissions::REMOVE_MEMBER)
                     {
-                        TeamMember::delete(id, user_id, &mut transaction)
+                        DBTeamMember::delete(id, user_id, &mut transaction)
                             .await?;
                     } else {
                         return Err(ApiError::CustomAuthentication(
@@ -1160,7 +1168,7 @@ pub async fn remove_team_member(
                     // This is a pending invite rather than a member, so the
                     // user being invited or team members with the MANAGE_INVITES
                     // permission can remove it.
-                    TeamMember::delete(id, user_id, &mut transaction).await?;
+                    DBTeamMember::delete(id, user_id, &mut transaction).await?;
                 } else {
                     return Err(ApiError::CustomAuthentication(
                         "You do not have permission to cancel an organization invite".to_string(),
@@ -1171,8 +1179,8 @@ pub async fn remove_team_member(
 
         transaction.commit().await?;
 
-        TeamMember::clear_cache(id, &redis).await?;
-        User::clear_project_cache(&[delete_member.user_id], &redis).await?;
+        DBTeamMember::clear_cache(id, &redis).await?;
+        DBUser::clear_project_cache(&[delete_member.user_id], &redis).await?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
diff --git a/apps/labrinth/src/routes/v3/threads.rs b/apps/labrinth/src/routes/v3/threads.rs
index ef500e94..7dcca96a 100644
--- a/apps/labrinth/src/routes/v3/threads.rs
+++ b/apps/labrinth/src/routes/v3/threads.rs
@@ -7,16 +7,16 @@ use crate::database::models::notification_item::NotificationBuilder;
 use crate::database::models::thread_item::ThreadMessageBuilder;
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
-use crate::models::ids::ThreadMessageId;
+use crate::models::ids::{ThreadId, ThreadMessageId};
 use crate::models::images::{Image, ImageContext};
 use crate::models::notifications::NotificationBody;
 use crate::models::pats::Scopes;
 use crate::models::projects::ProjectStatus;
-use crate::models::threads::{MessageBody, Thread, ThreadId, ThreadType};
+use crate::models::threads::{MessageBody, Thread, ThreadType};
 use crate::models::users::User;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use futures::TryStreamExt;
 use serde::Deserialize;
 use sqlx::PgPool;
@@ -34,7 +34,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
 }
 
 pub async fn is_authorized_thread(
-    thread: &database::models::Thread,
+    thread: &database::models::DBThread,
     user: &User,
     pool: &PgPool,
 ) -> Result<bool, ApiError> {
@@ -42,14 +42,14 @@ pub async fn is_authorized_thread(
         return Ok(true);
     }
 
-    let user_id: database::models::UserId = user.id.into();
+    let user_id: database::models::DBUserId = user.id.into();
     Ok(match thread.type_ {
         ThreadType::Report => {
             if let Some(report_id) = thread.report_id {
                 let report_exists = sqlx::query!(
                     "SELECT EXISTS(SELECT 1 FROM reports WHERE id = $1 AND reporter = $2)",
-                    report_id as database::models::ids::ReportId,
-                    user_id as database::models::ids::UserId,
+                    report_id as database::models::ids::DBReportId,
+                    user_id as database::models::ids::DBUserId,
                 )
                 .fetch_one(pool)
                 .await?
@@ -64,8 +64,8 @@ pub async fn is_authorized_thread(
             if let Some(project_id) = thread.project_id {
                 let project_exists = sqlx::query!(
                     "SELECT EXISTS(SELECT 1 FROM mods m INNER JOIN team_members tm ON tm.team_id = m.team_id AND tm.user_id = $2 WHERE m.id = $1)",
-                    project_id as database::models::ids::ProjectId,
-                    user_id as database::models::ids::UserId,
+                    project_id as database::models::ids::DBProjectId,
+                    user_id as database::models::ids::DBUserId,
                 )
                     .fetch_one(pool)
                     .await?
@@ -74,8 +74,8 @@ pub async fn is_authorized_thread(
                 if !project_exists.unwrap_or(false) {
                     let org_exists = sqlx::query!(
                         "SELECT EXISTS(SELECT 1 FROM mods m INNER JOIN organizations o ON m.organization_id = o.id INNER JOIN team_members tm ON tm.team_id = o.team_id AND tm.user_id = $2 WHERE m.id = $1)",
-                        project_id as database::models::ids::ProjectId,
-                        user_id as database::models::ids::UserId,
+                        project_id as database::models::ids::DBProjectId,
+                        user_id as database::models::ids::DBUserId,
                     )
                         .fetch_one(pool)
                         .await?
@@ -94,12 +94,12 @@ pub async fn is_authorized_thread(
 }
 
 pub async fn filter_authorized_threads(
-    threads: Vec<database::models::Thread>,
+    threads: Vec<database::models::DBThread>,
     user: &User,
     pool: &web::Data<PgPool>,
     redis: &RedisPool,
 ) -> Result<Vec<Thread>, ApiError> {
-    let user_id: database::models::UserId = user.id.into();
+    let user_id: database::models::DBUserId = user.id.into();
 
     let mut return_threads = Vec::new();
     let mut check_threads = Vec::new();
@@ -130,7 +130,7 @@ pub async fn filter_authorized_threads(
                 WHERE m.id = ANY($1)
                 ",
                 &*project_thread_ids,
-                user_id as database::models::ids::UserId,
+                user_id as database::models::ids::DBUserId,
             )
             .fetch(&***pool)
             .map_ok(|row| {
@@ -163,7 +163,7 @@ pub async fn filter_authorized_threads(
                 WHERE m.id = ANY($1)
                 ",
                 &*project_thread_ids,
-                user_id as database::models::ids::UserId,
+                user_id as database::models::ids::DBUserId,
             )
             .fetch(&***pool)
             .map_ok(|row| {
@@ -194,7 +194,7 @@ pub async fn filter_authorized_threads(
                 WHERE id = ANY($1) AND reporter = $2
                 ",
                 &*report_thread_ids,
-                user_id as database::models::ids::UserId,
+                user_id as database::models::ids::DBUserId,
             )
             .fetch(&***pool)
             .map_ok(|row| {
@@ -216,7 +216,7 @@ pub async fn filter_authorized_threads(
     let mut user_ids = return_threads
         .iter()
         .flat_map(|x| x.members.clone())
-        .collect::<Vec<database::models::UserId>>();
+        .collect::<Vec<database::models::DBUserId>>();
     user_ids.append(
         &mut return_threads
             .iter()
@@ -226,11 +226,11 @@ pub async fn filter_authorized_threads(
                     .filter_map(|x| x.author_id)
                     .collect::<Vec<_>>()
             })
-            .collect::<Vec<database::models::UserId>>(),
+            .collect::<Vec<database::models::DBUserId>>(),
     );
 
     let users: Vec<User> =
-        database::models::User::get_many_ids(&user_ids, &***pool, redis)
+        database::models::DBUser::get_many_ids(&user_ids, &***pool, redis)
             .await?
             .into_iter()
             .map(From::from)
@@ -278,7 +278,7 @@ pub async fn thread_get(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0.into();
 
-    let thread_data = database::models::Thread::get(string, &**pool).await?;
+    let thread_data = database::models::DBThread::get(string, &**pool).await?;
 
     let user = get_user_from_headers(
         &req,
@@ -308,12 +308,13 @@ pub async fn thread_get(
                     .collect::<Vec<_>>(),
             );
 
-            let users: Vec<User> =
-                database::models::User::get_many_ids(authors, &**pool, &redis)
-                    .await?
-                    .into_iter()
-                    .map(From::from)
-                    .collect();
+            let users: Vec<User> = database::models::DBUser::get_many_ids(
+                authors, &**pool, &redis,
+            )
+            .await?
+            .into_iter()
+            .map(From::from)
+            .collect();
 
             return Ok(
                 HttpResponse::Ok().json(Thread::from(data, users, &user))
@@ -345,14 +346,14 @@ pub async fn threads_get(
     .await?
     .1;
 
-    let thread_ids: Vec<database::models::ids::ThreadId> =
+    let thread_ids: Vec<database::models::ids::DBThreadId> =
         serde_json::from_str::<Vec<ThreadId>>(&ids.ids)?
             .into_iter()
             .map(|x| x.into())
             .collect();
 
     let threads_data =
-        database::models::Thread::get_many(&thread_ids, &**pool).await?;
+        database::models::DBThread::get_many(&thread_ids, &**pool).await?;
 
     let threads =
         filter_authorized_threads(threads_data, &user, &pool, &redis).await?;
@@ -383,7 +384,7 @@ pub async fn thread_send_message(
     .await?
     .1;
 
-    let string: database::models::ThreadId = info.into_inner().0.into();
+    let string: database::models::DBThreadId = info.into_inner().0.into();
 
     if let MessageBody::Text {
         body,
@@ -405,7 +406,7 @@ pub async fn thread_send_message(
         }
 
         if let Some(replying_to) = replying_to {
-            let thread_message = database::models::ThreadMessage::get(
+            let thread_message = database::models::DBThreadMessage::get(
                 (*replying_to).into(),
                 &**pool,
             )
@@ -430,7 +431,7 @@ pub async fn thread_send_message(
         ));
     }
 
-    let result = database::models::Thread::get(string, &**pool).await?;
+    let result = database::models::DBThread::get(string, &**pool).await?;
 
     if let Some(thread) = result {
         if !is_authorized_thread(&thread, &user, &pool).await? {
@@ -449,16 +450,17 @@ pub async fn thread_send_message(
         .await?;
 
         if let Some(project_id) = thread.project_id {
-            let project =
-                database::models::Project::get_id(project_id, &**pool, &redis)
-                    .await?;
+            let project = database::models::DBProject::get_id(
+                project_id, &**pool, &redis,
+            )
+            .await?;
 
             if let Some(project) = project {
                 if project.inner.status != ProjectStatus::Processing
                     && user.role.is_mod()
                 {
                     let members =
-                        database::models::TeamMember::get_from_team_full(
+                        database::models::DBTeamMember::get_from_team_full(
                             project.inner.team_id,
                             &**pool,
                             &redis,
@@ -482,9 +484,10 @@ pub async fn thread_send_message(
                 }
             }
         } else if let Some(report_id) = thread.report_id {
-            let report =
-                database::models::report_item::Report::get(report_id, &**pool)
-                    .await?;
+            let report = database::models::report_item::DBReport::get(
+                report_id, &**pool,
+            )
+            .await?;
 
             if let Some(report) = report {
                 if report.closed && !user.role.is_mod() {
@@ -513,7 +516,7 @@ pub async fn thread_send_message(
         } = &new_message.body
         {
             for image_id in associated_images {
-                if let Some(db_image) = image_item::Image::get(
+                if let Some(db_image) = image_item::DBImage::get(
                     (*image_id).into(),
                     &mut *transaction,
                     &redis,
@@ -527,8 +530,7 @@ pub async fn thread_send_message(
                     ) || image.context.inner_id().is_some()
                     {
                         return Err(ApiError::InvalidInput(format!(
-                            "Image {} is not unused and in the 'thread_message' context",
-                            image_id
+                            "Image {image_id} is not unused and in the 'thread_message' context"
                         )));
                     }
 
@@ -544,12 +546,11 @@ pub async fn thread_send_message(
                     .execute(&mut *transaction)
                     .await?;
 
-                    image_item::Image::clear_cache(image.id.into(), &redis)
+                    image_item::DBImage::clear_cache(image.id.into(), &redis)
                         .await?;
                 } else {
                     return Err(ApiError::InvalidInput(format!(
-                        "Image {} does not exist",
-                        image_id
+                        "Image {image_id} does not exist"
                     )));
                 }
             }
@@ -581,7 +582,7 @@ pub async fn message_delete(
     .await?
     .1;
 
-    let result = database::models::ThreadMessage::get(
+    let result = database::models::DBThreadMessage::get(
         info.into_inner().0.into(),
         &**pool,
     )
@@ -600,7 +601,7 @@ pub async fn message_delete(
             thread_message_id: Some(thread.id.into()),
         };
         let images =
-            database::Image::get_many_contexted(context, &mut transaction)
+            database::DBImage::get_many_contexted(context, &mut transaction)
                 .await?;
         let cdn_url = dotenvy::var("CDN_URL")?;
         for image in images {
@@ -608,7 +609,8 @@ pub async fn message_delete(
             if let Some(icon_path) = name {
                 file_host.delete_file_version("", icon_path).await?;
             }
-            database::Image::remove(image.id, &mut transaction, &redis).await?;
+            database::DBImage::remove(image.id, &mut transaction, &redis)
+                .await?;
         }
 
         let private = if let MessageBody::Text { private, .. } = thread.body {
@@ -619,7 +621,7 @@ pub async fn message_delete(
             false
         };
 
-        database::models::ThreadMessage::remove_full(
+        database::models::DBThreadMessage::remove_full(
             thread.id,
             private,
             &mut transaction,
diff --git a/apps/labrinth/src/routes/v3/users.rs b/apps/labrinth/src/routes/v3/users.rs
index 987bfa52..625a1e0a 100644
--- a/apps/labrinth/src/routes/v3/users.rs
+++ b/apps/labrinth/src/routes/v3/users.rs
@@ -1,21 +1,13 @@
 use std::{collections::HashMap, sync::Arc};
 
-use actix_web::{web, HttpRequest, HttpResponse};
-use lazy_static::lazy_static;
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-use sqlx::PgPool;
-use validator::Validate;
-
-use super::{oauth_clients::get_user_clients, ApiError};
+use super::{ApiError, oauth_clients::get_user_clients};
 use crate::util::img::delete_old_images;
 use crate::{
     auth::{filter_visible_projects, get_user_from_headers},
-    database::{models::User, redis::RedisPool},
+    database::{models::DBUser, redis::RedisPool},
     file_hosting::FileHost,
     models::{
         collections::{Collection, CollectionStatus},
-        ids::UserId,
         notifications::Notification,
         pats::Scopes,
         projects::Project,
@@ -24,6 +16,11 @@ use crate::{
     queue::session::AuthQueue,
     util::{routes::read_from_payload, validate::validation_errors_to_string},
 };
+use actix_web::{HttpRequest, HttpResponse, web};
+use ariadne::ids::UserId;
+use serde::{Deserialize, Serialize};
+use sqlx::PgPool;
+use validator::Validate;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.route("user", web::get().to(user_auth_get));
@@ -91,9 +88,12 @@ pub async fn admin_user_email(
         )
     })?;
 
-    let user =
-        User::get_id(crate::database::models::UserId(user_id), &**pool, &redis)
-            .await?;
+    let user = DBUser::get_id(
+        crate::database::models::DBUserId(user_id),
+        &**pool,
+        &redis,
+    )
+    .await?;
 
     if let Some(user) = user {
         Ok(HttpResponse::Ok().json(user))
@@ -120,12 +120,12 @@ pub async fn projects_list(
     .map(|x| x.1)
     .ok();
 
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(id) = id_option.map(|x| x.id) {
-        let project_data = User::get_projects(id, &**pool, &redis).await?;
+        let project_data = DBUser::get_projects(id, &**pool, &redis).await?;
 
-        let projects: Vec<_> = crate::database::Project::get_many_ids(
+        let projects: Vec<_> = crate::database::DBProject::get_many_ids(
             &project_data,
             &**pool,
             &redis,
@@ -177,7 +177,7 @@ pub async fn users_get(
 ) -> Result<HttpResponse, ApiError> {
     let user_ids = serde_json::from_str::<Vec<String>>(&ids.ids)?;
 
-    let users_data = User::get_many(&user_ids, &**pool, &redis).await?;
+    let users_data = DBUser::get_many(&user_ids, &**pool, &redis).await?;
 
     let users: Vec<crate::models::users::User> =
         users_data.into_iter().map(From::from).collect();
@@ -192,7 +192,7 @@ pub async fn user_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let user_data = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let user_data = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(data) = user_data {
         let auth_user = get_user_from_headers(
@@ -237,7 +237,7 @@ pub async fn collections_list(
     .map(|x| x.1)
     .ok();
 
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(id) = id_option.map(|x| x.id) {
         let user_id: UserId = id.into();
@@ -246,9 +246,9 @@ pub async fn collections_list(
             .map(|y| y.role.is_mod() || y.id == user_id)
             .unwrap_or(false);
 
-        let project_data = User::get_collections(id, &**pool).await?;
+        let project_data = DBUser::get_collections(id, &**pool).await?;
 
-        let response: Vec<_> = crate::database::models::Collection::get_many(
+        let response: Vec<_> = crate::database::models::DBCollection::get_many(
             &project_data,
             &**pool,
             &redis,
@@ -285,13 +285,13 @@ pub async fn orgs_list(
     .map(|x| x.1)
     .ok();
 
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(id) = id_option.map(|x| x.id) {
-        let org_data = User::get_organizations(id, &**pool).await?;
+        let org_data = DBUser::get_organizations(id, &**pool).await?;
 
         let organizations_data =
-            crate::database::models::organization_item::Organization::get_many_ids(
+            crate::database::models::organization_item::DBOrganization::get_many_ids(
                 &org_data, &**pool, &redis,
             )
             .await?;
@@ -302,11 +302,11 @@ pub async fn orgs_list(
             .collect::<Vec<_>>();
 
         let teams_data =
-            crate::database::models::TeamMember::get_from_team_full_many(
+            crate::database::models::DBTeamMember::get_from_team_full_many(
                 &team_ids, &**pool, &redis,
             )
             .await?;
-        let users = User::get_many_ids(
+        let users = DBUser::get_many_ids(
             &teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
@@ -358,13 +358,9 @@ pub async fn orgs_list(
     }
 }
 
-lazy_static! {
-    static ref RE_URL_SAFE: Regex = Regex::new(r"^[a-zA-Z0-9_-]*$").unwrap();
-}
-
 #[derive(Serialize, Deserialize, Validate)]
 pub struct EditUser {
-    #[validate(length(min = 1, max = 39), regex = "RE_URL_SAFE")]
+    #[validate(length(min = 1, max = 39), regex(path = *crate::util::validate::RE_USERNAME))]
     pub username: Option<String>,
     #[serde(
         default,
@@ -401,7 +397,7 @@ pub async fn user_edit(
         ApiError::Validation(validation_errors_to_string(err, None))
     })?;
 
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(actual_user) = id_option {
         let id = actual_user.id;
@@ -412,7 +408,7 @@ pub async fn user_edit(
 
             if let Some(username) = &new_user.username {
                 let existing_user_id_option =
-                    User::get(username, &**pool, &redis).await?;
+                    DBUser::get(username, &**pool, &redis).await?;
 
                 if existing_user_id_option
                     .map(|x| UserId::from(x.id))
@@ -426,7 +422,7 @@ pub async fn user_edit(
                         WHERE (id = $2)
                         ",
                         username,
-                        id as crate::database::models::ids::UserId,
+                        id as crate::database::models::ids::DBUserId,
                     )
                     .execute(&mut *transaction)
                     .await?;
@@ -445,7 +441,7 @@ pub async fn user_edit(
                     WHERE (id = $2)
                     ",
                     bio.as_deref(),
-                    id as crate::database::models::ids::UserId,
+                    id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -468,7 +464,7 @@ pub async fn user_edit(
                     WHERE (id = $2)
                     ",
                     role,
-                    id as crate::database::models::ids::UserId,
+                    id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -489,7 +485,7 @@ pub async fn user_edit(
                     WHERE (id = $2)
                     ",
                     badges.bits() as i64,
-                    id as crate::database::models::ids::UserId,
+                    id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -510,7 +506,7 @@ pub async fn user_edit(
                     WHERE (id = $2)
                     ",
                     venmo_handle,
-                    id as crate::database::models::ids::UserId,
+                    id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -524,14 +520,14 @@ pub async fn user_edit(
                     WHERE (id = $2)
                     ",
                     allow_friend_requests,
-                    id as crate::database::models::ids::UserId,
+                    id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut *transaction)
                 .await?;
             }
 
             transaction.commit().await?;
-            User::clear_caches(&[(id, Some(actual_user.username))], &redis)
+            DBUser::clear_caches(&[(id, Some(actual_user.username))], &redis)
                 .await?;
             Ok(HttpResponse::NoContent().body(""))
         } else {
@@ -569,7 +565,7 @@ pub async fn user_icon_edit(
     )
     .await?
     .1;
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(actual_user) = id_option {
         if user.id != actual_user.id.into() && !user.role.is_mod() {
@@ -595,7 +591,7 @@ pub async fn user_icon_edit(
 
         let user_id: UserId = actual_user.id.into();
         let upload_result = crate::util::img::upload_image_optimized(
-            &format!("data/{}", user_id),
+            &format!("data/{user_id}"),
             bytes.freeze(),
             &ext.ext,
             Some(96),
@@ -612,11 +608,11 @@ pub async fn user_icon_edit(
             ",
             upload_result.url,
             upload_result.raw_url,
-            actual_user.id as crate::database::models::ids::UserId,
+            actual_user.id as crate::database::models::ids::DBUserId,
         )
         .execute(&**pool)
         .await?;
-        User::clear_caches(&[(actual_user.id, None)], &redis).await?;
+        DBUser::clear_caches(&[(actual_user.id, None)], &redis).await?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
@@ -641,7 +637,7 @@ pub async fn user_icon_delete(
     )
     .await?
     .1;
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(actual_user) = id_option {
         if user.id != actual_user.id.into() && !user.role.is_mod() {
@@ -664,12 +660,12 @@ pub async fn user_icon_delete(
             SET avatar_url = NULL, raw_avatar_url = NULL
             WHERE (id = $1)
             ",
-            actual_user.id as crate::database::models::ids::UserId,
+            actual_user.id as crate::database::models::ids::DBUserId,
         )
         .execute(&**pool)
         .await?;
 
-        User::clear_caches(&[(actual_user.id, None)], &redis).await?;
+        DBUser::clear_caches(&[(actual_user.id, None)], &redis).await?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
@@ -693,7 +689,7 @@ pub async fn user_delete(
     )
     .await?
     .1;
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(id) = id_option.map(|x| x.id) {
         if !user.role.is_admin() && user.id != id.into() {
@@ -704,7 +700,7 @@ pub async fn user_delete(
 
         let mut transaction = pool.begin().await?;
 
-        let result = User::remove(id, &mut transaction, &redis).await?;
+        let result = DBUser::remove(id, &mut transaction, &redis).await?;
 
         transaction.commit().await?;
 
@@ -734,7 +730,7 @@ pub async fn user_follows(
     )
     .await?
     .1;
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(id) = id_option.map(|x| x.id) {
         if !user.role.is_admin() && user.id != id.into() {
@@ -743,8 +739,8 @@ pub async fn user_follows(
             ));
         }
 
-        let project_ids = User::get_follows(id, &**pool).await?;
-        let projects: Vec<_> = crate::database::Project::get_many_ids(
+        let project_ids = DBUser::get_follows(id, &**pool).await?;
+        let projects: Vec<_> = crate::database::DBProject::get_many_ids(
             &project_ids,
             &**pool,
             &redis,
@@ -776,7 +772,7 @@ pub async fn user_notifications(
     )
     .await?
     .1;
-    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
 
     if let Some(id) = id_option.map(|x| x.id) {
         if !user.role.is_admin() && user.id != id.into() {
@@ -786,7 +782,7 @@ pub async fn user_notifications(
         }
 
         let mut notifications: Vec<Notification> =
-            crate::database::models::notification_item::Notification::get_many_user(
+            crate::database::models::notification_item::DBNotification::get_many_user(
                 id, &**pool, &redis,
             )
             .await?
diff --git a/apps/labrinth/src/routes/v3/version_creation.rs b/apps/labrinth/src/routes/v3/version_creation.rs
index 0b91cd0e..fcb0a91e 100644
--- a/apps/labrinth/src/routes/v3/version_creation.rs
+++ b/apps/labrinth/src/routes/v3/version_creation.rs
@@ -7,31 +7,34 @@ use crate::database::models::notification_item::NotificationBuilder;
 use crate::database::models::version_item::{
     DependencyBuilder, VersionBuilder, VersionFileBuilder,
 };
-use crate::database::models::{self, image_item, Organization};
+use crate::database::models::{self, DBOrganization, image_item};
 use crate::database::redis::RedisPool;
 use crate::file_hosting::FileHost;
-use crate::models::images::{Image, ImageContext, ImageId};
+use crate::models::ids::{ImageId, ProjectId, VersionId};
+use crate::models::images::{Image, ImageContext};
 use crate::models::notifications::NotificationBody;
 use crate::models::pack::PackFileHash;
 use crate::models::pats::Scopes;
-use crate::models::projects::{skip_nulls, DependencyType, ProjectStatus};
 use crate::models::projects::{
-    Dependency, FileType, Loader, ProjectId, Version, VersionFile, VersionId,
-    VersionStatus, VersionType,
+    Dependency, FileType, Loader, Version, VersionFile, VersionStatus,
+    VersionType,
 };
+use crate::models::projects::{DependencyType, ProjectStatus, skip_nulls};
 use crate::models::teams::ProjectPermissions;
 use crate::queue::moderation::AutomatedModerationQueue;
 use crate::queue::session::AuthQueue;
 use crate::util::routes::read_from_field;
 use crate::util::validate::validation_errors_to_string;
-use crate::validate::{validate_file, ValidationResult};
+use crate::validate::{ValidationResult, validate_file};
 use actix_multipart::{Field, Multipart};
 use actix_web::web::Data;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use chrono::Utc;
 use futures::stream::StreamExt;
+use hex::ToHex;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
+use sha1::Digest;
 use sqlx::postgres::PgPool;
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
@@ -50,7 +53,7 @@ pub struct InitialVersionData {
     pub file_parts: Vec<String>,
     #[validate(
         length(min = 1, max = 32),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub version_number: String,
     #[validate(
@@ -180,7 +183,7 @@ async fn version_create_inner(
         }
 
         let result = async {
-            let content_disposition = field.content_disposition().clone();
+            let content_disposition = field.content_disposition().unwrap().clone();
             let name = content_disposition.get_name().ok_or_else(|| {
                 CreateError::MissingValueError("Missing content name".to_string())
             })?;
@@ -210,10 +213,10 @@ async fn version_create_inner(
                     ));
                 }
 
-                let project_id: models::ProjectId = version_create_data.project_id.unwrap().into();
+                let project_id: models::DBProjectId = version_create_data.project_id.unwrap().into();
 
                 // Ensure that the project this version is being added to exists
-                if models::Project::get_id(project_id, &mut **transaction, redis)
+                if models::DBProject::get_id(project_id, &mut **transaction, redis)
                     .await?
                     .is_none()
                 {
@@ -224,7 +227,7 @@ async fn version_create_inner(
 
                 // Check that the user creating this version is a team member
                 // of the project the version is being added to.
-                let team_member = models::TeamMember::get_from_user_id_project(
+                let team_member = models::DBTeamMember::get_from_user_id_project(
                     project_id,
                     user.id.into(),
                     false,
@@ -233,14 +236,14 @@ async fn version_create_inner(
                 .await?;
 
                 // Get organization attached, if exists, and the member project permissions
-                let organization = models::Organization::get_associated_organization_project_id(
+                let organization = models::DBOrganization::get_associated_organization_project_id(
                     project_id,
                     &mut **transaction,
                 )
                 .await?;
 
                 let organization_team_member = if let Some(organization) = &organization {
-                    models::TeamMember::get_from_user_id(
+                    models::DBTeamMember::get_from_user_id(
                         organization.team_id,
                         user.id.into(),
                         &mut **transaction,
@@ -400,11 +403,11 @@ async fn version_create_inner(
         SELECT follower_id FROM mod_follows
         WHERE mod_id = $1
         ",
-        builder.project_id as crate::database::models::ids::ProjectId
+        builder.project_id as crate::database::models::ids::DBProjectId
     )
     .fetch(&mut **transaction)
-    .map_ok(|m| models::ids::UserId(m.follower_id))
-    .try_collect::<Vec<models::ids::UserId>>()
+    .map_ok(|m| models::ids::DBUserId(m.follower_id))
+    .try_collect::<Vec<models::ids::DBUserId>>()
     .await?;
 
     let project_id: ProjectId = builder.project_id.into();
@@ -478,7 +481,7 @@ async fn version_create_inner(
 
     for image_id in version_data.uploaded_images {
         if let Some(db_image) =
-            image_item::Image::get(image_id.into(), &mut **transaction, redis)
+            image_item::DBImage::get(image_id.into(), &mut **transaction, redis)
                 .await?
         {
             let image: Image = db_image.into();
@@ -486,8 +489,7 @@ async fn version_create_inner(
                 || image.context.inner_id().is_some()
             {
                 return Err(CreateError::InvalidInput(format!(
-                    "Image {} is not unused and in the 'version' context",
-                    image_id
+                    "Image {image_id} is not unused and in the 'version' context"
                 )));
             }
 
@@ -503,20 +505,19 @@ async fn version_create_inner(
             .execute(&mut **transaction)
             .await?;
 
-            image_item::Image::clear_cache(image.id.into(), redis).await?;
+            image_item::DBImage::clear_cache(image.id.into(), redis).await?;
         } else {
             return Err(CreateError::InvalidInput(format!(
-                "Image {} does not exist",
-                image_id
+                "Image {image_id} does not exist"
             )));
         }
     }
 
-    models::Project::clear_cache(project_id, None, Some(true), redis).await?;
+    models::DBProject::clear_cache(project_id, None, Some(true), redis).await?;
 
     let project_status = sqlx::query!(
         "SELECT status FROM mods WHERE id = $1",
-        project_id as models::ProjectId,
+        project_id as models::DBProjectId,
     )
     .fetch_optional(pool)
     .await?;
@@ -542,7 +543,7 @@ pub async fn upload_file_to_version(
     let mut transaction = client.begin().await?;
     let mut uploaded_files = Vec::new();
 
-    let version_id = models::VersionId::from(url_data.into_inner().0);
+    let version_id = models::DBVersionId::from(url_data.into_inner().0);
 
     let result = upload_file_to_version_inner(
         req,
@@ -585,7 +586,7 @@ async fn upload_file_to_version_inner(
     redis: Data<RedisPool>,
     file_host: &dyn FileHost,
     uploaded_files: &mut Vec<UploadedFile>,
-    version_id: models::VersionId,
+    version_id: models::DBVersionId,
     session_queue: &AuthQueue,
 ) -> Result<HttpResponse, CreateError> {
     let cdn_url = dotenvy::var("CDN_URL")?;
@@ -603,7 +604,7 @@ async fn upload_file_to_version_inner(
     .await?
     .1;
 
-    let result = models::Version::get(version_id, &**client, &redis).await?;
+    let result = models::DBVersion::get(version_id, &**client, &redis).await?;
 
     let version = match result {
         Some(v) => v,
@@ -628,7 +629,7 @@ async fn upload_file_to_version_inner(
         })
         .collect::<Result<Vec<_>, _>>()?;
 
-    if models::Project::get_id(
+    if models::DBProject::get_id(
         version.inner.project_id,
         &mut **transaction,
         &redis,
@@ -642,7 +643,7 @@ async fn upload_file_to_version_inner(
     }
 
     if !user.role.is_admin() {
-        let team_member = models::TeamMember::get_from_user_id_project(
+        let team_member = models::DBTeamMember::get_from_user_id_project(
             version.inner.project_id,
             user.id.into(),
             false,
@@ -651,7 +652,7 @@ async fn upload_file_to_version_inner(
         .await?;
 
         let organization =
-            Organization::get_associated_organization_project_id(
+            DBOrganization::get_associated_organization_project_id(
                 version.inner.project_id,
                 &**client,
             )
@@ -659,7 +660,7 @@ async fn upload_file_to_version_inner(
 
         let organization_team_member = if let Some(organization) = &organization
         {
-            models::TeamMember::get_from_user_id(
+            models::DBTeamMember::get_from_user_id(
                 organization.team_id,
                 user.id.into(),
                 &mut **transaction,
@@ -694,7 +695,8 @@ async fn upload_file_to_version_inner(
         }
 
         let result = async {
-            let content_disposition = field.content_disposition().clone();
+            let content_disposition =
+                field.content_disposition().unwrap().clone();
             let name = content_disposition.get_name().ok_or_else(|| {
                 CreateError::MissingValueError(
                     "Missing content name".to_string(),
@@ -780,7 +782,7 @@ async fn upload_file_to_version_inner(
     }
 
     // Clear version cache
-    models::Version::clear_cache(&version, &redis).await?;
+    models::DBVersion::clear_cache(&version, &redis).await?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -810,7 +812,7 @@ pub async fn upload_file(
 ) -> Result<(), CreateError> {
     let (file_name, file_extension) = get_name_ext(content_disposition)?;
 
-    if other_file_names.contains(&format!("{}.{}", file_name, file_extension)) {
+    if other_file_names.contains(&format!("{file_name}.{file_extension}")) {
         return Err(CreateError::InvalidInput(
             "Duplicate files are not allowed to be uploaded to Modrinth!"
                 .to_string(),
@@ -833,7 +835,7 @@ pub async fn upload_file(
         "Project file exceeds the maximum of 500MiB. Contact a moderator or admin to request permission to upload larger files."
     ).await?;
 
-    let hash = sha1::Sha1::from(&data).hexdigest();
+    let hash = sha1::Sha1::digest(&data).encode_hex::<String>();
     let exists = sqlx::query!(
         "
         SELECT EXISTS(SELECT 1 FROM hashes h
@@ -902,8 +904,8 @@ pub async fn upload_file(
                             .map(|x| x.as_bytes())
                 }) {
                     dependencies.push(DependencyBuilder {
-                        project_id: Some(models::ProjectId(dep.project_id)),
-                        version_id: Some(models::VersionId(dep.version_id)),
+                        project_id: Some(models::DBProjectId(dep.project_id)),
+                        version_id: Some(models::DBVersionId(dep.version_id)),
                         file_name: None,
                         dependency_type: DependencyType::Embedded.to_string(),
                     });
diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs
index 76bcd347..744aa8d9 100644
--- a/apps/labrinth/src/routes/v3/version_file.rs
+++ b/apps/labrinth/src/routes/v3/version_file.rs
@@ -8,7 +8,7 @@ use crate::models::projects::VersionType;
 use crate::models::teams::ProjectPermissions;
 use crate::queue::session::AuthQueue;
 use crate::{database, models};
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use dashmap::DashMap;
 use futures::TryStreamExt;
 use itertools::Itertools;
@@ -56,7 +56,7 @@ pub async fn get_version_from_hash(
         .algorithm
         .clone()
         .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
-    let file = database::models::Version::get_file_from_hash(
+    let file = database::models::DBVersion::get_file_from_hash(
         algorithm,
         hash,
         hash_query.version_id.map(|x| x.into()),
@@ -66,7 +66,7 @@ pub async fn get_version_from_hash(
     .await?;
     if let Some(file) = file {
         let version =
-            database::models::Version::get(file.version_id, &**pool, &redis)
+            database::models::DBVersion::get(file.version_id, &**pool, &redis)
                 .await?;
         if let Some(version) = version {
             if !is_visible_version(&version.inner, &user_option, &pool, &redis)
@@ -139,7 +139,7 @@ pub async fn get_update_from_hash(
     .map(|x| x.1)
     .ok();
     let hash = info.into_inner().0.to_lowercase();
-    if let Some(file) = database::models::Version::get_file_from_hash(
+    if let Some(file) = database::models::DBVersion::get_file_from_hash(
         hash_query
             .algorithm
             .clone()
@@ -151,11 +151,14 @@ pub async fn get_update_from_hash(
     )
     .await?
     {
-        if let Some(project) =
-            database::models::Project::get_id(file.project_id, &**pool, &redis)
-                .await?
+        if let Some(project) = database::models::DBProject::get_id(
+            file.project_id,
+            &**pool,
+            &redis,
+        )
+        .await?
         {
-            let mut versions = database::models::Version::get_many(
+            let mut versions = database::models::DBVersion::get_many(
                 &project.versions,
                 &**pool,
                 &redis,
@@ -241,7 +244,7 @@ pub async fn get_versions_from_hashes(
         .clone()
         .unwrap_or_else(|| default_algorithm_from_hashes(&file_data.hashes));
 
-    let files = database::models::Version::get_files_from_hash(
+    let files = database::models::DBVersion::get_files_from_hash(
         algorithm.clone(),
         &file_data.hashes,
         &**pool,
@@ -251,7 +254,7 @@ pub async fn get_versions_from_hashes(
 
     let version_ids = files.iter().map(|x| x.version_id).collect::<Vec<_>>();
     let versions_data = filter_visible_versions(
-        database::models::Version::get_many(&version_ids, &**pool, &redis)
+        database::models::DBVersion::get_many(&version_ids, &**pool, &redis)
             .await?,
         &user_option,
         &pool,
@@ -294,7 +297,7 @@ pub async fn get_projects_from_hashes(
         .algorithm
         .clone()
         .unwrap_or_else(|| default_algorithm_from_hashes(&file_data.hashes));
-    let files = database::models::Version::get_files_from_hash(
+    let files = database::models::DBVersion::get_files_from_hash(
         algorithm.clone(),
         &file_data.hashes,
         &**pool,
@@ -305,8 +308,12 @@ pub async fn get_projects_from_hashes(
     let project_ids = files.iter().map(|x| x.project_id).collect::<Vec<_>>();
 
     let projects_data = filter_visible_projects(
-        database::models::Project::get_many_ids(&project_ids, &**pool, &redis)
-            .await?,
+        database::models::DBProject::get_many_ids(
+            &project_ids,
+            &**pool,
+            &redis,
+        )
+        .await?,
         &user_option,
         &pool,
         false,
@@ -343,7 +350,7 @@ pub async fn update_files(
         .algorithm
         .clone()
         .unwrap_or_else(|| default_algorithm_from_hashes(&update_data.hashes));
-    let files = database::models::Version::get_files_from_hash(
+    let files = database::models::DBVersion::get_files_from_hash(
         algorithm.clone(),
         &update_data.hashes,
         &**pool,
@@ -370,15 +377,15 @@ pub async fn update_files(
         &update_data.version_types.clone().unwrap_or_default().iter().map(|x| x.to_string()).collect::<Vec<_>>(),
     )
         .fetch(&**pool)
-        .try_fold(DashMap::new(), |acc : DashMap<_,Vec<database::models::ids::VersionId>>, m| {
-            acc.entry(database::models::ProjectId(m.mod_id))
+        .try_fold(DashMap::new(), |acc : DashMap<_,Vec<database::models::ids::DBVersionId>>, m| {
+            acc.entry(database::models::DBProjectId(m.mod_id))
                 .or_default()
-                .push(database::models::VersionId(m.version_id));
+                .push(database::models::DBVersionId(m.version_id));
             async move { Ok(acc) }
         })
         .await?;
 
-    let versions = database::models::Version::get_many(
+    let versions = database::models::DBVersion::get_many(
         &update_version_ids
             .into_iter()
             .filter_map(|x| x.1.last().copied())
@@ -447,7 +454,7 @@ pub async fn update_individual_files(
                 .collect::<Vec<_>>(),
         )
     });
-    let files = database::models::Version::get_files_from_hash(
+    let files = database::models::DBVersion::get_files_from_hash(
         algorithm.clone(),
         &update_data
             .hashes
@@ -459,13 +466,13 @@ pub async fn update_individual_files(
     )
     .await?;
 
-    let projects = database::models::Project::get_many_ids(
+    let projects = database::models::DBProject::get_many_ids(
         &files.iter().map(|x| x.project_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
     )
     .await?;
-    let all_versions = database::models::Version::get_many(
+    let all_versions = database::models::DBVersion::get_many(
         &projects
             .iter()
             .flat_map(|x| x.versions.clone())
@@ -574,7 +581,7 @@ pub async fn delete_file(
         .algorithm
         .clone()
         .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
-    let file = database::models::Version::get_file_from_hash(
+    let file = database::models::DBVersion::get_file_from_hash(
         algorithm.clone(),
         hash,
         hash_query.version_id.map(|x| x.into()),
@@ -586,7 +593,7 @@ pub async fn delete_file(
     if let Some(row) = file {
         if !user.role.is_admin() {
             let team_member =
-                database::models::TeamMember::get_from_user_id_version(
+                database::models::DBTeamMember::get_from_user_id_version(
                     row.version_id,
                     user.id.into(),
                     &**pool,
@@ -595,26 +602,27 @@ pub async fn delete_file(
                 .map_err(ApiError::Database)?;
 
             let organization =
-                database::models::Organization::get_associated_organization_project_id(
+                database::models::DBOrganization::get_associated_organization_project_id(
                     row.project_id,
                     &**pool,
                 )
                 .await
                 .map_err(ApiError::Database)?;
 
-            let organization_team_member =
-                if let Some(organization) = &organization {
-                    database::models::TeamMember::get_from_user_id_organization(
-                        organization.id,
-                        user.id.into(),
-                        false,
-                        &**pool,
-                    )
-                    .await
-                    .map_err(ApiError::Database)?
-                } else {
-                    None
-                };
+            let organization_team_member = if let Some(organization) =
+                &organization
+            {
+                database::models::DBTeamMember::get_from_user_id_organization(
+                    organization.id,
+                    user.id.into(),
+                    false,
+                    &**pool,
+                )
+                .await
+                .map_err(ApiError::Database)?
+            } else {
+                None
+            };
 
             let permissions = ProjectPermissions::get_permissions_by_role(
                 &user.role,
@@ -632,7 +640,7 @@ pub async fn delete_file(
         }
 
         let version =
-            database::models::Version::get(row.version_id, &**pool, &redis)
+            database::models::DBVersion::get(row.version_id, &**pool, &redis)
                 .await?;
         if let Some(version) = version {
             if version.files.len() < 2 {
@@ -642,7 +650,7 @@ pub async fn delete_file(
                 ));
             }
 
-            database::models::Version::clear_cache(&version, &redis).await?;
+            database::models::DBVersion::clear_cache(&version, &redis).await?;
         }
 
         let mut transaction = pool.begin().await?;
@@ -705,7 +713,7 @@ pub async fn download_version(
         .algorithm
         .clone()
         .unwrap_or_else(|| default_algorithm_from_hashes(&[hash.clone()]));
-    let file = database::models::Version::get_file_from_hash(
+    let file = database::models::DBVersion::get_file_from_hash(
         algorithm.clone(),
         hash,
         hash_query.version_id.map(|x| x.into()),
@@ -716,7 +724,7 @@ pub async fn download_version(
 
     if let Some(file) = file {
         let version =
-            database::models::Version::get(file.version_id, &**pool, &redis)
+            database::models::DBVersion::get(file.version_id, &**pool, &redis)
                 .await?;
 
         if let Some(version) = version {
diff --git a/apps/labrinth/src/routes/v3/versions.rs b/apps/labrinth/src/routes/v3/versions.rs
index cd9ff36d..3fd159c3 100644
--- a/apps/labrinth/src/routes/v3/versions.rs
+++ b/apps/labrinth/src/routes/v3/versions.rs
@@ -9,24 +9,26 @@ use crate::database;
 use crate::database::models::loader_fields::{
     self, LoaderField, LoaderFieldEnumValue, VersionField,
 };
-use crate::database::models::version_item::{DependencyBuilder, LoaderVersion};
-use crate::database::models::{image_item, Organization};
+use crate::database::models::version_item::{
+    DBLoaderVersion, DependencyBuilder,
+};
+use crate::database::models::{DBOrganization, image_item};
 use crate::database::redis::RedisPool;
 use crate::models;
 use crate::models::ids::VersionId;
 use crate::models::images::ImageContext;
 use crate::models::pats::Scopes;
-use crate::models::projects::{skip_nulls, Loader};
 use crate::models::projects::{
     Dependency, FileType, VersionStatus, VersionType,
 };
+use crate::models::projects::{Loader, skip_nulls};
 use crate::models::teams::ProjectPermissions;
 use crate::queue::session::AuthQueue;
-use crate::search::indexing::remove_documents;
 use crate::search::SearchConfig;
+use crate::search::indexing::remove_documents;
 use crate::util::img;
 use crate::util::validate::validation_errors_to_string;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use ariadne::ids::base62_impl::parse_base62;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -70,7 +72,8 @@ pub async fn version_project_get_helper(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let result = database::models::Project::get(&id.0, &**pool, &redis).await?;
+    let result =
+        database::models::DBProject::get(&id.0, &**pool, &redis).await?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -90,7 +93,7 @@ pub async fn version_project_get_helper(
             return Err(ApiError::NotFound);
         }
 
-        let versions = database::models::Version::get_many(
+        let versions = database::models::DBVersion::get_many(
             &project.versions,
             &**pool,
             &redis,
@@ -132,9 +135,9 @@ pub async fn versions_get(
         serde_json::from_str::<Vec<models::ids::VersionId>>(&ids.ids)?
             .into_iter()
             .map(|x| x.into())
-            .collect::<Vec<database::models::VersionId>>();
+            .collect::<Vec<database::models::DBVersionId>>();
     let versions_data =
-        database::models::Version::get_many(&version_ids, &**pool, &redis)
+        database::models::DBVersion::get_many(&version_ids, &**pool, &redis)
             .await?;
 
     let user_option = get_user_from_headers(
@@ -174,7 +177,7 @@ pub async fn version_get_helper(
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let version_data =
-        database::models::Version::get(id.into(), &**pool, &redis).await?;
+        database::models::DBVersion::get(id.into(), &**pool, &redis).await?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -207,7 +210,7 @@ pub struct EditVersion {
     pub name: Option<String>,
     #[validate(
         length(min = 1, max = 32),
-        regex = "crate::util::validate::RE_URL_SAFE"
+        regex(path = *crate::util::validate::RE_URL_SAFE)
     )]
     pub version_number: Option<String>,
     #[validate(length(max = 65536))]
@@ -287,14 +290,14 @@ pub async fn version_edit_helper(
         ApiError::Validation(validation_errors_to_string(err, None))
     })?;
 
-    let version_id = info.0;
-    let id = version_id.into();
+    let version_id = info.0.into();
 
-    let result = database::models::Version::get(id, &**pool, &redis).await?;
+    let result =
+        database::models::DBVersion::get(version_id, &**pool, &redis).await?;
 
     if let Some(version_item) = result {
         let team_member =
-            database::models::TeamMember::get_from_user_id_project(
+            database::models::DBTeamMember::get_from_user_id_project(
                 version_item.inner.project_id,
                 user.id.into(),
                 false,
@@ -303,7 +306,7 @@ pub async fn version_edit_helper(
             .await?;
 
         let organization =
-            Organization::get_associated_organization_project_id(
+            DBOrganization::get_associated_organization_project_id(
                 version_item.inner.project_id,
                 &**pool,
             )
@@ -311,7 +314,7 @@ pub async fn version_edit_helper(
 
         let organization_team_member = if let Some(organization) = &organization
         {
-            database::models::TeamMember::get_from_user_id(
+            database::models::DBTeamMember::get_from_user_id(
                 organization.team_id,
                 user.id.into(),
                 &**pool,
@@ -345,7 +348,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     name.trim(),
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -359,7 +362,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     number,
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -373,7 +376,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     version_type.as_str(),
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -384,7 +387,7 @@ pub async fn version_edit_helper(
                     "
                     DELETE FROM dependencies WHERE dependent_id = $1
                     ",
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -448,7 +451,7 @@ pub async fn version_edit_helper(
                     WHERE version_id = $1
                     AND field_id = ANY($2)
                     ",
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                     &loader_field_ids
                 )
                 .execute(&mut *transaction)
@@ -476,7 +479,7 @@ pub async fn version_edit_helper(
                         .remove(&loader_field.id)
                         .unwrap_or_default();
                     let vf: VersionField = VersionField::check_parse(
-                        version_id.into(),
+                        version_id,
                         loader_field.clone(),
                         vf_value.clone(),
                         enum_variants,
@@ -493,7 +496,7 @@ pub async fn version_edit_helper(
                     "
                     DELETE FROM loaders_versions WHERE version_id = $1
                     ",
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -513,12 +516,15 @@ pub async fn version_edit_helper(
                                     .to_string(),
                             )
                         })?;
-                    loader_versions.push(LoaderVersion::new(loader_id, id));
+                    loader_versions.push(DBLoaderVersion {
+                        loader_id,
+                        version_id,
+                    });
                 }
-                LoaderVersion::insert_many(loader_versions, &mut transaction)
+                DBLoaderVersion::insert_many(loader_versions, &mut transaction)
                     .await?;
 
-                crate::database::models::Project::clear_cache(
+                crate::database::models::DBProject::clear_cache(
                     version_item.inner.project_id,
                     None,
                     None,
@@ -535,7 +541,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     featured,
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -549,7 +555,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     body,
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -569,7 +575,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     *downloads as i32,
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -584,7 +590,7 @@ pub async fn version_edit_helper(
                     ",
                     diff as i32,
                     version_item.inner.project_id
-                        as database::models::ids::ProjectId,
+                        as database::models::ids::DBProjectId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -604,7 +610,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     status.as_str(),
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -652,7 +658,7 @@ pub async fn version_edit_helper(
                     WHERE (id = $2)
                     ",
                     ordering.to_owned() as Option<i32>,
-                    id as database::models::ids::VersionId,
+                    version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut *transaction)
                 .await?;
@@ -676,9 +682,9 @@ pub async fn version_edit_helper(
             .await?;
 
             transaction.commit().await?;
-            database::models::Version::clear_cache(&version_item, &redis)
+            database::models::DBVersion::clear_cache(&version_item, &redis)
                 .await?;
-            database::models::Project::clear_cache(
+            database::models::DBProject::clear_cache(
                 version_item.inner.project_id,
                 None,
                 Some(true),
@@ -723,7 +729,7 @@ pub async fn version_list(
     let string = info.into_inner().0;
 
     let result =
-        database::models::Project::get(&string, &**pool, &redis).await?;
+        database::models::DBProject::get(&string, &**pool, &redis).await?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -750,7 +756,7 @@ pub async fn version_list(
         let loader_filters = filters.loaders.as_ref().map(|x| {
             serde_json::from_str::<Vec<String>>(x).unwrap_or_default()
         });
-        let mut versions = database::models::Version::get_many(
+        let mut versions = database::models::DBVersion::get_many(
             &project.versions,
             &**pool,
             &redis,
@@ -883,7 +889,7 @@ pub async fn version_delete(
     .1;
     let id = info.into_inner().0;
 
-    let version = database::models::Version::get(id.into(), &**pool, &redis)
+    let version = database::models::DBVersion::get(id.into(), &**pool, &redis)
         .await?
         .ok_or_else(|| {
             ApiError::InvalidInput(
@@ -893,7 +899,7 @@ pub async fn version_delete(
 
     if !user.role.is_admin() {
         let team_member =
-            database::models::TeamMember::get_from_user_id_project(
+            database::models::DBTeamMember::get_from_user_id_project(
                 version.inner.project_id,
                 user.id.into(),
                 false,
@@ -903,7 +909,7 @@ pub async fn version_delete(
             .map_err(ApiError::Database)?;
 
         let organization =
-            Organization::get_associated_organization_project_id(
+            DBOrganization::get_associated_organization_project_id(
                 version.inner.project_id,
                 &**pool,
             )
@@ -911,7 +917,7 @@ pub async fn version_delete(
 
         let organization_team_member = if let Some(organization) = &organization
         {
-            database::models::TeamMember::get_from_user_id(
+            database::models::DBTeamMember::get_from_user_id(
                 organization.team_id,
                 user.id.into(),
                 &**pool,
@@ -939,14 +945,16 @@ pub async fn version_delete(
     let context = ImageContext::Version {
         version_id: Some(version.inner.id.into()),
     };
-    let uploaded_images =
-        database::models::Image::get_many_contexted(context, &mut transaction)
-            .await?;
+    let uploaded_images = database::models::DBImage::get_many_contexted(
+        context,
+        &mut transaction,
+    )
+    .await?;
     for image in uploaded_images {
-        image_item::Image::remove(image.id, &mut transaction, &redis).await?;
+        image_item::DBImage::remove(image.id, &mut transaction, &redis).await?;
     }
 
-    let result = database::models::Version::remove_full(
+    let result = database::models::DBVersion::remove_full(
         version.inner.id,
         &redis,
         &mut transaction,
@@ -954,7 +962,7 @@ pub async fn version_delete(
     .await?;
     transaction.commit().await?;
     remove_documents(&[version.inner.id.into()], &search_config).await?;
-    database::models::Project::clear_cache(
+    database::models::DBProject::clear_cache(
         version.inner.project_id,
         None,
         Some(true),
diff --git a/apps/labrinth/src/search/indexing/local_import.rs b/apps/labrinth/src/search/indexing/local_import.rs
index c9b2eeae..c6d2e408 100644
--- a/apps/labrinth/src/search/indexing/local_import.rs
+++ b/apps/labrinth/src/search/indexing/local_import.rs
@@ -11,8 +11,8 @@ use crate::database::models::loader_fields::{
     VersionField,
 };
 use crate::database::models::{
-    LoaderFieldEnumId, LoaderFieldEnumValueId, LoaderFieldId, ProjectId,
-    VersionId,
+    DBProjectId, DBVersionId, LoaderFieldEnumId, LoaderFieldEnumValueId,
+    LoaderFieldId,
 };
 use crate::models::projects::from_duplicate_version_fields;
 use crate::models::v2::projects::LegacyProject;
@@ -27,7 +27,7 @@ pub async fn index_local(
 
     // todo: loaders, project type, game versions
     struct PartialProject {
-        id: ProjectId,
+        id: DBProjectId,
         name: String,
         summary: String,
         downloads: i32,
@@ -56,7 +56,7 @@ pub async fn index_local(
         .fetch(pool)
         .map_ok(|m| {
             PartialProject {
-                id: ProjectId(m.id),
+                id: DBProjectId(m.id),
                 name: m.name,
                 summary: m.summary,
                 downloads: m.downloads,
@@ -82,7 +82,7 @@ pub async fn index_local(
 
     info!("Indexing local gallery!");
 
-    let mods_gallery: DashMap<ProjectId, Vec<PartialGallery>> = sqlx::query!(
+    let mods_gallery: DashMap<DBProjectId, Vec<PartialGallery>> = sqlx::query!(
         "
         SELECT mod_id, image_url, featured, ordering
         FROM mods_gallery
@@ -93,14 +93,14 @@ pub async fn index_local(
     .fetch(pool)
     .try_fold(
         DashMap::new(),
-        |acc: DashMap<ProjectId, Vec<PartialGallery>>, m| {
-            acc.entry(ProjectId(m.mod_id))
-                .or_default()
-                .push(PartialGallery {
+        |acc: DashMap<DBProjectId, Vec<PartialGallery>>, m| {
+            acc.entry(DBProjectId(m.mod_id)).or_default().push(
+                PartialGallery {
                     url: m.image_url,
                     featured: m.featured.unwrap_or(false),
                     ordering: m.ordering,
-                });
+                },
+            );
             async move { Ok(acc) }
         },
     )
@@ -108,7 +108,7 @@ pub async fn index_local(
 
     info!("Indexing local categories!");
 
-    let categories: DashMap<ProjectId, Vec<(String, bool)>> = sqlx::query!(
+    let categories: DashMap<DBProjectId, Vec<(String, bool)>> = sqlx::query!(
         "
         SELECT mc.joining_mod_id mod_id, c.category name, mc.is_additional is_additional
         FROM mods_categories mc
@@ -120,8 +120,8 @@ pub async fn index_local(
     .fetch(pool)
     .try_fold(
         DashMap::new(),
-        |acc: DashMap<ProjectId, Vec<(String, bool)>>, m| {
-            acc.entry(ProjectId(m.mod_id))
+        |acc: DashMap<DBProjectId, Vec<(String, bool)>>, m| {
+            acc.entry(DBProjectId(m.mod_id))
                 .or_default()
                 .push((m.name, m.is_additional));
             async move { Ok(acc) }
@@ -134,7 +134,7 @@ pub async fn index_local(
 
     info!("Indexing local org owners!");
 
-    let mods_org_owners: DashMap<ProjectId, String> = sqlx::query!(
+    let mods_org_owners: DashMap<DBProjectId, String> = sqlx::query!(
         "
         SELECT m.id mod_id, u.username
         FROM mods m
@@ -146,15 +146,15 @@ pub async fn index_local(
         &*project_ids,
     )
     .fetch(pool)
-    .try_fold(DashMap::new(), |acc: DashMap<ProjectId, String>, m| {
-        acc.insert(ProjectId(m.mod_id), m.username);
+    .try_fold(DashMap::new(), |acc: DashMap<DBProjectId, String>, m| {
+        acc.insert(DBProjectId(m.mod_id), m.username);
         async move { Ok(acc) }
     })
     .await?;
 
     info!("Indexing local team owners!");
 
-    let mods_team_owners: DashMap<ProjectId, String> = sqlx::query!(
+    let mods_team_owners: DashMap<DBProjectId, String> = sqlx::query!(
         "
         SELECT m.id mod_id, u.username
         FROM mods m
@@ -165,8 +165,8 @@ pub async fn index_local(
         &project_ids,
     )
     .fetch(pool)
-    .try_fold(DashMap::new(), |acc: DashMap<ProjectId, String>, m| {
-        acc.insert(ProjectId(m.mod_id), m.username);
+    .try_fold(DashMap::new(), |acc: DashMap<DBProjectId, String>, m| {
+        acc.insert(DBProjectId(m.mod_id), m.username);
         async move { Ok(acc) }
     })
     .await?;
@@ -416,7 +416,7 @@ pub async fn index_local(
 }
 
 struct PartialVersion {
-    id: VersionId,
+    id: DBVersionId,
     loaders: Vec<String>,
     project_types: Vec<String>,
     version_fields: Vec<QueryVersionField>,
@@ -425,8 +425,8 @@ struct PartialVersion {
 async fn index_versions(
     pool: &PgPool,
     project_ids: Vec<i64>,
-) -> Result<HashMap<ProjectId, Vec<PartialVersion>>, IndexingError> {
-    let versions: HashMap<ProjectId, Vec<VersionId>> = sqlx::query!(
+) -> Result<HashMap<DBProjectId, Vec<PartialVersion>>, IndexingError> {
+    let versions: HashMap<DBProjectId, Vec<DBVersionId>> = sqlx::query!(
         "
         SELECT v.id, v.mod_id
         FROM versions v
@@ -437,10 +437,10 @@ async fn index_versions(
     .fetch(pool)
     .try_fold(
         HashMap::new(),
-        |mut acc: HashMap<ProjectId, Vec<VersionId>>, m| {
-            acc.entry(ProjectId(m.mod_id))
+        |mut acc: HashMap<DBProjectId, Vec<DBVersionId>>, m| {
+            acc.entry(DBProjectId(m.mod_id))
                 .or_default()
-                .push(VersionId(m.id));
+                .push(DBVersionId(m.id));
             async move { Ok(acc) }
         },
     )
@@ -459,7 +459,7 @@ async fn index_versions(
         .map(|x| x.0)
         .collect::<Vec<i64>>();
 
-    let loaders_ptypes: DashMap<VersionId, VersionLoaderData> = sqlx::query!(
+    let loaders_ptypes: DashMap<DBVersionId, VersionLoaderData> = sqlx::query!(
         "
         SELECT DISTINCT version_id,
             ARRAY_AGG(DISTINCT l.loader) filter (where l.loader is not null) loaders,
@@ -476,7 +476,7 @@ async fn index_versions(
     )
     .fetch(pool)
     .map_ok(|m| {
-        let version_id = VersionId(m.version_id);
+        let version_id = DBVersionId(m.version_id);
 
         let version_loader_data = VersionLoaderData {
             loaders: m.loaders.unwrap_or_default(),
@@ -488,7 +488,7 @@ async fn index_versions(
     .await?;
 
     // Get version fields
-    let version_fields: DashMap<VersionId, Vec<QueryVersionField>> =
+    let version_fields: DashMap<DBVersionId, Vec<QueryVersionField>> =
         sqlx::query!(
             "
         SELECT version_id, field_id, int_value, enum_value, string_value
@@ -500,9 +500,9 @@ async fn index_versions(
         .fetch(pool)
         .try_fold(
             DashMap::new(),
-            |acc: DashMap<VersionId, Vec<QueryVersionField>>, m| {
+            |acc: DashMap<DBVersionId, Vec<QueryVersionField>>, m| {
                 let qvf = QueryVersionField {
-                    version_id: VersionId(m.version_id),
+                    version_id: DBVersionId(m.version_id),
                     field_id: LoaderFieldId(m.field_id),
                     int_value: m.int_value,
                     enum_value: if m.enum_value == -1 {
@@ -513,14 +513,14 @@ async fn index_versions(
                     string_value: m.string_value,
                 };
 
-                acc.entry(VersionId(m.version_id)).or_default().push(qvf);
+                acc.entry(DBVersionId(m.version_id)).or_default().push(qvf);
                 async move { Ok(acc) }
             },
         )
         .await?;
 
     // Convert to partial versions
-    let mut res_versions: HashMap<ProjectId, Vec<PartialVersion>> =
+    let mut res_versions: HashMap<DBProjectId, Vec<PartialVersion>> =
         HashMap::new();
     for (project_id, version_ids) in versions.iter() {
         for version_id in version_ids {
diff --git a/apps/labrinth/src/search/mod.rs b/apps/labrinth/src/search/mod.rs
index 88895c50..663e1a83 100644
--- a/apps/labrinth/src/search/mod.rs
+++ b/apps/labrinth/src/search/mod.rs
@@ -1,7 +1,7 @@
 use crate::models::error::ApiError;
 use crate::models::projects::SearchRequest;
-use actix_web::http::StatusCode;
 use actix_web::HttpResponse;
+use actix_web::http::StatusCode;
 use chrono::{DateTime, Utc};
 use itertools::Itertools;
 use meilisearch_sdk::client::Client;
@@ -252,10 +252,10 @@ pub async fn search_for_project(
                                     serde_json::from_value::<Vec<String>>(facet)
                                         .unwrap_or_default()
                                 } else {
-                                    vec![serde_json::from_value::<String>(
-                                        facet,
-                                    )
-                                    .unwrap_or_default()]
+                                    vec![
+                                        serde_json::from_value::<String>(facet)
+                                            .unwrap_or_default(),
+                                    ]
                                 }
                             })
                             .collect_vec()
diff --git a/apps/labrinth/src/sync/status.rs b/apps/labrinth/src/sync/status.rs
index b475e28b..2e94625a 100644
--- a/apps/labrinth/src/sync/status.rs
+++ b/apps/labrinth/src/sync/status.rs
@@ -67,5 +67,5 @@ pub async fn push_back_user_expiry(
 }
 
 fn get_field_name(user: UserId) -> String {
-    format!("user_status:{}", user)
+    format!("user_status:{user}")
 }
diff --git a/apps/labrinth/src/util/actix.rs b/apps/labrinth/src/util/actix.rs
index d89eb17e..f0c626b7 100644
--- a/apps/labrinth/src/util/actix.rs
+++ b/apps/labrinth/src/util/actix.rs
@@ -34,7 +34,7 @@ impl AppendsMultipart for TestRequest {
         let (boundary, payload) = generate_multipart(data);
         self.append_header((
             "Content-Type",
-            format!("multipart/form-data; boundary={}", boundary),
+            format!("multipart/form-data; boundary={boundary}"),
         ))
         .set_payload(payload)
     }
@@ -62,17 +62,12 @@ pub fn generate_multipart(
 
         if let Some(filename) = &segment.filename {
             payload.extend_from_slice(
-                format!("; filename=\"{filename}\"", filename = filename)
-                    .as_bytes(),
+                format!("; filename=\"{filename}\"").as_bytes(),
             );
         }
         if let Some(content_type) = &segment.content_type {
             payload.extend_from_slice(
-                format!(
-                    "\r\nContent-Type: {content_type}",
-                    content_type = content_type
-                )
-                .as_bytes(),
+                format!("\r\nContent-Type: {content_type}").as_bytes(),
             );
         }
         payload.extend_from_slice(b"\r\n\r\n");
@@ -87,9 +82,7 @@ pub fn generate_multipart(
         }
         payload.extend_from_slice(b"\r\n");
     }
-    payload.extend_from_slice(
-        format!("--{boundary}--\r\n", boundary = boundary).as_bytes(),
-    );
+    payload.extend_from_slice(format!("--{boundary}--\r\n").as_bytes());
 
     (boundary, Bytes::from(payload))
 }
diff --git a/apps/labrinth/src/util/captcha.rs b/apps/labrinth/src/util/captcha.rs
index 8527e94b..e59d5ae5 100644
--- a/apps/labrinth/src/util/captcha.rs
+++ b/apps/labrinth/src/util/captcha.rs
@@ -8,6 +8,13 @@ pub async fn check_hcaptcha(
     req: &HttpRequest,
     challenge: &str,
 ) -> Result<bool, ApiError> {
+    let secret = dotenvy::var("HCAPTCHA_SECRET")?;
+
+    if secret.is_empty() || secret == "none" {
+        tracing::info!("hCaptcha secret not set, skipping check");
+        return Ok(true);
+    }
+
     let conn_info = req.connection_info().clone();
     let ip_addr = if parse_var("CLOUDFLARE_INTEGRATION").unwrap_or(false) {
         if let Some(header) = req.headers().get("CF-Connecting-IP") {
@@ -30,7 +37,6 @@ pub async fn check_hcaptcha(
 
     let mut form = HashMap::new();
 
-    let secret = dotenvy::var("HCAPTCHA_SECRET")?;
     form.insert("response", challenge);
     form.insert("secret", &*secret);
     form.insert("remoteip", ip_addr);
diff --git a/apps/labrinth/src/util/img.rs b/apps/labrinth/src/util/img.rs
index f20339a6..079da910 100644
--- a/apps/labrinth/src/util/img.rs
+++ b/apps/labrinth/src/util/img.rs
@@ -5,11 +5,12 @@ use crate::file_hosting::FileHost;
 use crate::models::images::ImageContext;
 use crate::routes::ApiError;
 use color_thief::ColorFormat;
+use hex::ToHex;
 use image::imageops::FilterType;
 use image::{
-    DynamicImage, EncodableLayout, GenericImageView, ImageError,
-    ImageOutputFormat,
+    DynamicImage, EncodableLayout, GenericImageView, ImageError, ImageFormat,
 };
+use sha1::Digest;
 use std::io::Cursor;
 use webp::Encoder;
 
@@ -51,14 +52,13 @@ pub async fn upload_image_optimized(
     let content_type = crate::util::ext::get_image_content_type(file_extension)
         .ok_or_else(|| {
             ApiError::InvalidInput(format!(
-                "Invalid format for image: {}",
-                file_extension
+                "Invalid format for image: {file_extension}"
             ))
         })?;
 
     let cdn_url = dotenvy::var("CDN_URL")?;
 
-    let hash = sha1::Sha1::from(&bytes).hexdigest();
+    let hash = sha1::Sha1::digest(&bytes).encode_hex::<String>();
     let (processed_image, processed_image_ext) = process_image(
         bytes.clone(),
         content_type,
@@ -91,7 +91,7 @@ pub async fn upload_image_optimized(
     let upload_data = file_host
         .upload_file(
             content_type,
-            &format!("{}/{}.{}", upload_folder, hash, file_extension),
+            &format!("{upload_folder}/{hash}.{file_extension}"),
             bytes,
         )
         .await?;
@@ -151,7 +151,7 @@ fn process_image(
 
     // Optimize and compress
     let mut output = Vec::new();
-    img.write_to(&mut Cursor::new(&mut output), ImageOutputFormat::WebP)?;
+    img.write_to(&mut Cursor::new(&mut output), ImageFormat::WebP)?;
 
     Ok((bytes::Bytes::from(output), "webp".to_string()))
 }
@@ -199,7 +199,7 @@ pub async fn delete_unused_images(
     redis: &RedisPool,
 ) -> Result<(), ApiError> {
     let uploaded_images =
-        database::models::Image::get_many_contexted(context, transaction)
+        database::models::DBImage::get_many_contexted(context, transaction)
             .await?;
 
     for image in uploaded_images {
@@ -212,8 +212,8 @@ pub async fn delete_unused_images(
         }
 
         if should_delete {
-            image_item::Image::remove(image.id, transaction, redis).await?;
-            image_item::Image::clear_cache(image.id, redis).await?;
+            image_item::DBImage::remove(image.id, transaction, redis).await?;
+            image_item::DBImage::clear_cache(image.id, redis).await?;
         }
     }
 
diff --git a/apps/labrinth/src/util/ratelimit.rs b/apps/labrinth/src/util/ratelimit.rs
index 7694c6fa..62941f97 100644
--- a/apps/labrinth/src/util/ratelimit.rs
+++ b/apps/labrinth/src/util/ratelimit.rs
@@ -2,10 +2,11 @@ use crate::database::redis::RedisPool;
 use crate::routes::ApiError;
 use crate::util::env::parse_var;
 use actix_web::{
+    Error, ResponseError,
     body::{EitherBody, MessageBody},
     dev::{ServiceRequest, ServiceResponse},
     middleware::Next,
-    web, Error, ResponseError,
+    web,
 };
 use chrono::Utc;
 use std::str::FromStr;
diff --git a/apps/labrinth/src/util/routes.rs b/apps/labrinth/src/util/routes.rs
index f12e07d9..cad439c6 100644
--- a/apps/labrinth/src/util/routes.rs
+++ b/apps/labrinth/src/util/routes.rs
@@ -1,5 +1,5 @@
-use crate::routes::v3::project_creation::CreateError;
 use crate::routes::ApiError;
+use crate::routes::v3::project_creation::CreateError;
 use actix_multipart::Field;
 use actix_web::web::Payload;
 use bytes::BytesMut;
diff --git a/apps/labrinth/src/util/validate.rs b/apps/labrinth/src/util/validate.rs
index 312f80f9..ebb95acc 100644
--- a/apps/labrinth/src/util/validate.rs
+++ b/apps/labrinth/src/util/validate.rs
@@ -1,14 +1,15 @@
+use std::sync::LazyLock;
+
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use regex::Regex;
 use validator::{ValidationErrors, ValidationErrorsKind};
 
 use crate::models::pats::Scopes;
 
-lazy_static! {
-    pub static ref RE_URL_SAFE: Regex =
-        Regex::new(r#"^[a-zA-Z0-9!@$()`.+,_"-]*$"#).unwrap();
-}
+pub static RE_URL_SAFE: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r#"^[a-zA-Z0-9!@$()`.+,_"-]*$"#).unwrap());
+pub static RE_USERNAME: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r#"^[a-zA-Z0-9_-]*$"#).unwrap());
 
 //TODO: In order to ensure readability, only the first error is printed, this may need to be expanded on in the future!
 pub fn validation_errors_to_string(
@@ -19,7 +20,7 @@ pub fn validation_errors_to_string(
 
     let map = errors.into_errors();
 
-    let key_option = map.keys().next().copied();
+    let key_option = map.keys().next();
 
     if let Some(field) = key_option {
         if let Some(error) = map.get(field) {
@@ -72,10 +73,8 @@ pub fn validate_deps(
         .duplicates_by(|x| {
             format!(
                 "{}-{}-{}",
-                x.version_id
-                    .unwrap_or(crate::models::projects::VersionId(0)),
-                x.project_id
-                    .unwrap_or(crate::models::projects::ProjectId(0)),
+                x.version_id.unwrap_or(crate::models::ids::VersionId(0)),
+                x.project_id.unwrap_or(crate::models::ids::ProjectId(0)),
                 x.file_name.as_deref().unwrap_or_default()
             )
         })
diff --git a/apps/labrinth/src/util/webhook.rs b/apps/labrinth/src/util/webhook.rs
index 1f6a476b..7b0db26a 100644
--- a/apps/labrinth/src/util/webhook.rs
+++ b/apps/labrinth/src/util/webhook.rs
@@ -1,6 +1,6 @@
 use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
 use crate::database::redis::RedisPool;
-use crate::models::projects::ProjectId;
+use crate::models::ids::ProjectId;
 use crate::routes::ApiError;
 use ariadne::ids::base62_impl::to_base62;
 use chrono::{DateTime, Utc};
@@ -47,7 +47,7 @@ async fn get_webhook_metadata(
     redis: &RedisPool,
     emoji: bool,
 ) -> Result<Option<WebhookMetadata>, ApiError> {
-    let project = crate::database::models::project_item::Project::get_id(
+    let project = crate::database::models::project_item::DBProject::get_id(
         project_id.into(),
         pool,
         redis,
@@ -58,7 +58,7 @@ async fn get_webhook_metadata(
         let mut owner = None;
 
         if let Some(organization_id) = project.inner.organization_id {
-            let organization = crate::database::models::organization_item::Organization::get_id(
+            let organization = crate::database::models::organization_item::DBOrganization::get_id(
                 organization_id,
                 pool,
                 redis,
@@ -71,13 +71,13 @@ async fn get_webhook_metadata(
                     url: format!(
                         "{}/organization/{}",
                         dotenvy::var("SITE_URL").unwrap_or_default(),
-                        organization.slug
+                        to_base62(organization.id.0 as u64)
                     ),
                     icon_url: organization.icon_url,
                 });
             }
         } else {
-            let team = crate::database::models::team_item::TeamMember::get_from_team_full(
+            let team = crate::database::models::team_item::DBTeamMember::get_from_team_full(
                 project.inner.team_id,
                 pool,
                 redis,
@@ -85,7 +85,7 @@ async fn get_webhook_metadata(
             .await?;
 
             if let Some(member) = team.into_iter().find(|x| x.is_owner) {
-                let user = crate::database::models::user_item::User::get_id(
+                let user = crate::database::models::user_item::DBUser::get_id(
                     member.user_id,
                     pool,
                     redis,
@@ -97,7 +97,7 @@ async fn get_webhook_metadata(
                         url: format!(
                             "{}/user/{}",
                             dotenvy::var("SITE_URL").unwrap_or_default(),
-                            user.username
+                            to_base62(user.id.0 as u64)
                         ),
                         name: user.username,
                         icon_url: user.avatar_url,
@@ -145,11 +145,7 @@ async fn get_webhook_metadata(
                 "{}/{}/{}",
                 dotenvy::var("SITE_URL").unwrap_or_default(),
                 project_type,
-                project
-                    .inner
-                    .slug
-                    .clone()
-                    .unwrap_or_else(|| to_base62(project.inner.id.0 as u64))
+                to_base62(project.inner.id.0 as u64)
             ),
             project_title: project.inner.name,
             project_summary: project.inner.summary,
diff --git a/apps/labrinth/src/validate/fabric.rs b/apps/labrinth/src/validate/fabric.rs
index e5bc34c7..073087b7 100644
--- a/apps/labrinth/src/validate/fabric.rs
+++ b/apps/labrinth/src/validate/fabric.rs
@@ -1,5 +1,5 @@
 use crate::validate::{
-    filter_out_packs, SupportedGameVersions, ValidationError, ValidationResult,
+    SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs,
 };
 use std::io::Cursor;
 use zip::ZipArchive;
diff --git a/apps/labrinth/src/validate/forge.rs b/apps/labrinth/src/validate/forge.rs
index 503b852b..da8b49a8 100644
--- a/apps/labrinth/src/validate/forge.rs
+++ b/apps/labrinth/src/validate/forge.rs
@@ -1,5 +1,5 @@
 use crate::validate::{
-    filter_out_packs, SupportedGameVersions, ValidationError, ValidationResult,
+    SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs,
 };
 use chrono::DateTime;
 use std::io::Cursor;
diff --git a/apps/labrinth/src/validate/liteloader.rs b/apps/labrinth/src/validate/liteloader.rs
index f1a202c2..78029f1f 100644
--- a/apps/labrinth/src/validate/liteloader.rs
+++ b/apps/labrinth/src/validate/liteloader.rs
@@ -1,5 +1,5 @@
 use crate::validate::{
-    filter_out_packs, SupportedGameVersions, ValidationError, ValidationResult,
+    SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs,
 };
 use std::io::Cursor;
 use zip::ZipArchive;
diff --git a/apps/labrinth/src/validate/mod.rs b/apps/labrinth/src/validate/mod.rs
index 7f699e94..ec2db81c 100644
--- a/apps/labrinth/src/validate/mod.rs
+++ b/apps/labrinth/src/validate/mod.rs
@@ -1,6 +1,6 @@
+use crate::database::models::DatabaseError;
 use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
 use crate::database::models::loader_fields::VersionField;
-use crate::database::models::DatabaseError;
 use crate::database::redis::RedisPool;
 use crate::models::pack::PackFormat;
 use crate::models::projects::{FileType, Loader};
diff --git a/apps/labrinth/src/validate/modpack.rs b/apps/labrinth/src/validate/modpack.rs
index 7cc9733f..e05e159e 100644
--- a/apps/labrinth/src/validate/modpack.rs
+++ b/apps/labrinth/src/validate/modpack.rs
@@ -90,7 +90,7 @@ impl super::Validator for ModpackValidator {
                 _ => {
                     return Err(ValidationError::InvalidInput(
                         "Invalid pack file path!".into(),
-                    ))
+                    ));
                 }
             };
         }
diff --git a/apps/labrinth/src/validate/neoforge.rs b/apps/labrinth/src/validate/neoforge.rs
index 59670e8b..b8572745 100644
--- a/apps/labrinth/src/validate/neoforge.rs
+++ b/apps/labrinth/src/validate/neoforge.rs
@@ -1,5 +1,5 @@
 use crate::validate::{
-    filter_out_packs, SupportedGameVersions, ValidationError, ValidationResult,
+    SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs,
 };
 use std::io::Cursor;
 use zip::ZipArchive;
diff --git a/apps/labrinth/src/validate/quilt.rs b/apps/labrinth/src/validate/quilt.rs
index 0c3f50bc..08312f56 100644
--- a/apps/labrinth/src/validate/quilt.rs
+++ b/apps/labrinth/src/validate/quilt.rs
@@ -1,5 +1,5 @@
 use crate::validate::{
-    filter_out_packs, SupportedGameVersions, ValidationError, ValidationResult,
+    SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs,
 };
 use chrono::DateTime;
 use std::io::Cursor;
diff --git a/apps/labrinth/src/validate/rift.rs b/apps/labrinth/src/validate/rift.rs
index b24ff500..b4c6c5d9 100644
--- a/apps/labrinth/src/validate/rift.rs
+++ b/apps/labrinth/src/validate/rift.rs
@@ -1,5 +1,5 @@
 use crate::validate::{
-    filter_out_packs, SupportedGameVersions, ValidationError, ValidationResult,
+    SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs,
 };
 use std::io::Cursor;
 use zip::ZipArchive;
diff --git a/apps/labrinth/tests/analytics.rs b/apps/labrinth/tests/analytics.rs
index 5c591c21..b15dd4d7 100644
--- a/apps/labrinth/tests/analytics.rs
+++ b/apps/labrinth/tests/analytics.rs
@@ -5,12 +5,12 @@ use common::permissions::PermissionsTestContext;
 use common::{
     api_v3::ApiV3,
     database::*,
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
 };
 use itertools::Itertools;
 use labrinth::models::teams::ProjectPermissions;
 use labrinth::queue::payouts;
-use rust_decimal::{prelude::ToPrimitive, Decimal};
+use rust_decimal::{Decimal, prelude::ToPrimitive};
 
 mod common;
 
@@ -89,7 +89,7 @@ pub async fn analytics_revenue() {
             assert_eq!(analytics.len(), 1); // 1 project
             let project_analytics = analytics.get(&alpha_project_id).unwrap();
             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
+            // sorted_by_key, values in the order of smallest to largest key
             let (sorted_keys, sorted_by_key): (Vec<i64>, Vec<Decimal>) =
                 project_analytics
                     .iter()
diff --git a/apps/labrinth/tests/common/api_common/generic.rs b/apps/labrinth/tests/common/api_common/generic.rs
index f07a153e..2c1ca2a9 100644
--- a/apps/labrinth/tests/common/api_common/generic.rs
+++ b/apps/labrinth/tests/common/api_common/generic.rs
@@ -1,18 +1,18 @@
 use std::collections::HashMap;
 
+use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
 use actix_web::dev::ServiceResponse;
 use async_trait::async_trait;
+use labrinth::models::ids::ProjectId;
 use labrinth::models::{
-    projects::{ProjectId, VersionType},
+    projects::VersionType,
     teams::{OrganizationPermissions, ProjectPermissions},
 };
 
-use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
-
 use super::{
+    Api, ApiProject, ApiTags, ApiTeams, ApiUser, ApiVersion,
     models::{CommonProject, CommonVersion},
     request_data::{ImageData, ProjectCreationRequestData},
-    Api, ApiProject, ApiTags, ApiTeams, ApiUser, ApiVersion,
 };
 
 #[derive(Clone)]
diff --git a/apps/labrinth/tests/common/api_common/mod.rs b/apps/labrinth/tests/common/api_common/mod.rs
index aca326b3..3ac17328 100644
--- a/apps/labrinth/tests/common/api_common/mod.rs
+++ b/apps/labrinth/tests/common/api_common/mod.rs
@@ -5,18 +5,18 @@ use self::models::{
     CommonProject, CommonTeamMember, CommonVersion,
 };
 use self::request_data::{ImageData, ProjectCreationRequestData};
+use super::dummy_data::TestFile;
 use actix_web::dev::ServiceResponse;
 use async_trait::async_trait;
+use labrinth::models::ids::ProjectId;
 use labrinth::{
+    LabrinthConfig,
     models::{
-        projects::{ProjectId, VersionType},
+        projects::VersionType,
         teams::{OrganizationPermissions, ProjectPermissions},
     },
-    LabrinthConfig,
 };
 
-use super::dummy_data::TestFile;
-
 pub mod generic;
 pub mod models;
 pub mod request_data;
@@ -169,7 +169,7 @@ pub trait ApiProject {
     ) -> ServiceResponse;
     async fn get_moderation_inbox(&self, pat: Option<&str>) -> ServiceResponse;
     async fn read_thread(&self, id: &str, pat: Option<&str>)
-        -> ServiceResponse;
+    -> ServiceResponse;
     async fn delete_thread_message(
         &self,
         id: &str,
@@ -340,7 +340,7 @@ pub trait ApiVersion {
         pat: Option<&str>,
     ) -> CommonVersion;
     async fn get_version(&self, id: &str, pat: Option<&str>)
-        -> ServiceResponse;
+    -> ServiceResponse;
     async fn get_version_deserialized_common(
         &self,
         id_or_slug: &str,
diff --git a/apps/labrinth/tests/common/api_common/models.rs b/apps/labrinth/tests/common/api_common/models.rs
index d5850bcd..b3332410 100644
--- a/apps/labrinth/tests/common/api_common/models.rs
+++ b/apps/labrinth/tests/common/api_common/models.rs
@@ -1,24 +1,23 @@
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
+use labrinth::models::ids::{
+    ImageId, NotificationId, OrganizationId, ProjectId, ReportId, TeamId,
+    ThreadId, ThreadMessageId, VersionId,
+};
 use labrinth::{
     auth::AuthProvider,
     models::{
-        images::ImageId,
-        notifications::NotificationId,
-        organizations::OrganizationId,
         projects::{
             Dependency, GalleryItem, License, ModeratorMessage,
-            MonetizationStatus, ProjectId, ProjectStatus, VersionFile,
-            VersionId, VersionStatus, VersionType,
+            MonetizationStatus, ProjectStatus, VersionFile, VersionStatus,
+            VersionType,
         },
-        reports::ReportId,
-        teams::{ProjectPermissions, TeamId},
-        threads::{ThreadId, ThreadMessageId},
-        users::{Badges, Role, User, UserId, UserPayoutData},
+        teams::ProjectPermissions,
+        users::{Badges, Role, User, UserPayoutData},
     },
 };
 use rust_decimal::Decimal;
 use serde::Deserialize;
-
 // Fields shared by every version of the API.
 // No struct in here should have ANY field that
 // is not present in *every* version of the API.
diff --git a/apps/labrinth/tests/common/api_v2/mod.rs b/apps/labrinth/tests/common/api_v2/mod.rs
index a3d52ba0..c1fbb2cb 100644
--- a/apps/labrinth/tests/common/api_v2/mod.rs
+++ b/apps/labrinth/tests/common/api_v2/mod.rs
@@ -4,7 +4,7 @@ use super::{
     api_common::{Api, ApiBuildable},
     environment::LocalService,
 };
-use actix_web::{dev::ServiceResponse, test, App};
+use actix_web::{App, dev::ServiceResponse, test};
 use async_trait::async_trait;
 use labrinth::LabrinthConfig;
 use std::rc::Rc;
diff --git a/apps/labrinth/tests/common/api_v2/project.rs b/apps/labrinth/tests/common/api_v2/project.rs
index df268fca..90f917bd 100644
--- a/apps/labrinth/tests/common/api_v2/project.rs
+++ b/apps/labrinth/tests/common/api_v2/project.rs
@@ -4,9 +4,9 @@ use crate::{
     assert_status,
     common::{
         api_common::{
+            Api, ApiProject, AppendsOptionalPat,
             models::{CommonItemType, CommonProject, CommonVersion},
             request_data::{ImageData, ProjectCreationRequestData},
-            Api, ApiProject, AppendsOptionalPat,
         },
         dummy_data::TestFile,
     },
@@ -27,8 +27,8 @@ use serde_json::json;
 use crate::common::database::MOD_USER_PAT;
 
 use super::{
-    request_data::{self, get_public_project_creation_data},
     ApiV2,
+    request_data::{self, get_public_project_creation_data},
 };
 
 impl ApiV2 {
@@ -71,7 +71,7 @@ impl ApiV2 {
         };
 
         let req = test::TestRequest::get()
-            .uri(&format!("/v2/search?{}{}", query_field, facets_field))
+            .uri(&format!("/v2/search?{query_field}{facets_field}"))
             .append_pat(pat)
             .to_request();
         let resp = self.call(req).await;
@@ -99,7 +99,7 @@ impl ApiProject for ApiV2 {
 
         // Approve as a moderator.
         let req = TestRequest::patch()
-            .uri(&format!("/v2/project/{}", slug))
+            .uri(&format!("/v2/project/{slug}"))
             .append_pat(MOD_USER_PAT)
             .set_json(json!(
                 {
@@ -114,7 +114,7 @@ impl ApiProject for ApiV2 {
 
         // Get project's versions
         let req = TestRequest::get()
-            .uri(&format!("/v2/project/{}/version", slug))
+            .uri(&format!("/v2/project/{slug}/version"))
             .append_pat(pat)
             .to_request();
         let resp = self.call(req).await;
@@ -217,7 +217,7 @@ impl ApiProject for ApiV2 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::get()
-            .uri(&format!("/v2/user/{}/projects", user_id_or_username))
+            .uri(&format!("/v2/user/{user_id_or_username}/projects"))
             .append_pat(pat)
             .to_request();
         self.call(req).await
@@ -260,7 +260,7 @@ impl ApiProject for ApiV2 {
     ) -> ServiceResponse {
         let projects_str = ids_or_slugs
             .iter()
-            .map(|s| format!("\"{}\"", s))
+            .map(|s| format!("\"{s}\""))
             .collect::<Vec<_>>()
             .join(",");
         let req = test::TestRequest::patch()
@@ -490,13 +490,13 @@ impl ApiProject for ApiV2 {
             featured = featured
         );
         if let Some(title) = title {
-            url.push_str(&format!("&title={}", title));
+            url.push_str(&format!("&title={title}"));
         }
         if let Some(description) = description {
-            url.push_str(&format!("&description={}", description));
+            url.push_str(&format!("&description={description}"));
         }
         if let Some(ordering) = ordering {
-            url.push_str(&format!("&ordering={}", ordering));
+            url.push_str(&format!("&ordering={ordering}"));
         }
 
         let req = test::TestRequest::post()
@@ -542,10 +542,7 @@ impl ApiProject for ApiV2 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::delete()
-            .uri(&format!(
-                "/v2/project/{id_or_slug}/gallery?url={url}",
-                url = url
-            ))
+            .uri(&format!("/v2/project/{id_or_slug}/gallery?url={url}"))
             .append_pat(pat)
             .to_request();
 
diff --git a/apps/labrinth/tests/common/api_v2/request_data.rs b/apps/labrinth/tests/common/api_v2/request_data.rs
index 8eced361..0862aaf8 100644
--- a/apps/labrinth/tests/common/api_v2/request_data.rs
+++ b/apps/labrinth/tests/common/api_v2/request_data.rs
@@ -7,10 +7,8 @@ use crate::common::{
     },
     dummy_data::TestFile,
 };
-use labrinth::{
-    models::projects::ProjectId,
-    util::actix::{MultipartSegment, MultipartSegmentData},
-};
+use labrinth::models::ids::ProjectId;
+use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
 
 pub fn get_public_project_creation_data(
     slug: &str,
diff --git a/apps/labrinth/tests/common/api_v2/tags.rs b/apps/labrinth/tests/common/api_v2/tags.rs
index b78a5c0d..c68aed17 100644
--- a/apps/labrinth/tests/common/api_v2/tags.rs
+++ b/apps/labrinth/tests/common/api_v2/tags.rs
@@ -12,8 +12,8 @@ use crate::{
     assert_status,
     common::{
         api_common::{
-            models::{CommonCategoryData, CommonLoaderData},
             Api, ApiTags, AppendsOptionalPat,
+            models::{CommonCategoryData, CommonLoaderData},
         },
         database::ADMIN_USER_PAT,
     },
diff --git a/apps/labrinth/tests/common/api_v2/team.rs b/apps/labrinth/tests/common/api_v2/team.rs
index 8af4f005..eeb70342 100644
--- a/apps/labrinth/tests/common/api_v2/team.rs
+++ b/apps/labrinth/tests/common/api_v2/team.rs
@@ -10,8 +10,8 @@ use serde_json::json;
 use crate::{
     assert_status,
     common::api_common::{
-        models::{CommonNotification, CommonTeamMember},
         Api, ApiTeams, AppendsOptionalPat,
+        models::{CommonNotification, CommonTeamMember},
     },
 };
 
diff --git a/apps/labrinth/tests/common/api_v2/user.rs b/apps/labrinth/tests/common/api_v2/user.rs
index 7031b66f..d0da67c6 100644
--- a/apps/labrinth/tests/common/api_v2/user.rs
+++ b/apps/labrinth/tests/common/api_v2/user.rs
@@ -11,7 +11,7 @@ impl ApiUser for ApiV2 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::get()
-            .uri(&format!("/v2/user/{}", user_id_or_username))
+            .uri(&format!("/v2/user/{user_id_or_username}"))
             .append_pat(pat)
             .to_request();
         self.call(req).await
@@ -32,7 +32,7 @@ impl ApiUser for ApiV2 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::patch()
-            .uri(&format!("/v2/user/{}", user_id_or_username))
+            .uri(&format!("/v2/user/{user_id_or_username}"))
             .append_pat(pat)
             .set_json(patch)
             .to_request();
@@ -46,7 +46,7 @@ impl ApiUser for ApiV2 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::delete()
-            .uri(&format!("/v2/user/{}", user_id_or_username))
+            .uri(&format!("/v2/user/{user_id_or_username}"))
             .append_pat(pat)
             .to_request();
 
diff --git a/apps/labrinth/tests/common/api_v2/version.rs b/apps/labrinth/tests/common/api_v2/version.rs
index abeab7e3..eeb8337c 100644
--- a/apps/labrinth/tests/common/api_v2/version.rs
+++ b/apps/labrinth/tests/common/api_v2/version.rs
@@ -1,14 +1,14 @@
 use std::collections::HashMap;
 
 use super::{
-    request_data::{self, get_public_version_creation_data},
     ApiV2,
+    request_data::{self, get_public_version_creation_data},
 };
 use crate::{
     assert_status,
     common::{
         api_common::{
-            models::CommonVersion, Api, ApiVersion, AppendsOptionalPat,
+            Api, ApiVersion, AppendsOptionalPat, models::CommonVersion,
         },
         dummy_data::TestFile,
     },
@@ -19,11 +19,9 @@ use actix_web::{
     test::{self, TestRequest},
 };
 use async_trait::async_trait;
+use labrinth::models::ids::ProjectId;
 use labrinth::{
-    models::{
-        projects::{ProjectId, VersionType},
-        v2::projects::LegacyVersion,
-    },
+    models::{projects::VersionType, v2::projects::LegacyVersion},
     routes::v2::version_file::FileUpdateData,
     util::actix::AppendsMultipart,
 };
@@ -399,18 +397,18 @@ impl ApiVersion for ApiV2 {
             ));
         }
         if let Some(featured) = featured {
-            query_string.push_str(&format!("&featured={}", featured));
+            query_string.push_str(&format!("&featured={featured}"));
         }
         if let Some(version_type) = version_type {
-            query_string.push_str(&format!("&version_type={}", version_type));
+            query_string.push_str(&format!("&version_type={version_type}"));
         }
         if let Some(limit) = limit {
             let limit = limit.to_string();
-            query_string.push_str(&format!("&limit={}", limit));
+            query_string.push_str(&format!("&limit={limit}"));
         }
         if let Some(offset) = offset {
             let offset = offset.to_string();
-            query_string.push_str(&format!("&offset={}", offset));
+            query_string.push_str(&format!("&offset={offset}"));
         }
 
         let req = test::TestRequest::get()
@@ -480,7 +478,7 @@ impl ApiVersion for ApiV2 {
     ) -> ServiceResponse {
         let ids = url_encode_json_serialized_vec(&version_ids);
         let request = test::TestRequest::get()
-            .uri(&format!("/v2/versions?ids={}", ids))
+            .uri(&format!("/v2/versions?ids={ids}"))
             .append_pat(pat)
             .to_request();
         self.call(request).await
diff --git a/apps/labrinth/tests/common/api_v3/collections.rs b/apps/labrinth/tests/common/api_v3/collections.rs
index 81ca4bb6..38fce969 100644
--- a/apps/labrinth/tests/common/api_v3/collections.rs
+++ b/apps/labrinth/tests/common/api_v3/collections.rs
@@ -9,7 +9,7 @@ use serde_json::json;
 
 use crate::{
     assert_status,
-    common::api_common::{request_data::ImageData, Api, AppendsOptionalPat},
+    common::api_common::{Api, AppendsOptionalPat, request_data::ImageData},
 };
 
 use super::ApiV3;
@@ -157,7 +157,7 @@ impl ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::get()
-            .uri(&format!("/v3/user/{}/collections", user_id_or_username))
+            .uri(&format!("/v3/user/{user_id_or_username}/collections"))
             .append_pat(pat)
             .to_request();
         self.call(req).await
diff --git a/apps/labrinth/tests/common/api_v3/mod.rs b/apps/labrinth/tests/common/api_v3/mod.rs
index f4a0d889..2b2ceb5d 100644
--- a/apps/labrinth/tests/common/api_v3/mod.rs
+++ b/apps/labrinth/tests/common/api_v3/mod.rs
@@ -4,7 +4,7 @@ use super::{
     api_common::{Api, ApiBuildable},
     environment::LocalService,
 };
-use actix_web::{dev::ServiceResponse, test, App};
+use actix_web::{App, dev::ServiceResponse, test};
 use async_trait::async_trait;
 use labrinth::LabrinthConfig;
 use std::rc::Rc;
diff --git a/apps/labrinth/tests/common/api_v3/oauth.rs b/apps/labrinth/tests/common/api_v3/oauth.rs
index acd5e173..434f6aff 100644
--- a/apps/labrinth/tests/common/api_v3/oauth.rs
+++ b/apps/labrinth/tests/common/api_v3/oauth.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use actix_http::StatusCode;
+use actix_web::http::header::{AUTHORIZATION, LOCATION};
 use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
@@ -9,7 +10,6 @@ use labrinth::auth::oauth::{
     OAuthClientAccessRequest, RespondToOAuthClientScopes, TokenRequest,
     TokenResponse,
 };
-use reqwest::header::{AUTHORIZATION, LOCATION};
 
 use crate::{
     assert_status,
@@ -104,8 +104,7 @@ impl ApiV3 {
                     code: auth_code,
                     redirect_uri: original_redirect_uri,
                     client_id: serde_json::from_str(&format!(
-                        "\"{}\"",
-                        client_id
+                        "\"{client_id}\""
                     ))
                     .unwrap(),
                 })
diff --git a/apps/labrinth/tests/common/api_v3/oauth_clients.rs b/apps/labrinth/tests/common/api_v3/oauth_clients.rs
index 35b24882..2afedb10 100644
--- a/apps/labrinth/tests/common/api_v3/oauth_clients.rs
+++ b/apps/labrinth/tests/common/api_v3/oauth_clients.rs
@@ -47,7 +47,7 @@ impl ApiV3 {
         pat: Option<&str>,
     ) -> Vec<OAuthClient> {
         let req = TestRequest::get()
-            .uri(&format!("/v3/user/{}/oauth_apps", user_id))
+            .uri(&format!("/v3/user/{user_id}/oauth_apps"))
             .append_pat(pat)
             .to_request();
         let resp = self.call(req).await;
@@ -62,7 +62,7 @@ impl ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = TestRequest::get()
-            .uri(&format!("/_internal/oauth/app/{}", client_id))
+            .uri(&format!("/_internal/oauth/app/{client_id}"))
             .append_pat(pat)
             .to_request();
 
@@ -93,7 +93,7 @@ impl ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = TestRequest::delete()
-            .uri(&format!("/_internal/oauth/app/{}", client_id))
+            .uri(&format!("/_internal/oauth/app/{client_id}"))
             .append_pat(pat)
             .to_request();
 
diff --git a/apps/labrinth/tests/common/api_v3/organization.rs b/apps/labrinth/tests/common/api_v3/organization.rs
index 7f405cc0..b208db21 100644
--- a/apps/labrinth/tests/common/api_v3/organization.rs
+++ b/apps/labrinth/tests/common/api_v3/organization.rs
@@ -1,19 +1,17 @@
+use crate::{
+    assert_status,
+    common::api_common::{Api, AppendsOptionalPat, request_data::ImageData},
+};
 use actix_http::StatusCode;
 use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
 };
+use ariadne::ids::UserId;
 use bytes::Bytes;
-use labrinth::models::{
-    organizations::Organization, users::UserId, v3::projects::Project,
-};
+use labrinth::models::{organizations::Organization, v3::projects::Project};
 use serde_json::json;
 
-use crate::{
-    assert_status,
-    common::api_common::{request_data::ImageData, Api, AppendsOptionalPat},
-};
-
 use super::ApiV3;
 
 impl ApiV3 {
diff --git a/apps/labrinth/tests/common/api_v3/project.rs b/apps/labrinth/tests/common/api_v3/project.rs
index c59662ff..59ad6f8a 100644
--- a/apps/labrinth/tests/common/api_v3/project.rs
+++ b/apps/labrinth/tests/common/api_v3/project.rs
@@ -20,9 +20,9 @@ use crate::{
     assert_status,
     common::{
         api_common::{
+            Api, ApiProject, AppendsOptionalPat,
             models::{CommonItemType, CommonProject, CommonVersion},
             request_data::{ImageData, ProjectCreationRequestData},
-            Api, ApiProject, AppendsOptionalPat,
         },
         database::MOD_USER_PAT,
         dummy_data::TestFile,
@@ -30,8 +30,8 @@ use crate::{
 };
 
 use super::{
-    request_data::{self, get_public_project_creation_data},
     ApiV3,
+    request_data::{self, get_public_project_creation_data},
 };
 
 #[async_trait(?Send)]
@@ -53,7 +53,7 @@ impl ApiProject for ApiV3 {
 
         // Approve as a moderator.
         let req = TestRequest::patch()
-            .uri(&format!("/v3/project/{}", slug))
+            .uri(&format!("/v3/project/{slug}"))
             .append_pat(MOD_USER_PAT)
             .set_json(json!(
                 {
@@ -69,7 +69,7 @@ impl ApiProject for ApiV3 {
 
         // Get project's versions
         let req = TestRequest::get()
-            .uri(&format!("/v3/project/{}/version", slug))
+            .uri(&format!("/v3/project/{slug}/version"))
             .append_pat(pat)
             .to_request();
         let resp = self.call(req).await;
@@ -172,7 +172,7 @@ impl ApiProject for ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::get()
-            .uri(&format!("/v3/user/{}/projects", user_id_or_username))
+            .uri(&format!("/v3/user/{user_id_or_username}/projects"))
             .append_pat(pat)
             .to_request();
         self.call(req).await
@@ -215,7 +215,7 @@ impl ApiProject for ApiV3 {
     ) -> ServiceResponse {
         let projects_str = ids_or_slugs
             .iter()
-            .map(|s| format!("\"{}\"", s))
+            .map(|s| format!("\"{s}\""))
             .collect::<Vec<_>>()
             .join(",");
         let req = test::TestRequest::patch()
@@ -363,13 +363,13 @@ impl ApiProject for ApiV3 {
             featured = featured
         );
         if let Some(title) = title {
-            url.push_str(&format!("&title={}", title));
+            url.push_str(&format!("&title={title}"));
         }
         if let Some(description) = description {
-            url.push_str(&format!("&description={}", description));
+            url.push_str(&format!("&description={description}"));
         }
         if let Some(ordering) = ordering {
-            url.push_str(&format!("&ordering={}", ordering));
+            url.push_str(&format!("&ordering={ordering}"));
         }
 
         let req = test::TestRequest::post()
@@ -416,10 +416,7 @@ impl ApiProject for ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::delete()
-            .uri(&format!(
-                "/v3/project/{id_or_slug}/gallery?url={url}",
-                url = url
-            ))
+            .uri(&format!("/v3/project/{id_or_slug}/gallery?url={url}"))
             .append_pat(pat)
             .to_request();
 
@@ -562,7 +559,7 @@ impl ApiV3 {
         };
 
         let req = test::TestRequest::get()
-            .uri(&format!("/v3/search?{}{}", query_field, facets_field))
+            .uri(&format!("/v3/search?{query_field}{facets_field}"))
             .append_pat(pat)
             .to_request();
         let resp = self.call(req).await;
@@ -583,12 +580,12 @@ impl ApiV3 {
             let version_string: String =
                 serde_json::to_string(&id_or_slugs).unwrap();
             let version_string = urlencoding::encode(&version_string);
-            format!("version_ids={}", version_string)
+            format!("version_ids={version_string}")
         } else {
             let projects_string: String =
                 serde_json::to_string(&id_or_slugs).unwrap();
             let projects_string = urlencoding::encode(&projects_string);
-            format!("project_ids={}", projects_string)
+            format!("project_ids={projects_string}")
         };
 
         let mut extra_args = String::new();
@@ -605,10 +602,8 @@ impl ApiV3 {
             extra_args.push_str(&format!("&end_date={end_date}"));
         }
         if let Some(resolution_minutes) = resolution_minutes {
-            extra_args.push_str(&format!(
-                "&resolution_minutes={}",
-                resolution_minutes
-            ));
+            extra_args
+                .push_str(&format!("&resolution_minutes={resolution_minutes}"));
         }
 
         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 790503b8..3e2586f4 100644
--- a/apps/labrinth/tests/common/api_v3/request_data.rs
+++ b/apps/labrinth/tests/common/api_v3/request_data.rs
@@ -7,10 +7,8 @@ use crate::common::{
     },
     dummy_data::TestFile,
 };
-use labrinth::{
-    models::projects::ProjectId,
-    util::actix::{MultipartSegment, MultipartSegmentData},
-};
+use labrinth::models::ids::ProjectId;
+use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
 
 pub fn get_public_project_creation_data(
     slug: &str,
diff --git a/apps/labrinth/tests/common/api_v3/tags.rs b/apps/labrinth/tests/common/api_v3/tags.rs
index 6fa0b9a5..b2eda4ac 100644
--- a/apps/labrinth/tests/common/api_v3/tags.rs
+++ b/apps/labrinth/tests/common/api_v3/tags.rs
@@ -14,8 +14,8 @@ use crate::{
     assert_status,
     common::{
         api_common::{
-            models::{CommonCategoryData, CommonLoaderData},
             Api, ApiTags, AppendsOptionalPat,
+            models::{CommonCategoryData, CommonLoaderData},
         },
         database::ADMIN_USER_PAT,
     },
@@ -76,7 +76,7 @@ impl ApiV3 {
         loader_field: &str,
     ) -> ServiceResponse {
         let req = TestRequest::get()
-            .uri(&format!("/v3/loader_field?loader_field={}", loader_field))
+            .uri(&format!("/v3/loader_field?loader_field={loader_field}"))
             .append_pat(ADMIN_USER_PAT)
             .to_request();
         self.call(req).await
diff --git a/apps/labrinth/tests/common/api_v3/team.rs b/apps/labrinth/tests/common/api_v3/team.rs
index 0b188b59..4bae4702 100644
--- a/apps/labrinth/tests/common/api_v3/team.rs
+++ b/apps/labrinth/tests/common/api_v3/team.rs
@@ -10,8 +10,8 @@ use serde_json::json;
 use crate::{
     assert_status,
     common::api_common::{
-        models::{CommonNotification, CommonTeamMember},
         Api, ApiTeams, AppendsOptionalPat,
+        models::{CommonNotification, CommonTeamMember},
     },
 };
 
diff --git a/apps/labrinth/tests/common/api_v3/user.rs b/apps/labrinth/tests/common/api_v3/user.rs
index 9e2c9f7f..dbfe3bc2 100644
--- a/apps/labrinth/tests/common/api_v3/user.rs
+++ b/apps/labrinth/tests/common/api_v3/user.rs
@@ -13,7 +13,7 @@ impl ApiUser for ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::get()
-            .uri(&format!("/v3/user/{}", user_id_or_username))
+            .uri(&format!("/v3/user/{user_id_or_username}"))
             .append_pat(pat)
             .to_request();
         self.call(req).await
@@ -34,7 +34,7 @@ impl ApiUser for ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::patch()
-            .uri(&format!("/v3/user/{}", user_id_or_username))
+            .uri(&format!("/v3/user/{user_id_or_username}"))
             .append_pat(pat)
             .set_json(patch)
             .to_request();
@@ -48,7 +48,7 @@ impl ApiUser for ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let req = test::TestRequest::delete()
-            .uri(&format!("/v3/user/{}", user_id_or_username))
+            .uri(&format!("/v3/user/{user_id_or_username}"))
             .append_pat(pat)
             .to_request();
         self.call(req).await
diff --git a/apps/labrinth/tests/common/api_v3/version.rs b/apps/labrinth/tests/common/api_v3/version.rs
index c563396e..7a6f8323 100644
--- a/apps/labrinth/tests/common/api_v3/version.rs
+++ b/apps/labrinth/tests/common/api_v3/version.rs
@@ -1,14 +1,14 @@
 use std::collections::HashMap;
 
 use super::{
-    request_data::{self, get_public_version_creation_data},
     ApiV3,
+    request_data::{self, get_public_version_creation_data},
 };
 use crate::{
     assert_status,
     common::{
         api_common::{
-            models::CommonVersion, Api, ApiVersion, AppendsOptionalPat,
+            Api, ApiVersion, AppendsOptionalPat, models::CommonVersion,
         },
         dummy_data::TestFile,
     },
@@ -19,11 +19,9 @@ use actix_web::{
     test::{self, TestRequest},
 };
 use async_trait::async_trait;
+use labrinth::models::ids::ProjectId;
 use labrinth::{
-    models::{
-        projects::{ProjectId, VersionType},
-        v3::projects::Version,
-    },
+    models::{projects::VersionType, v3::projects::Version},
     routes::v3::version_file::FileUpdateData,
     util::actix::AppendsMultipart,
 };
@@ -432,18 +430,18 @@ impl ApiVersion for ApiV3 {
             ));
         }
         if let Some(featured) = featured {
-            query_string.push_str(&format!("&featured={}", featured));
+            query_string.push_str(&format!("&featured={featured}"));
         }
         if let Some(version_type) = version_type {
-            query_string.push_str(&format!("&version_type={}", version_type));
+            query_string.push_str(&format!("&version_type={version_type}"));
         }
         if let Some(limit) = limit {
             let limit = limit.to_string();
-            query_string.push_str(&format!("&limit={}", limit));
+            query_string.push_str(&format!("&limit={limit}"));
         }
         if let Some(offset) = offset {
             let offset = offset.to_string();
-            query_string.push_str(&format!("&offset={}", offset));
+            query_string.push_str(&format!("&offset={offset}"));
         }
 
         let req = test::TestRequest::get()
@@ -513,7 +511,7 @@ impl ApiVersion for ApiV3 {
     ) -> ServiceResponse {
         let ids = url_encode_json_serialized_vec(&version_ids);
         let request = test::TestRequest::get()
-            .uri(&format!("/v3/versions?ids={}", ids))
+            .uri(&format!("/v3/versions?ids={ids}"))
             .append_pat(pat)
             .to_request();
         self.call(request).await
@@ -546,10 +544,7 @@ impl ApiVersion for ApiV3 {
             Some(file),
         );
         let request = test::TestRequest::post()
-            .uri(&format!(
-                "/v3/version/{version_id}/file",
-                version_id = version_id
-            ))
+            .uri(&format!("/v3/version/{version_id}/file"))
             .append_pat(pat)
             .set_multipart(m)
             .to_request();
@@ -562,10 +557,7 @@ impl ApiVersion for ApiV3 {
         pat: Option<&str>,
     ) -> ServiceResponse {
         let request = test::TestRequest::delete()
-            .uri(&format!(
-                "/v3/version/{version_id}",
-                version_id = version_id
-            ))
+            .uri(&format!("/v3/version/{version_id}"))
             .append_pat(pat)
             .to_request();
         self.call(request).await
diff --git a/apps/labrinth/tests/common/database.rs b/apps/labrinth/tests/common/database.rs
index f4d96fd5..33ed2fc2 100644
--- a/apps/labrinth/tests/common/database.rs
+++ b/apps/labrinth/tests/common/database.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 use labrinth::{database::redis::RedisPool, search};
-use sqlx::{postgres::PgPoolOptions, PgPool};
+use sqlx::{PgPool, postgres::PgPoolOptions};
 use std::time::Duration;
 use url::Url;
 
@@ -137,7 +137,7 @@ impl TemporaryDatabase {
                     dotenvy::var("DATABASE_URL").expect("No database URL");
                 let mut template_url =
                     Url::parse(&url).expect("Invalid database URL");
-                template_url.set_path(&format!("/{}", TEMPLATE_DATABASE_NAME));
+                template_url.set_path(&format!("/{TEMPLATE_DATABASE_NAME}"));
 
                 let pool = PgPool::connect(template_url.as_str())
                     .await
@@ -161,7 +161,9 @@ impl TemporaryDatabase {
                     let needs_update = dummy_data_update
                         .is_none_or(|d| d != DUMMY_DATA_UPDATE);
                     if needs_update {
-                        println!("Dummy data updated, so template DB tables will be dropped and re-created");
+                        println!(
+                            "Dummy data updated, so template DB tables will be dropped and re-created"
+                        );
                         // Drop all tables in the database so they can be re-created and later filled with updated dummy data
                         sqlx::query("DROP SCHEMA public CASCADE;")
                             .execute(&pool)
diff --git a/apps/labrinth/tests/common/dummy_data.rs b/apps/labrinth/tests/common/dummy_data.rs
index 5dbe21a0..c18f2402 100644
--- a/apps/labrinth/tests/common/dummy_data.rs
+++ b/apps/labrinth/tests/common/dummy_data.rs
@@ -1,25 +1,25 @@
 #![allow(dead_code)]
 use std::io::{Cursor, Write};
 
-use actix_http::StatusCode;
-use actix_web::test::{self, TestRequest};
-use labrinth::models::{
-    oauth_clients::OAuthClient,
-    organizations::Organization,
-    pats::Scopes,
-    projects::{Project, ProjectId, Version},
-};
-use serde_json::json;
-use sqlx::Executor;
-use zip::{write::FileOptions, CompressionMethod, ZipWriter};
-
 use crate::{
     assert_status,
     common::{api_common::Api, api_v3, database::USER_USER_PAT},
 };
+use actix_http::StatusCode;
+use actix_web::test::{self, TestRequest};
+use labrinth::models::ids::ProjectId;
+use labrinth::models::{
+    oauth_clients::OAuthClient,
+    organizations::Organization,
+    pats::Scopes,
+    projects::{Project, Version},
+};
+use serde_json::json;
+use sqlx::Executor;
+use zip::{CompressionMethod, ZipWriter, write::FileOptions};
 
 use super::{
-    api_common::{request_data::ImageData, ApiProject, AppendsOptionalPat},
+    api_common::{ApiProject, AppendsOptionalPat, request_data::ImageData},
     api_v3::ApiV3,
     database::TemporaryDatabase,
 };
@@ -98,7 +98,7 @@ impl TestFile {
             let mut zip = ZipWriter::new(&mut cursor);
             zip.start_file(
                 "fabric.mod.json",
-                FileOptions::default()
+                FileOptions::<()>::default()
                     .compression_method(CompressionMethod::Stored),
             )
             .unwrap();
@@ -106,7 +106,7 @@ impl TestFile {
 
             zip.start_file(
                 "META-INF/mods.toml",
-                FileOptions::default()
+                FileOptions::<()>::default()
                     .compression_method(CompressionMethod::Stored),
             )
             .unwrap();
@@ -159,7 +159,7 @@ impl TestFile {
             let mut zip = ZipWriter::new(&mut cursor);
             zip.start_file(
                 "modrinth.index.json",
-                FileOptions::default()
+                FileOptions::<()>::default()
                     .compression_method(CompressionMethod::Stored),
             )
             .unwrap();
diff --git a/apps/labrinth/tests/common/environment.rs b/apps/labrinth/tests/common/environment.rs
index 7747916a..8031e816 100644
--- a/apps/labrinth/tests/common/environment.rs
+++ b/apps/labrinth/tests/common/environment.rs
@@ -1,10 +1,10 @@
 #![allow(dead_code)]
 
 use super::{
-    api_common::{generic::GenericApi, Api, ApiBuildable},
+    api_common::{Api, ApiBuildable, generic::GenericApi},
     api_v2::ApiV2,
     api_v3::ApiV3,
-    database::{TemporaryDatabase, FRIEND_USER_ID, USER_USER_PAT},
+    database::{FRIEND_USER_ID, TemporaryDatabase, USER_USER_PAT},
     dummy_data,
 };
 use crate::{assert_status, common::setup};
@@ -146,18 +146,18 @@ pub trait LocalService {
     ) -> std::pin::Pin<
         Box<
             dyn std::future::Future<
-                Output = Result<ServiceResponse, actix_web::Error>,
-            >,
+                    Output = Result<ServiceResponse, actix_web::Error>,
+                >,
         >,
     >;
 }
 impl<S> LocalService for S
 where
     S: actix_web::dev::Service<
-        actix_http::Request,
-        Response = ServiceResponse,
-        Error = actix_web::Error,
-    >,
+            actix_http::Request,
+            Response = ServiceResponse,
+            Error = actix_web::Error,
+        >,
     S::Future: 'static,
 {
     fn call(
@@ -166,8 +166,8 @@ where
     ) -> std::pin::Pin<
         Box<
             dyn std::future::Future<
-                Output = Result<ServiceResponse, actix_web::Error>,
-            >,
+                    Output = Result<ServiceResponse, actix_web::Error>,
+                >,
         >,
     > {
         Box::pin(self.call(req))
diff --git a/apps/labrinth/tests/common/mod.rs b/apps/labrinth/tests/common/mod.rs
index 75d0ea7d..625c8498 100644
--- a/apps/labrinth/tests/common/mod.rs
+++ b/apps/labrinth/tests/common/mod.rs
@@ -1,5 +1,5 @@
+use labrinth::{LabrinthConfig, file_hosting, queue};
 use labrinth::{check_env_vars, clickhouse};
-use labrinth::{file_hosting, queue, LabrinthConfig};
 use std::sync::Arc;
 
 pub mod api_common;
diff --git a/apps/labrinth/tests/common/pats.rs b/apps/labrinth/tests/common/pats.rs
index 0f566215..1e304fb6 100644
--- a/apps/labrinth/tests/common/pats.rs
+++ b/apps/labrinth/tests/common/pats.rs
@@ -18,12 +18,12 @@ pub async fn create_test_pat(
 ) -> String {
     let mut transaction = db.pool.begin().await.unwrap();
     let id = generate_pat_id(&mut transaction).await.unwrap();
-    let pat = database::models::pat_item::PersonalAccessToken {
+    let pat = database::models::pat_item::DBPersonalAccessToken {
         id,
         name: format!("test_pat_{}", scopes.bits()),
         access_token: format!("mrp_{}", id.0),
         scopes,
-        user_id: database::models::ids::UserId(user_id),
+        user_id: database::models::ids::DBUserId(user_id),
         created: Utc::now(),
         expires: Utc::now() + chrono::Duration::days(1),
         last_used: None,
diff --git a/apps/labrinth/tests/common/permissions.rs b/apps/labrinth/tests/common/permissions.rs
index 02b11935..fedaa72c 100644
--- a/apps/labrinth/tests/common/permissions.rs
+++ b/apps/labrinth/tests/common/permissions.rs
@@ -8,7 +8,7 @@ use serde_json::json;
 
 use crate::common::{
     api_common::ApiTeams,
-    database::{generate_random_name, ADMIN_USER_PAT},
+    database::{ADMIN_USER_PAT, generate_random_name},
 };
 
 use super::{
@@ -470,8 +470,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != ProjectPermissions::empty() {
                 return Err(format!(
-                    "Test 1 failed. Expected no permissions, got {:?}",
-                    p
+                    "Test 1 failed. Expected no permissions, got {p:?}"
                 ));
             }
 
@@ -511,8 +510,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != ProjectPermissions::empty() {
                 return Err(format!(
-                    "Test 2 failed. Expected no permissions, got {:?}",
-                    p
+                    "Test 2 failed. Expected no permissions, got {p:?}"
                 ));
             }
 
@@ -561,8 +559,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != failure_project_permissions {
                 return Err(format!(
-                    "Test 3 failed. Expected {:?}, got {:?}",
-                    failure_project_permissions, p
+                    "Test 3 failed. Expected {failure_project_permissions:?}, got {p:?}"
                 ));
             }
 
@@ -607,8 +604,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != success_permissions {
                 return Err(format!(
-                    "Test 4 failed. Expected {:?}, got {:?}",
-                    success_permissions, p
+                    "Test 4 failed. Expected {success_permissions:?}, got {p:?}"
                 ));
             }
 
@@ -666,8 +662,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != failure_project_permissions {
                 return Err(format!(
-                    "Test 5 failed. Expected {:?}, got {:?}",
-                    failure_project_permissions, p
+                    "Test 5 failed. Expected {failure_project_permissions:?}, got {p:?}"
                 ));
             }
 
@@ -721,8 +716,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != success_permissions {
                 return Err(format!(
-                    "Test 6 failed. Expected {:?}, got {:?}",
-                    success_permissions, p
+                    "Test 6 failed. Expected {success_permissions:?}, got {p:?}"
                 ));
             }
 
@@ -790,8 +784,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != failure_project_permissions {
                 return Err(format!(
-                    "Test 7 failed. Expected {:?}, got {:?}",
-                    failure_project_permissions, p
+                    "Test 7 failed. Expected {failure_project_permissions:?}, got {p:?}"
                 ));
             }
 
@@ -856,8 +849,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != success_permissions {
                 return Err(format!(
-                    "Test 8 failed. Expected {:?}, got {:?}",
-                    success_permissions, p
+                    "Test 8 failed. Expected {success_permissions:?}, got {p:?}"
                 ));
             }
 
@@ -927,8 +919,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != OrganizationPermissions::empty() {
                 return Err(format!(
-                    "Test 1 failed. Expected no permissions, got {:?}",
-                    p
+                    "Test 1 failed. Expected no permissions, got {p:?}"
                 ));
             }
             Ok(())
@@ -976,8 +967,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != failure_organization_permissions {
                 return Err(format!(
-                    "Test 2 failed. Expected {:?}, got {:?}",
-                    failure_organization_permissions, p
+                    "Test 2 failed. Expected {failure_organization_permissions:?}, got {p:?}"
                 ));
             }
             Ok(())
@@ -1021,8 +1011,7 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
             .await;
             if p != success_permissions {
                 return Err(format!(
-                    "Test 3 failed. Expected {:?}, got {:?}",
-                    success_permissions, p
+                    "Test 3 failed. Expected {success_permissions:?}, got {p:?}"
                 ));
             }
             Ok(())
diff --git a/apps/labrinth/tests/common/search.rs b/apps/labrinth/tests/common/search.rs
index 6bfc8a50..daf7a9eb 100644
--- a/apps/labrinth/tests/common/search.rs
+++ b/apps/labrinth/tests/common/search.rs
@@ -10,7 +10,7 @@ use crate::{
     common::{
         api_common::{Api, ApiProject, ApiVersion},
         database::{FRIEND_USER_PAT, MOD_USER_PAT, USER_USER_PAT},
-        dummy_data::{TestFile, DUMMY_CATEGORIES},
+        dummy_data::{DUMMY_CATEGORIES, TestFile},
     },
 };
 
diff --git a/apps/labrinth/tests/error.rs b/apps/labrinth/tests/error.rs
index b92e774c..585f37ba 100644
--- a/apps/labrinth/tests/error.rs
+++ b/apps/labrinth/tests/error.rs
@@ -5,7 +5,7 @@ use common::api_common::ApiProject;
 
 use common::api_v3::ApiV3;
 use common::database::USER_USER_PAT;
-use common::environment::{with_test_environment, TestEnvironment};
+use common::environment::{TestEnvironment, with_test_environment};
 
 mod common;
 
diff --git a/apps/labrinth/tests/files/200x200.png b/apps/labrinth/tests/files/200x200.png
index bb923179..d8e437a5 100644
Binary files a/apps/labrinth/tests/files/200x200.png and b/apps/labrinth/tests/files/200x200.png differ
diff --git a/apps/labrinth/tests/games.rs b/apps/labrinth/tests/games.rs
index c078f994..5b423ef4 100644
--- a/apps/labrinth/tests/games.rs
+++ b/apps/labrinth/tests/games.rs
@@ -2,7 +2,7 @@
 
 use common::{
     api_v3::ApiV3,
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
 };
 
 mod common;
diff --git a/apps/labrinth/tests/loader_fields.rs b/apps/labrinth/tests/loader_fields.rs
index 78ee67a4..7caf8beb 100644
--- a/apps/labrinth/tests/loader_fields.rs
+++ b/apps/labrinth/tests/loader_fields.rs
@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use actix_http::StatusCode;
 use actix_web::test;
 use common::api_v3::ApiV3;
-use common::environment::{with_test_environment, TestEnvironment};
+use common::environment::{TestEnvironment, with_test_environment};
 use itertools::Itertools;
 use labrinth::database::models::legacy_loader_fields::MinecraftGameVersion;
 use labrinth::models::v3;
@@ -364,16 +364,20 @@ async fn creating_loader_fields() {
             project.fields.get("game_versions").unwrap(),
             &[json!("1.20.1"), json!("1.20.2"), json!("1.20.5")]
         );
-        assert!(project
-            .fields
-            .get("singleplayer")
-            .unwrap()
-            .contains(&json!(false)));
-        assert!(project
-            .fields
-            .get("singleplayer")
-            .unwrap()
-            .contains(&json!(true)));
+        assert!(
+            project
+                .fields
+                .get("singleplayer")
+                .unwrap()
+                .contains(&json!(false))
+        );
+        assert!(
+            project
+                .fields
+                .get("singleplayer")
+                .unwrap()
+                .contains(&json!(true))
+        );
     })
     .await
 }
@@ -487,7 +491,7 @@ async fn test_multi_get_redis_cache() {
             // Create 5 modpacks
             let mut modpacks = Vec::new();
             for i in 0..5 {
-                let slug = format!("test-modpack-{}", i);
+                let slug = format!("test-modpack-{i}");
 
                 let creation_data = get_public_project_creation_data(
                     &slug,
@@ -503,7 +507,7 @@ async fn test_multi_get_redis_cache() {
             // Create 5 mods
             let mut mods = Vec::new();
             for i in 0..5 {
-                let slug = format!("test-mod-{}", i);
+                let slug = format!("test-mod-{i}");
 
                 let creation_data = get_public_project_creation_data(
                     &slug,
diff --git a/apps/labrinth/tests/oauth.rs b/apps/labrinth/tests/oauth.rs
index 4ff3fc5c..d10bfe35 100644
--- a/apps/labrinth/tests/oauth.rs
+++ b/apps/labrinth/tests/oauth.rs
@@ -1,20 +1,20 @@
 use actix_http::StatusCode;
+use actix_web::http::header::{CACHE_CONTROL, PRAGMA};
 use actix_web::test;
 use common::{
     api_v3::oauth::get_redirect_location_query_params,
     api_v3::{
+        ApiV3,
         oauth::{
             get_auth_code_from_redirect_params, get_authorize_accept_flow_id,
         },
-        ApiV3,
     },
     database::FRIEND_USER_ID,
     database::{FRIEND_USER_PAT, USER_USER_ID, USER_USER_PAT},
     dummy_data::DummyOAuthClientAlpha,
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
 };
 use labrinth::auth::oauth::TokenResponse;
-use reqwest::header::{CACHE_CONTROL, PRAGMA};
 
 mod common;
 
@@ -28,7 +28,7 @@ async fn oauth_flow_happy_path() {
         } = &env.dummy.oauth_client_alpha;
 
         // Initiate authorization
-        let redirect_uri = format!("{}?foo=bar", base_redirect_uri);
+        let redirect_uri = format!("{base_redirect_uri}?foo=bar");
         let original_state = "1234";
         let resp = env
             .api
diff --git a/apps/labrinth/tests/oauth_clients.rs b/apps/labrinth/tests/oauth_clients.rs
index 335dbca4..3ababa4a 100644
--- a/apps/labrinth/tests/oauth_clients.rs
+++ b/apps/labrinth/tests/oauth_clients.rs
@@ -4,7 +4,7 @@ use common::{
     api_v3::ApiV3,
     database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_ID, USER_USER_PAT},
     dummy_data::DummyOAuthClientAlpha,
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
     get_json_val_str,
 };
 use labrinth::{
diff --git a/apps/labrinth/tests/organizations.rs b/apps/labrinth/tests/organizations.rs
index 1a570b35..2e5f259f 100644
--- a/apps/labrinth/tests/organizations.rs
+++ b/apps/labrinth/tests/organizations.rs
@@ -1,27 +1,25 @@
 use crate::common::{
     api_common::{ApiProject, ApiTeams},
     database::{
-        generate_random_name, ADMIN_USER_PAT, ENEMY_USER_ID_PARSED,
-        ENEMY_USER_PAT, FRIEND_USER_ID_PARSED, MOD_USER_ID, MOD_USER_PAT,
-        USER_USER_ID, USER_USER_ID_PARSED,
+        ADMIN_USER_PAT, ENEMY_USER_ID_PARSED, ENEMY_USER_PAT,
+        FRIEND_USER_ID_PARSED, MOD_USER_ID, MOD_USER_PAT, USER_USER_ID,
+        USER_USER_ID_PARSED, generate_random_name,
     },
     dummy_data::{
         DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta,
     },
 };
 use actix_http::StatusCode;
+use ariadne::ids::UserId;
 use common::{
     api_v3::ApiV3,
     database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT},
     environment::{
-        with_test_environment, with_test_environment_all, TestEnvironment,
+        TestEnvironment, with_test_environment, with_test_environment_all,
     },
     permissions::{PermissionsTest, PermissionsTestContext},
 };
-use labrinth::models::{
-    teams::{OrganizationPermissions, ProjectPermissions},
-    users::UserId,
-};
+use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use serde_json::json;
 
 mod common;
@@ -372,9 +370,11 @@ async fn add_remove_organization_projects() {
                     USER_USER_PAT,
                 )
                 .await;
-            assert!(projects
-                .iter()
-                .any(|p| p.id.to_string() == alpha_project_id));
+            assert!(
+                projects
+                    .iter()
+                    .any(|p| p.id.to_string() == alpha_project_id)
+            );
 
             // Add/remove project to organization, first by ID, then by slug
             for alpha in [alpha_project_id, alpha_project_slug] {
@@ -411,9 +411,11 @@ async fn add_remove_organization_projects() {
                         USER_USER_PAT,
                     )
                     .await;
-                assert!(!projects
-                    .iter()
-                    .any(|p| p.id.to_string() == alpha_project_id));
+                assert!(
+                    !projects
+                        .iter()
+                        .any(|p| p.id.to_string() == alpha_project_id)
+                );
 
                 // Remove project from organization
                 let resp = test_env
@@ -437,9 +439,11 @@ async fn add_remove_organization_projects() {
                         USER_USER_PAT,
                     )
                     .await;
-                assert!(projects
-                    .iter()
-                    .any(|p| p.id.to_string() == alpha_project_id));
+                assert!(
+                    projects
+                        .iter()
+                        .any(|p| p.id.to_string() == alpha_project_id)
+                );
 
                 // Get organization projects
                 let projects = test_env
diff --git a/apps/labrinth/tests/pats.rs b/apps/labrinth/tests/pats.rs
index 07b130f9..70afaf26 100644
--- a/apps/labrinth/tests/pats.rs
+++ b/apps/labrinth/tests/pats.rs
@@ -81,7 +81,7 @@ pub async fn pat_full_test() {
 
         // Change scopes and test again
         let req = test::TestRequest::patch()
-            .uri(&format!("/_internal/pat/{}", id))
+            .uri(&format!("/_internal/pat/{id}"))
             .append_pat(USER_USER_PAT)
             .set_json(json!({
                 "scopes": 0,
@@ -93,7 +93,7 @@ pub async fn pat_full_test() {
 
         // Change scopes back, and set expiry to the past, and test again
         let req = test::TestRequest::patch()
-            .uri(&format!("/_internal/pat/{}", id))
+            .uri(&format!("/_internal/pat/{id}"))
             .append_pat(USER_USER_PAT)
             .set_json(json!({
                 "scopes": Scopes::COLLECTION_CREATE,
@@ -109,21 +109,21 @@ pub async fn pat_full_test() {
 
         // Change everything back to normal and test again
         let req = test::TestRequest::patch()
-            .uri(&format!("/_internal/pat/{}", id))
+            .uri(&format!("/_internal/pat/{id}"))
             .append_pat(USER_USER_PAT)
             .set_json(json!({
                 "expires": Utc::now() + Duration::days(1), // no longer expired!
             }))
             .to_request();
 
-        println!("PAT ID FOR TEST: {}", id);
+        println!("PAT ID FOR TEST: {id}");
         let resp = test_env.call(req).await;
         assert_status!(&resp, StatusCode::NO_CONTENT);
         assert_eq!(mock_pat_test(access_token).await, 200); // Works again
 
         // Patching to a bad expiry should fail
         let req = test::TestRequest::patch()
-            .uri(&format!("/_internal/pat/{}", id))
+            .uri(&format!("/_internal/pat/{id}"))
             .append_pat(USER_USER_PAT)
             .set_json(json!({
                 "expires": Utc::now() - Duration::days(1), // Past
@@ -140,7 +140,7 @@ pub async fn pat_full_test() {
             }
 
             let req = test::TestRequest::patch()
-                .uri(&format!("/_internal/pat/{}", id))
+                .uri(&format!("/_internal/pat/{id}"))
                 .append_pat(USER_USER_PAT)
                 .set_json(json!({
                     "scopes": scope.bits(),
@@ -156,7 +156,7 @@ pub async fn pat_full_test() {
         // Delete PAT
         let req = test::TestRequest::delete()
             .append_pat(USER_USER_PAT)
-            .uri(&format!("/_internal/pat/{}", id))
+            .uri(&format!("/_internal/pat/{id}"))
             .to_request();
         let resp = test_env.call(req).await;
         assert_status!(&resp, StatusCode::NO_CONTENT);
@@ -260,7 +260,7 @@ pub async fn bad_pats() {
 
         // Patching to a bad expiry should fail
         let req = test::TestRequest::patch()
-            .uri(&format!("/_internal/pat/{}", id))
+            .uri(&format!("/_internal/pat/{id}"))
             .append_pat(USER_USER_PAT)
             .set_json(json!({
                 "expires": Utc::now() - Duration::days(1), // Past
@@ -277,7 +277,7 @@ pub async fn bad_pats() {
             }
 
             let req = test::TestRequest::patch()
-                .uri(&format!("/_internal/pat/{}", id))
+                .uri(&format!("/_internal/pat/{id}"))
                 .append_pat(USER_USER_PAT)
                 .set_json(json!({
                     "scopes": scope.bits(),
diff --git a/apps/labrinth/tests/project.rs b/apps/labrinth/tests/project.rs
index 8ee34ca2..1c202935 100644
--- a/apps/labrinth/tests/project.rs
+++ b/apps/labrinth/tests/project.rs
@@ -4,20 +4,6 @@ use common::api_v3::ApiV3;
 use common::database::*;
 use common::dummy_data::DUMMY_CATEGORIES;
 
-use ariadne::ids::base62_impl::parse_base62;
-use common::environment::{
-    with_test_environment, with_test_environment_all, TestEnvironment,
-};
-use common::permissions::{PermissionsTest, PermissionsTestContext};
-use futures::StreamExt;
-use labrinth::database::models::project_item::{
-    PROJECTS_NAMESPACE, PROJECTS_SLUGS_NAMESPACE,
-};
-use labrinth::models::projects::ProjectId;
-use labrinth::models::teams::ProjectPermissions;
-use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
-use serde_json::json;
-
 use crate::common::api_common::models::CommonProject;
 use crate::common::api_common::request_data::ProjectCreationRequestData;
 use crate::common::api_common::{ApiProject, ApiTeams, ApiVersion};
@@ -25,6 +11,22 @@ use crate::common::dummy_data::{
     DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta,
     TestFile,
 };
+use ariadne::ids::base62_impl::parse_base62;
+use common::environment::{
+    TestEnvironment, with_test_environment, with_test_environment_all,
+};
+use common::permissions::{PermissionsTest, PermissionsTestContext};
+use futures::StreamExt;
+use hex::ToHex;
+use labrinth::database::models::project_item::{
+    PROJECTS_NAMESPACE, PROJECTS_SLUGS_NAMESPACE,
+};
+use labrinth::models::ids::ProjectId;
+use labrinth::models::teams::ProjectPermissions;
+use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
+use serde_json::json;
+use sha1::Digest;
+
 mod common;
 
 #[actix_rt::test]
@@ -204,9 +206,8 @@ async fn test_add_remove_project() {
             let uploaded_version_id = project.versions[0];
 
             // Checks files to ensure they were uploaded and correctly identify the file
-            let hash = sha1::Sha1::from(basic_mod_file.bytes())
-                .digest()
-                .to_string();
+            let hash = sha1::Sha1::digest(basic_mod_file.bytes())
+                .encode_hex::<String>();
             let version = api
                 .get_version_from_hash_deserialized_common(
                     &hash,
diff --git a/apps/labrinth/tests/scopes.rs b/apps/labrinth/tests/scopes.rs
index 460998bf..c71a74e3 100644
--- a/apps/labrinth/tests/scopes.rs
+++ b/apps/labrinth/tests/scopes.rs
@@ -8,22 +8,21 @@ use crate::common::dummy_data::{
 };
 use actix_http::StatusCode;
 use actix_web::test;
+use ariadne::ids::UserId;
 use ariadne::ids::base62_impl::parse_base62;
 use chrono::{Duration, Utc};
-use common::api_common::models::CommonItemType;
 use common::api_common::Api;
-use common::api_v3::request_data::get_public_project_creation_data;
+use common::api_common::models::CommonItemType;
 use common::api_v3::ApiV3;
+use common::api_v3::request_data::get_public_project_creation_data;
 use common::dummy_data::TestFile;
 use common::environment::{
-    with_test_environment, with_test_environment_all, TestEnvironment,
+    TestEnvironment, with_test_environment, with_test_environment_all,
 };
 use common::{database::*, scopes::ScopeTest};
+use labrinth::models::ids::ProjectId;
 use labrinth::models::pats::Scopes;
-use labrinth::models::projects::ProjectId;
-use labrinth::models::users::UserId;
 use serde_json::json;
-
 // For each scope, we (using test_scope):
 // - create a PAT with a given set of scopes for a function
 // - create a PAT with all other scopes for a function
@@ -380,16 +379,20 @@ pub async fn project_version_reads_scopes() {
             .test(req_gen, read_project)
             .await
             .unwrap();
-        assert!(!failure
-            .as_array()
-            .unwrap()
-            .iter()
-            .any(|x| x["status"] == "processing"));
-        assert!(success
-            .as_array()
-            .unwrap()
-            .iter()
-            .any(|x| x["status"] == "processing"));
+        assert!(
+            !failure
+                .as_array()
+                .unwrap()
+                .iter()
+                .any(|x| x["status"] == "processing")
+        );
+        assert!(
+            success
+                .as_array()
+                .unwrap()
+                .iter()
+                .any(|x| x["status"] == "processing")
+        );
 
         // Project metadata reading
         let req_gen = |pat: Option<String>| async move {
diff --git a/apps/labrinth/tests/search.rs b/apps/labrinth/tests/search.rs
index 722e4189..e05b13de 100644
--- a/apps/labrinth/tests/search.rs
+++ b/apps/labrinth/tests/search.rs
@@ -5,8 +5,8 @@ use common::database::*;
 use common::dummy_data::DUMMY_CATEGORIES;
 
 use ariadne::ids::base62_impl::parse_base62;
-use common::environment::with_test_environment;
 use common::environment::TestEnvironment;
+use common::environment::with_test_environment;
 use common::search::setup_search_projects;
 use futures::stream::StreamExt;
 use serde_json::json;
@@ -114,7 +114,7 @@ async fn search_projects() {
                         let num_hits = projects.total_hits;
                         expected_project_ids.sort();
                         found_project_ids.sort();
-                        println!("Facets: {:?}", facets);
+                        println!("Facets: {facets:?}");
                         assert_eq!(found_project_ids, expected_project_ids);
                         assert_eq!(num_hits, { expected_project_ids.len() });
                     }
diff --git a/apps/labrinth/tests/tags.rs b/apps/labrinth/tests/tags.rs
index 264c7e29..8f4295dd 100644
--- a/apps/labrinth/tests/tags.rs
+++ b/apps/labrinth/tests/tags.rs
@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use common::{
     api_v3::ApiV3,
     environment::{
-        with_test_environment, with_test_environment_all, TestEnvironment,
+        TestEnvironment, with_test_environment, with_test_environment_all,
     },
 };
 
diff --git a/apps/labrinth/tests/teams.rs b/apps/labrinth/tests/teams.rs
index 4743ecf4..4645eec9 100644
--- a/apps/labrinth/tests/teams.rs
+++ b/apps/labrinth/tests/teams.rs
@@ -3,7 +3,7 @@ use actix_http::StatusCode;
 use common::{
     api_v3::ApiV3,
     environment::{
-        with_test_environment, with_test_environment_all, TestEnvironment,
+        TestEnvironment, with_test_environment, with_test_environment_all,
     },
 };
 use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
diff --git a/apps/labrinth/tests/user.rs b/apps/labrinth/tests/user.rs
index b1b7bfd0..d01ffb82 100644
--- a/apps/labrinth/tests/user.rs
+++ b/apps/labrinth/tests/user.rs
@@ -94,9 +94,11 @@ pub async fn get_user_projects_after_joining_team_shows_team_projects() {
                 FRIEND_USER_PAT,
             )
             .await;
-        assert!(projects
-            .iter()
-            .any(|p| p.id.to_string() == *alpha_project_id));
+        assert!(
+            projects
+                .iter()
+                .any(|p| p.id.to_string() == *alpha_project_id)
+        );
     })
     .await;
 }
@@ -131,9 +133,11 @@ pub async fn get_user_projects_after_leaving_team_shows_no_team_projects() {
                 FRIEND_USER_PAT,
             )
             .await;
-        assert!(!projects
-            .iter()
-            .any(|p| p.id.to_string() == *alpha_project_id));
+        assert!(
+            !projects
+                .iter()
+                .any(|p| p.id.to_string() == *alpha_project_id)
+        );
     })
     .await;
 }
diff --git a/apps/labrinth/tests/v2/error.rs b/apps/labrinth/tests/v2/error.rs
index 1ae56a71..da98df47 100644
--- a/apps/labrinth/tests/v2/error.rs
+++ b/apps/labrinth/tests/v2/error.rs
@@ -8,7 +8,7 @@ use bytes::Bytes;
 use crate::common::database::USER_USER_PAT;
 use crate::common::{
     api_v2::ApiV2,
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
 };
 #[actix_rt::test]
 pub async fn error_404_empty() {
diff --git a/apps/labrinth/tests/v2/notifications.rs b/apps/labrinth/tests/v2/notifications.rs
index 692ae138..f481f3cf 100644
--- a/apps/labrinth/tests/v2/notifications.rs
+++ b/apps/labrinth/tests/v2/notifications.rs
@@ -2,7 +2,7 @@ use crate::common::{
     api_common::ApiTeams,
     api_v2::ApiV2,
     database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT},
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
 };
 
 #[actix_rt::test]
diff --git a/apps/labrinth/tests/v2/project.rs b/apps/labrinth/tests/v2/project.rs
index d81f263e..32dc6d73 100644
--- a/apps/labrinth/tests/v2/project.rs
+++ b/apps/labrinth/tests/v2/project.rs
@@ -4,13 +4,13 @@ use crate::{
     assert_status,
     common::{
         api_common::{ApiProject, ApiVersion, AppendsOptionalPat},
-        api_v2::{request_data::get_public_project_creation_data_json, ApiV2},
+        api_v2::{ApiV2, request_data::get_public_project_creation_data_json},
         database::{
-            generate_random_name, ADMIN_USER_PAT, FRIEND_USER_ID,
-            FRIEND_USER_PAT, USER_USER_PAT,
+            ADMIN_USER_PAT, FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT,
+            generate_random_name,
         },
         dummy_data::TestFile,
-        environment::{with_test_environment, TestEnvironment},
+        environment::{TestEnvironment, with_test_environment},
         permissions::{PermissionsTest, PermissionsTestContext},
     },
 };
@@ -18,13 +18,16 @@ use actix_http::StatusCode;
 use actix_web::test;
 use ariadne::ids::base62_impl::parse_base62;
 use futures::StreamExt;
+use hex::ToHex;
 use itertools::Itertools;
+use labrinth::models::ids::ProjectId;
 use labrinth::{
     database::models::project_item::PROJECTS_SLUGS_NAMESPACE,
-    models::{projects::ProjectId, teams::ProjectPermissions},
+    models::teams::ProjectPermissions,
     util::actix::{AppendsMultipart, MultipartSegment, MultipartSegmentData},
 };
 use serde_json::json;
+use sha1::Digest;
 
 #[actix_rt::test]
 async fn test_project_type_sanity() {
@@ -202,9 +205,8 @@ async fn test_add_remove_project() {
             let uploaded_version_id = project.versions[0];
 
             // Checks files to ensure they were uploaded and correctly identify the file
-            let hash = sha1::Sha1::from(basic_mod_file.bytes())
-                .digest()
-                .to_string();
+            let hash = sha1::Sha1::digest(basic_mod_file.bytes())
+                .encode_hex::<String>();
             let version = api
                 .get_version_from_hash_deserialized(
                     &hash,
@@ -468,7 +470,7 @@ async fn permissions_patch_project_v2() {
                 .map(|(key, value)| {
                     let test_env = test_env.clone();
                     async move {
-                        let req_gen = |ctx: PermissionsTestContext| async {
+                        let req_gen = async |ctx: PermissionsTestContext| {
                             api.edit_project(
                             &ctx.project_id.unwrap(),
                             json!({
diff --git a/apps/labrinth/tests/v2/scopes.rs b/apps/labrinth/tests/v2/scopes.rs
index 693d4af5..30e2affe 100644
--- a/apps/labrinth/tests/v2/scopes.rs
+++ b/apps/labrinth/tests/v2/scopes.rs
@@ -1,14 +1,14 @@
 use crate::common::api_common::ApiProject;
 use crate::common::api_common::ApiVersion;
-use crate::common::api_v2::request_data::get_public_project_creation_data;
 use crate::common::api_v2::ApiV2;
+use crate::common::api_v2::request_data::get_public_project_creation_data;
 use crate::common::dummy_data::TestFile;
-use crate::common::environment::with_test_environment;
 use crate::common::environment::TestEnvironment;
+use crate::common::environment::with_test_environment;
 use crate::common::scopes::ScopeTest;
 use ariadne::ids::base62_impl::parse_base62;
+use labrinth::models::ids::ProjectId;
 use labrinth::models::pats::Scopes;
-use labrinth::models::projects::ProjectId;
 
 // Project version creation scopes
 #[actix_rt::test]
diff --git a/apps/labrinth/tests/v2/search.rs b/apps/labrinth/tests/v2/search.rs
index 09116697..78b9f1a0 100644
--- a/apps/labrinth/tests/v2/search.rs
+++ b/apps/labrinth/tests/v2/search.rs
@@ -5,10 +5,10 @@ use crate::common::api_common::ApiVersion;
 use crate::common::api_v2::ApiV2;
 
 use crate::common::database::*;
-use crate::common::dummy_data::TestFile;
 use crate::common::dummy_data::DUMMY_CATEGORIES;
-use crate::common::environment::with_test_environment;
+use crate::common::dummy_data::TestFile;
 use crate::common::environment::TestEnvironment;
+use crate::common::environment::with_test_environment;
 use actix_http::StatusCode;
 use ariadne::ids::base62_impl::parse_base62;
 use futures::stream::StreamExt;
@@ -328,7 +328,7 @@ async fn search_projects() {
                         .collect();
                     expected_project_ids.sort();
                     found_project_ids.sort();
-                    println!("Facets: {:?}", facets);
+                    println!("Facets: {facets:?}");
                     assert_eq!(found_project_ids, expected_project_ids);
                 }
             })
diff --git a/apps/labrinth/tests/v2/tags.rs b/apps/labrinth/tests/v2/tags.rs
index 1171e650..8a580063 100644
--- a/apps/labrinth/tests/v2/tags.rs
+++ b/apps/labrinth/tests/v2/tags.rs
@@ -5,7 +5,7 @@ use std::collections::HashSet;
 
 use crate::common::{
     api_v2::ApiV2,
-    environment::{with_test_environment, TestEnvironment},
+    environment::{TestEnvironment, with_test_environment},
 };
 
 #[actix_rt::test]
diff --git a/apps/labrinth/tests/v2/teams.rs b/apps/labrinth/tests/v2/teams.rs
index 545b821d..67f0a5c9 100644
--- a/apps/labrinth/tests/v2/teams.rs
+++ b/apps/labrinth/tests/v2/teams.rs
@@ -11,7 +11,7 @@ use crate::{
             FRIEND_USER_ID, FRIEND_USER_ID_PARSED, FRIEND_USER_PAT,
             USER_USER_ID_PARSED, USER_USER_PAT,
         },
-        environment::{with_test_environment, TestEnvironment},
+        environment::{TestEnvironment, with_test_environment},
     },
 };
 
diff --git a/apps/labrinth/tests/v2/version.rs b/apps/labrinth/tests/v2/version.rs
index b4195bef..dd9757ff 100644
--- a/apps/labrinth/tests/v2/version.rs
+++ b/apps/labrinth/tests/v2/version.rs
@@ -1,20 +1,19 @@
+use crate::assert_status;
+use crate::common::api_common::{ApiProject, ApiVersion};
+use crate::common::api_v2::ApiV2;
 use actix_http::StatusCode;
 use actix_web::test;
 use futures::StreamExt;
-use labrinth::models::projects::VersionId;
+use labrinth::models::ids::VersionId;
 use labrinth::{
     models::projects::{Loader, VersionStatus, VersionType},
     routes::v2::version_file::FileUpdateData,
 };
 use serde_json::json;
 
-use crate::assert_status;
-use crate::common::api_common::{ApiProject, ApiVersion};
-use crate::common::api_v2::ApiV2;
-
 use crate::common::api_v2::request_data::get_public_project_creation_data;
 use crate::common::dummy_data::{DummyProjectAlpha, DummyProjectBeta};
-use crate::common::environment::{with_test_environment, TestEnvironment};
+use crate::common::environment::{TestEnvironment, with_test_environment};
 use crate::common::{
     database::{ENEMY_USER_PAT, USER_USER_PAT},
     dummy_data::TestFile,
@@ -470,10 +469,10 @@ async fn add_version_project_types_v2() {
                 )
                 .await;
             assert_eq!(test_project.project_type, "project"); // No project_type set, as no versions are set
-                                                              // Default to 'project' if none are found
-                                                              // This is a known difference between older v2 ,but is acceptable.
-                                                              // This would be the appropriate test on older v2:
-                                                              // assert_eq!(test_project.project_type, "modpack");
+            // Default to 'project' if none are found
+            // This is a known difference between older v2 ,but is acceptable.
+            // This would be the appropriate test on older v2:
+            // assert_eq!(test_project.project_type, "modpack");
 
             // Create a version with a modpack file attached
             let test_version = api
diff --git a/apps/labrinth/tests/version.rs b/apps/labrinth/tests/version.rs
index 24a6a71d..bd86f898 100644
--- a/apps/labrinth/tests/version.rs
+++ b/apps/labrinth/tests/version.rs
@@ -15,8 +15,9 @@ use common::database::USER_USER_PAT;
 use common::environment::{with_test_environment, with_test_environment_all};
 use futures::StreamExt;
 use labrinth::database::models::version_item::VERSIONS_NAMESPACE;
+use labrinth::models::ids::VersionId;
 use labrinth::models::projects::{
-    Dependency, DependencyType, VersionId, VersionStatus, VersionType,
+    Dependency, DependencyType, VersionStatus, VersionType,
 };
 use labrinth::routes::v3::version_file::FileUpdateData;
 use serde_json::json;
diff --git a/docker-compose.yml b/docker-compose.yml
index 74baebc7..4b4d073c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   postgres_db:
     image: postgres:alpine
@@ -32,6 +31,9 @@ services:
     image: clickhouse/clickhouse-server
     ports:
       - '8123:8123'
+    environment:
+      CLICKHOUSE_USER: default
+      CLICKHOUSE_PASSWORD: default
 volumes:
   meilisearch-data:
   db-data:
diff --git a/packages/app-lib/.env.example b/packages/app-lib/.env.example
new file mode 100644
index 00000000..e648f5b5
--- /dev/null
+++ b/packages/app-lib/.env.example
@@ -0,0 +1,2 @@
+# SQLite database file location
+DATABASE_URL=sqlite:///tmp/Modrinth/code/packages/app-lib/.sqlx/generated/state.db
diff --git a/packages/app-lib/.sqlx/query-1a979fbc58be7dde562b6f7c8fdcf9a4fc5a9817f4831c66bd56f2f4d0a00f82.json b/packages/app-lib/.sqlx/query-1a979fbc58be7dde562b6f7c8fdcf9a4fc5a9817f4831c66bd56f2f4d0a00f82.json
new file mode 100644
index 00000000..01e5e90d
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-1a979fbc58be7dde562b6f7c8fdcf9a4fc5a9817f4831c66bd56f2f4d0a00f82.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            DELETE FROM attached_world_data\n            WHERE profile_path = $1 and world_type = $2 and world_id = $3\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "1a979fbc58be7dde562b6f7c8fdcf9a4fc5a9817f4831c66bd56f2f4d0a00f82"
+}
diff --git a/packages/app-lib/.sqlx/query-27283e20fc86c941c7d6d09259d8f4ec2e248f751f98140f77bea4f9d5971ef1.json b/packages/app-lib/.sqlx/query-27283e20fc86c941c7d6d09259d8f4ec2e248f751f98140f77bea4f9d5971ef1.json
new file mode 100644
index 00000000..9c980340
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-27283e20fc86c941c7d6d09259d8f4ec2e248f751f98140f77bea4f9d5971ef1.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO profiles (\n                path, install_stage, name, icon_path,\n                game_version, mod_loader, mod_loader_version,\n                groups,\n                linked_project_id, linked_version_id, locked,\n                created, modified, last_played,\n                submitted_time_played, recent_time_played,\n                override_java_path, override_extra_launch_args, override_custom_env_vars,\n                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,\n                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit,\n                protocol_version, launcher_feature_version\n            )\n            VALUES (\n                $1, $2, $3, $4,\n                $5, $6, $7,\n                jsonb($8),\n                $9, $10, $11,\n                $12, $13, $14,\n                $15, $16,\n                $17, jsonb($18), jsonb($19),\n                $20, $21, $22, $23,\n                $24, $25, $26,\n                $27, $28\n            )\n            ON CONFLICT (path) DO UPDATE SET\n                install_stage = $2,\n                name = $3,\n                icon_path = $4,\n\n                game_version = $5,\n                mod_loader = $6,\n                mod_loader_version = $7,\n\n                groups = jsonb($8),\n\n                linked_project_id = $9,\n                linked_version_id = $10,\n                locked = $11,\n\n                created = $12,\n                modified = $13,\n                last_played = $14,\n\n                submitted_time_played = $15,\n                recent_time_played = $16,\n\n                override_java_path = $17,\n                override_extra_launch_args = jsonb($18),\n                override_custom_env_vars = jsonb($19),\n                override_mc_memory_max = $20,\n                override_mc_force_fullscreen = $21,\n                override_mc_game_resolution_x = $22,\n                override_mc_game_resolution_y = $23,\n\n                override_hook_pre_launch = $24,\n                override_hook_wrapper = $25,\n                override_hook_post_exit = $26,\n\n                protocol_version = $27,\n                launcher_feature_version = $28\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 28
+    },
+    "nullable": []
+  },
+  "hash": "27283e20fc86c941c7d6d09259d8f4ec2e248f751f98140f77bea4f9d5971ef1"
+}
diff --git a/packages/app-lib/.sqlx/query-54a8629d3d660bfeed582b08aee4a8f1543f6b962e54ecab491a006d28c9a18c.json b/packages/app-lib/.sqlx/query-54a8629d3d660bfeed582b08aee4a8f1543f6b962e54ecab491a006d28c9a18c.json
new file mode 100644
index 00000000..aaea116c
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-54a8629d3d660bfeed582b08aee4a8f1543f6b962e54ecab491a006d28c9a18c.json
@@ -0,0 +1,38 @@
+{
+  "db_name": "SQLite",
+  "query": "\n        SELECT profile_path, host, port, join_time\n        FROM join_log\n        WHERE profile_path = $1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "profile_path",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "host",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "port",
+        "ordinal": 2,
+        "type_info": "Integer"
+      },
+      {
+        "name": "join_time",
+        "ordinal": 3,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "54a8629d3d660bfeed582b08aee4a8f1543f6b962e54ecab491a006d28c9a18c"
+}
diff --git a/packages/app-lib/.sqlx/query-5265d5ad85da898855d628f6b45e39026908fc950aad3c7797be37b5d0b74094.json b/packages/app-lib/.sqlx/query-6a434cc55635b6e325e9e5f06d21b787af281db4402c8ff45fe6a77b5be6c929.json
similarity index 72%
rename from packages/app-lib/.sqlx/query-5265d5ad85da898855d628f6b45e39026908fc950aad3c7797be37b5d0b74094.json
rename to packages/app-lib/.sqlx/query-6a434cc55635b6e325e9e5f06d21b787af281db4402c8ff45fe6a77b5be6c929.json
index 279912e8..03d8aeca 100644
--- a/packages/app-lib/.sqlx/query-5265d5ad85da898855d628f6b45e39026908fc950aad3c7797be37b5d0b74094.json
+++ b/packages/app-lib/.sqlx/query-6a434cc55635b6e325e9e5f06d21b787af281db4402c8ff45fe6a77b5be6c929.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                path, install_stage, name, icon_path,\n                game_version, mod_loader, mod_loader_version,\n                json(groups) as \"groups!: serde_json::Value\",\n                linked_project_id, linked_version_id, locked,\n                created, modified, last_played,\n                submitted_time_played, recent_time_played,\n                override_java_path,\n                json(override_extra_launch_args) as \"override_extra_launch_args!: serde_json::Value\", json(override_custom_env_vars) as \"override_custom_env_vars!: serde_json::Value\",\n                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,\n                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit\n            FROM profiles\n            WHERE path IN (SELECT value FROM json_each($1))",
+  "query": "\n            SELECT\n                path, install_stage, launcher_feature_version, name, icon_path,\n                game_version, protocol_version, mod_loader, mod_loader_version,\n                json(groups) as \"groups!: serde_json::Value\",\n                linked_project_id, linked_version_id, locked,\n                created, modified, last_played,\n                submitted_time_played, recent_time_played,\n                override_java_path,\n                json(override_extra_launch_args) as \"override_extra_launch_args!: serde_json::Value\", json(override_custom_env_vars) as \"override_custom_env_vars!: serde_json::Value\",\n                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,\n                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit\n            FROM profiles\n            WHERE path IN (SELECT value FROM json_each($1))",
   "describe": {
     "columns": [
       {
@@ -14,123 +14,133 @@
         "type_info": "Text"
       },
       {
-        "name": "name",
+        "name": "launcher_feature_version",
         "ordinal": 2,
         "type_info": "Text"
       },
       {
-        "name": "icon_path",
+        "name": "name",
         "ordinal": 3,
         "type_info": "Text"
       },
       {
-        "name": "game_version",
+        "name": "icon_path",
         "ordinal": 4,
         "type_info": "Text"
       },
       {
-        "name": "mod_loader",
+        "name": "game_version",
         "ordinal": 5,
         "type_info": "Text"
       },
       {
-        "name": "mod_loader_version",
+        "name": "protocol_version",
         "ordinal": 6,
+        "type_info": "Integer"
+      },
+      {
+        "name": "mod_loader",
+        "ordinal": 7,
         "type_info": "Text"
       },
       {
-        "name": "groups!: serde_json::Value",
-        "ordinal": 7,
-        "type_info": "Null"
-      },
-      {
-        "name": "linked_project_id",
+        "name": "mod_loader_version",
         "ordinal": 8,
         "type_info": "Text"
       },
       {
-        "name": "linked_version_id",
+        "name": "groups!: serde_json::Value",
         "ordinal": 9,
+        "type_info": "Null"
+      },
+      {
+        "name": "linked_project_id",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "linked_version_id",
+        "ordinal": 11,
         "type_info": "Text"
       },
       {
         "name": "locked",
-        "ordinal": 10,
-        "type_info": "Integer"
-      },
-      {
-        "name": "created",
-        "ordinal": 11,
-        "type_info": "Integer"
-      },
-      {
-        "name": "modified",
         "ordinal": 12,
         "type_info": "Integer"
       },
       {
-        "name": "last_played",
+        "name": "created",
         "ordinal": 13,
         "type_info": "Integer"
       },
       {
-        "name": "submitted_time_played",
+        "name": "modified",
         "ordinal": 14,
         "type_info": "Integer"
       },
       {
-        "name": "recent_time_played",
+        "name": "last_played",
         "ordinal": 15,
         "type_info": "Integer"
       },
       {
-        "name": "override_java_path",
+        "name": "submitted_time_played",
         "ordinal": 16,
+        "type_info": "Integer"
+      },
+      {
+        "name": "recent_time_played",
+        "ordinal": 17,
+        "type_info": "Integer"
+      },
+      {
+        "name": "override_java_path",
+        "ordinal": 18,
         "type_info": "Text"
       },
       {
         "name": "override_extra_launch_args!: serde_json::Value",
-        "ordinal": 17,
+        "ordinal": 19,
         "type_info": "Null"
       },
       {
         "name": "override_custom_env_vars!: serde_json::Value",
-        "ordinal": 18,
+        "ordinal": 20,
         "type_info": "Null"
       },
       {
         "name": "override_mc_memory_max",
-        "ordinal": 19,
-        "type_info": "Integer"
-      },
-      {
-        "name": "override_mc_force_fullscreen",
-        "ordinal": 20,
-        "type_info": "Integer"
-      },
-      {
-        "name": "override_mc_game_resolution_x",
         "ordinal": 21,
         "type_info": "Integer"
       },
       {
-        "name": "override_mc_game_resolution_y",
+        "name": "override_mc_force_fullscreen",
         "ordinal": 22,
         "type_info": "Integer"
       },
       {
-        "name": "override_hook_pre_launch",
+        "name": "override_mc_game_resolution_x",
         "ordinal": 23,
+        "type_info": "Integer"
+      },
+      {
+        "name": "override_mc_game_resolution_y",
+        "ordinal": 24,
+        "type_info": "Integer"
+      },
+      {
+        "name": "override_hook_pre_launch",
+        "ordinal": 25,
         "type_info": "Text"
       },
       {
         "name": "override_hook_wrapper",
-        "ordinal": 24,
+        "ordinal": 26,
         "type_info": "Text"
       },
       {
         "name": "override_hook_post_exit",
-        "ordinal": 25,
+        "ordinal": 27,
         "type_info": "Text"
       }
     ],
@@ -141,8 +151,10 @@
       false,
       false,
       false,
+      false,
       true,
       false,
+      true,
       false,
       true,
       null,
@@ -166,5 +178,5 @@
       true
     ]
   },
-  "hash": "5265d5ad85da898855d628f6b45e39026908fc950aad3c7797be37b5d0b74094"
+  "hash": "6a434cc55635b6e325e9e5f06d21b787af281db4402c8ff45fe6a77b5be6c929"
 }
diff --git a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
index 9742cb7b..22e39e75 100644
--- a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
+++ b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
@@ -41,7 +41,7 @@
       {
         "name": "display_claims!: serde_json::Value",
         "ordinal": 7,
-        "type_info": "Null"
+        "type_info": "Text"
       }
     ],
     "parameters": {
diff --git a/packages/app-lib/.sqlx/query-a2184fc5d62570aec0a15c0a8d628a597e90c2bf7ce5dc1b39edb6977e2f6da6.json b/packages/app-lib/.sqlx/query-a2184fc5d62570aec0a15c0a8d628a597e90c2bf7ce5dc1b39edb6977e2f6da6.json
new file mode 100644
index 00000000..355af23d
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-a2184fc5d62570aec0a15c0a8d628a597e90c2bf7ce5dc1b39edb6977e2f6da6.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT display_status\n            FROM attached_world_data\n            WHERE profile_path = $1 and world_type = $2 and world_id = $3\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "display_status",
+        "ordinal": 0,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "a2184fc5d62570aec0a15c0a8d628a597e90c2bf7ce5dc1b39edb6977e2f6da6"
+}
diff --git a/packages/app-lib/.sqlx/query-4acd47f6bad3d2d4df5e5d43b3441fa2714cb8ad978adc108acc67f042380df1.json b/packages/app-lib/.sqlx/query-c108849d77c7627d6a11d5be34984938c41283e6091a1301fc3ca0b355ffcfa9.json
similarity index 73%
rename from packages/app-lib/.sqlx/query-4acd47f6bad3d2d4df5e5d43b3441fa2714cb8ad978adc108acc67f042380df1.json
rename to packages/app-lib/.sqlx/query-c108849d77c7627d6a11d5be34984938c41283e6091a1301fc3ca0b355ffcfa9.json
index a28eadf3..75b44104 100644
--- a/packages/app-lib/.sqlx/query-4acd47f6bad3d2d4df5e5d43b3441fa2714cb8ad978adc108acc67f042380df1.json
+++ b/packages/app-lib/.sqlx/query-c108849d77c7627d6a11d5be34984938c41283e6091a1301fc3ca0b355ffcfa9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                path, install_stage, name, icon_path,\n                game_version, mod_loader, mod_loader_version,\n                json(groups) as \"groups!: serde_json::Value\",\n                linked_project_id, linked_version_id, locked,\n                created, modified, last_played,\n                submitted_time_played, recent_time_played,\n                override_java_path,\n                json(override_extra_launch_args) as \"override_extra_launch_args!: serde_json::Value\", json(override_custom_env_vars) as \"override_custom_env_vars!: serde_json::Value\",\n                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,\n                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit\n            FROM profiles\n            WHERE 1=$1",
+  "query": "\n            SELECT\n                path, install_stage, launcher_feature_version, name, icon_path,\n                game_version, protocol_version, mod_loader, mod_loader_version,\n                json(groups) as \"groups!: serde_json::Value\",\n                linked_project_id, linked_version_id, locked,\n                created, modified, last_played,\n                submitted_time_played, recent_time_played,\n                override_java_path,\n                json(override_extra_launch_args) as \"override_extra_launch_args!: serde_json::Value\", json(override_custom_env_vars) as \"override_custom_env_vars!: serde_json::Value\",\n                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,\n                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit\n            FROM profiles\n            WHERE 1=$1",
   "describe": {
     "columns": [
       {
@@ -14,123 +14,133 @@
         "type_info": "Text"
       },
       {
-        "name": "name",
+        "name": "launcher_feature_version",
         "ordinal": 2,
         "type_info": "Text"
       },
       {
-        "name": "icon_path",
+        "name": "name",
         "ordinal": 3,
         "type_info": "Text"
       },
       {
-        "name": "game_version",
+        "name": "icon_path",
         "ordinal": 4,
         "type_info": "Text"
       },
       {
-        "name": "mod_loader",
+        "name": "game_version",
         "ordinal": 5,
         "type_info": "Text"
       },
       {
-        "name": "mod_loader_version",
+        "name": "protocol_version",
         "ordinal": 6,
+        "type_info": "Integer"
+      },
+      {
+        "name": "mod_loader",
+        "ordinal": 7,
         "type_info": "Text"
       },
       {
-        "name": "groups!: serde_json::Value",
-        "ordinal": 7,
-        "type_info": "Null"
-      },
-      {
-        "name": "linked_project_id",
+        "name": "mod_loader_version",
         "ordinal": 8,
         "type_info": "Text"
       },
       {
-        "name": "linked_version_id",
+        "name": "groups!: serde_json::Value",
         "ordinal": 9,
+        "type_info": "Null"
+      },
+      {
+        "name": "linked_project_id",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "linked_version_id",
+        "ordinal": 11,
         "type_info": "Text"
       },
       {
         "name": "locked",
-        "ordinal": 10,
-        "type_info": "Integer"
-      },
-      {
-        "name": "created",
-        "ordinal": 11,
-        "type_info": "Integer"
-      },
-      {
-        "name": "modified",
         "ordinal": 12,
         "type_info": "Integer"
       },
       {
-        "name": "last_played",
+        "name": "created",
         "ordinal": 13,
         "type_info": "Integer"
       },
       {
-        "name": "submitted_time_played",
+        "name": "modified",
         "ordinal": 14,
         "type_info": "Integer"
       },
       {
-        "name": "recent_time_played",
+        "name": "last_played",
         "ordinal": 15,
         "type_info": "Integer"
       },
       {
-        "name": "override_java_path",
+        "name": "submitted_time_played",
         "ordinal": 16,
+        "type_info": "Integer"
+      },
+      {
+        "name": "recent_time_played",
+        "ordinal": 17,
+        "type_info": "Integer"
+      },
+      {
+        "name": "override_java_path",
+        "ordinal": 18,
         "type_info": "Text"
       },
       {
         "name": "override_extra_launch_args!: serde_json::Value",
-        "ordinal": 17,
+        "ordinal": 19,
         "type_info": "Null"
       },
       {
         "name": "override_custom_env_vars!: serde_json::Value",
-        "ordinal": 18,
+        "ordinal": 20,
         "type_info": "Null"
       },
       {
         "name": "override_mc_memory_max",
-        "ordinal": 19,
-        "type_info": "Integer"
-      },
-      {
-        "name": "override_mc_force_fullscreen",
-        "ordinal": 20,
-        "type_info": "Integer"
-      },
-      {
-        "name": "override_mc_game_resolution_x",
         "ordinal": 21,
         "type_info": "Integer"
       },
       {
-        "name": "override_mc_game_resolution_y",
+        "name": "override_mc_force_fullscreen",
         "ordinal": 22,
         "type_info": "Integer"
       },
       {
-        "name": "override_hook_pre_launch",
+        "name": "override_mc_game_resolution_x",
         "ordinal": 23,
+        "type_info": "Integer"
+      },
+      {
+        "name": "override_mc_game_resolution_y",
+        "ordinal": 24,
+        "type_info": "Integer"
+      },
+      {
+        "name": "override_hook_pre_launch",
+        "ordinal": 25,
         "type_info": "Text"
       },
       {
         "name": "override_hook_wrapper",
-        "ordinal": 24,
+        "ordinal": 26,
         "type_info": "Text"
       },
       {
         "name": "override_hook_post_exit",
-        "ordinal": 25,
+        "ordinal": 27,
         "type_info": "Text"
       }
     ],
@@ -141,8 +151,10 @@
       false,
       false,
       false,
+      false,
       true,
       false,
+      true,
       false,
       true,
       null,
@@ -166,5 +178,5 @@
       true
     ]
   },
-  "hash": "4acd47f6bad3d2d4df5e5d43b3441fa2714cb8ad978adc108acc67f042380df1"
+  "hash": "c108849d77c7627d6a11d5be34984938c41283e6091a1301fc3ca0b355ffcfa9"
 }
diff --git a/packages/app-lib/.sqlx/query-db1f94b9c17c790c029a7691620d6bbdcbdfcce4b069b8ed46dc3abd2f5f4e58.json b/packages/app-lib/.sqlx/query-db1f94b9c17c790c029a7691620d6bbdcbdfcce4b069b8ed46dc3abd2f5f4e58.json
deleted file mode 100644
index 4d503ee1..00000000
--- a/packages/app-lib/.sqlx/query-db1f94b9c17c790c029a7691620d6bbdcbdfcce4b069b8ed46dc3abd2f5f4e58.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO profiles (\n                path, install_stage, name, icon_path,\n                game_version, mod_loader, mod_loader_version,\n                groups,\n                linked_project_id, linked_version_id, locked,\n                created, modified, last_played,\n                submitted_time_played, recent_time_played,\n                override_java_path, override_extra_launch_args, override_custom_env_vars,\n                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,\n                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit\n            )\n            VALUES (\n                $1, $2, $3, $4,\n                $5, $6, $7,\n                jsonb($8),\n                $9, $10, $11,\n                $12, $13, $14,\n                $15, $16,\n                $17, jsonb($18), jsonb($19),\n                $20, $21, $22, $23,\n                $24, $25, $26\n            )\n            ON CONFLICT (path) DO UPDATE SET\n                install_stage = $2,\n                name = $3,\n                icon_path = $4,\n\n                game_version = $5,\n                mod_loader = $6,\n                mod_loader_version = $7,\n\n                groups = jsonb($8),\n\n                linked_project_id = $9,\n                linked_version_id = $10,\n                locked = $11,\n\n                created = $12,\n                modified = $13,\n                last_played = $14,\n\n                submitted_time_played = $15,\n                recent_time_played = $16,\n\n                override_java_path = $17,\n                override_extra_launch_args = jsonb($18),\n                override_custom_env_vars = jsonb($19),\n                override_mc_memory_max = $20,\n                override_mc_force_fullscreen = $21,\n                override_mc_game_resolution_x = $22,\n                override_mc_game_resolution_y = $23,\n\n                override_hook_pre_launch = $24,\n                override_hook_wrapper = $25,\n                override_hook_post_exit = $26\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 26
-    },
-    "nullable": []
-  },
-  "hash": "db1f94b9c17c790c029a7691620d6bbdcbdfcce4b069b8ed46dc3abd2f5f4e58"
-}
diff --git a/packages/app-lib/.sqlx/query-df600f2615979ab61bfe235a04add18a4900021ee6ccfc165c9a6dad41046cba.json b/packages/app-lib/.sqlx/query-df600f2615979ab61bfe235a04add18a4900021ee6ccfc165c9a6dad41046cba.json
new file mode 100644
index 00000000..03dcf69e
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-df600f2615979ab61bfe235a04add18a4900021ee6ccfc165c9a6dad41046cba.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO attached_world_data (profile_path, world_type, world_id, display_status)\nVALUES ($1, $2, $3, $4)\nON CONFLICT (profile_path, world_type, world_id) DO UPDATE\n    SET display_status = $4",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "df600f2615979ab61bfe235a04add18a4900021ee6ccfc165c9a6dad41046cba"
+}
diff --git a/packages/app-lib/.sqlx/query-e9f3d57ac9055575366d5ebd40b64f627ae744a20acf5affaa729e68e3eb6641.json b/packages/app-lib/.sqlx/query-e9f3d57ac9055575366d5ebd40b64f627ae744a20acf5affaa729e68e3eb6641.json
new file mode 100644
index 00000000..017a8516
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-e9f3d57ac9055575366d5ebd40b64f627ae744a20acf5affaa729e68e3eb6641.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO join_log (profile_path, host, port, join_time)\n            VALUES ($1, $2, $3, $4)\n            ON CONFLICT (profile_path, host, port) DO UPDATE SET\n                join_time = $4\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "e9f3d57ac9055575366d5ebd40b64f627ae744a20acf5affaa729e68e3eb6641"
+}
diff --git a/packages/app-lib/.sqlx/query-fd834e256e142820f25305ccffaf07f736c5772045b973dcc10573b399111344.json b/packages/app-lib/.sqlx/query-fd834e256e142820f25305ccffaf07f736c5772045b973dcc10573b399111344.json
new file mode 100644
index 00000000..9c963789
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-fd834e256e142820f25305ccffaf07f736c5772045b973dcc10573b399111344.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT world_type, world_id, display_status\n            FROM attached_world_data\n            WHERE profile_path = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "world_type",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "world_id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "display_status",
+        "ordinal": 2,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "fd834e256e142820f25305ccffaf07f736c5772045b973dcc10573b399111344"
+}
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 9278509c..275a31c0 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -1,70 +1,76 @@
 [package]
 name = "theseus"
-version = "0.9.3"
+version = "0.9.5"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
-bytes = "1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde_ini = "0.2.0"
-sha1_smol = { version = "1.0.0", features = ["std"] }
-sha2 = "0.10.8"
-url = "2.2"
-uuid = { version = "1.1", features = ["serde", "v4"] }
-zip = "0.6.5"
-async_zip = { version = "0.0.17", features = ["chrono", "tokio-fs", "deflate", "bzip2", "zstd", "deflate64"] }
-flate2 = "1.0.28"
-tempfile = "3.5.0"
-dashmap = { version = "6.0.1", features = ["serde"] }
+bytes.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+serde_ini.workspace = true
+sha1_smol.workspace = true
+sha2.workspace = true
+url = { workspace = true, features = ["serde"] }
+uuid = { workspace = true, features = ["serde", "v4"] }
+zip.workspace = true
+async_zip = { workspace = true, features = ["chrono", "tokio-fs", "deflate", "bzip2", "zstd", "deflate64"] }
+flate2.workspace = true
+tempfile.workspace = true
+dashmap = { workspace = true, features = ["serde"] }
+quick-xml = { workspace = true, features = ["async-tokio"] }
+enumset.workspace = true
 
-chrono = { version = "0.4.19", features = ["serde"] }
-daedalus = { path = "../../packages/daedalus" }
-dirs = "5.0.1"
+chrono = { workspace = true, features = ["serde"] }
+daedalus.workspace = true
+dirs.workspace = true
 
-regex = "1.5"
-sys-info = "0.9.0"
-sysinfo = "0.30.8"
-thiserror = "1.0"
-either = "1.13"
+regex.workspace = true
+sysinfo = { workspace = true, features = ["system", "disk"] }
+thiserror.workspace = true
+either.workspace = true
 
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.18", features = ["chrono", "env-filter"] }
-tracing-error = "0.2.0"
+tracing.workspace = true
+tracing-subscriber = { workspace = true, features = ["chrono", "env-filter"] }
+tracing-error.workspace = true
 
-paste = { version = "1.0" }
+paste.workspace = true
 
-tauri = { version = "2.0.0-rc", optional = true }
-indicatif = { version = "0.17.3", optional = true }
+tauri = { workspace = true, optional = true }
+indicatif = { workspace = true, optional = true }
 
-async-tungstenite = { version = "0.27.0", features = ["tokio-runtime", "tokio-rustls-webpki-roots"] }
-futures = "0.3"
-reqwest = { version = "0.12.3", features = ["json", "stream", "deflate", "gzip", "brotli", "rustls-tls", "charset", "http2", "macos-system-configuration"], default-features = false }
-tokio = { version = "1", features = ["full"] }
-async-recursion = "1.0.4"
+async-tungstenite = { workspace = true, features = ["tokio-runtime", "tokio-rustls-webpki-roots"] }
+futures = { workspace = true, features = ["async-await", "alloc"] }
+reqwest = { workspace = true, features = ["json", "stream", "deflate", "gzip", "brotli", "rustls-tls-webpki-roots", "charset", "http2", "macos-system-configuration"] }
+tokio = { workspace = true, features = ["time", "io-util", "net", "sync", "fs", "macros", "process"] }
+tokio-util = { workspace = true, features = ["compat"] }
+async-recursion.workspace = true
+fs4 = { workspace = true, features = ["tokio"] }
+async-walkdir.workspace = true
+async-compression = { workspace = true, features = ["tokio", "gzip"] }
 
-notify = { version = "6.1.1", default-features = false }
-notify-debouncer-mini = { version = "0.4.1", default-features = false }
+notify.workspace = true
+notify-debouncer-mini.workspace = true
 
-lazy_static = "1.4.0"
-dunce = "1.0.3"
+dunce.workspace = true
 
-whoami = "1.4.0"
+whoami.workspace = true
 
-discord-rich-presence = "0.2.4"
+discord-rich-presence.workspace = true
 
-p256 = { version = "0.13.2", features = ["ecdsa"] }
-rand = "0.8"
-byteorder = "1.5.0"
-base64 = "0.22.0"
+p256 = { workspace = true, features = ["ecdsa"] }
+rand.workspace = true
+base64.workspace = true
 
-sqlx = { version = "0.8.2", features = [ "runtime-tokio", "sqlite", "macros" ] }
+sqlx = { workspace = true, features = ["runtime-tokio", "sqlite", "macros", "migrate", "json"] }
 
-ariadne = { path = "../ariadne" }
+quartz_nbt = { workspace = true, features = ["serde"] }
+hickory-resolver.workspace = true
+
+ariadne.workspace = true
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.52.0"
+winreg.workspace = true
 
 [features]
 tauri = ["dep:tauri"]
diff --git a/packages/app-lib/migrations/20250318160526_protocol-versions.sql b/packages/app-lib/migrations/20250318160526_protocol-versions.sql
new file mode 100644
index 00000000..d067b3fe
--- /dev/null
+++ b/packages/app-lib/migrations/20250318160526_protocol-versions.sql
@@ -0,0 +1 @@
+ALTER TABLE profiles ADD COLUMN protocol_version INTEGER NULL
diff --git a/packages/app-lib/migrations/20250408181656_add-join-log.sql b/packages/app-lib/migrations/20250408181656_add-join-log.sql
new file mode 100644
index 00000000..119891ee
--- /dev/null
+++ b/packages/app-lib/migrations/20250408181656_add-join-log.sql
@@ -0,0 +1,10 @@
+CREATE TABLE join_log (
+    profile_path TEXT NOT NULL,
+    host TEXT NOT NULL,
+    port INTEGER NOT NULL,
+    join_time INTEGER NOT NULL,
+
+    PRIMARY KEY (profile_path, host, port),
+    FOREIGN KEY (profile_path) REFERENCES profiles(path) ON DELETE CASCADE
+);
+CREATE INDEX join_log_profile_path ON join_log(profile_path);
diff --git a/packages/app-lib/migrations/20250428171350_add-profile-feature-version.sql b/packages/app-lib/migrations/20250428171350_add-profile-feature-version.sql
new file mode 100644
index 00000000..7c41c9c4
--- /dev/null
+++ b/packages/app-lib/migrations/20250428171350_add-profile-feature-version.sql
@@ -0,0 +1 @@
+ALTER TABLE profiles ADD COLUMN launcher_feature_version TEXT NOT NULL DEFAULT 'none'
diff --git a/packages/app-lib/migrations/20250429150111_add-attached-world-data.sql b/packages/app-lib/migrations/20250429150111_add-attached-world-data.sql
new file mode 100644
index 00000000..57944bd8
--- /dev/null
+++ b/packages/app-lib/migrations/20250429150111_add-attached-world-data.sql
@@ -0,0 +1,10 @@
+CREATE TABLE attached_world_data (
+    profile_path TEXT NOT NULL,
+    world_type TEXT CHECK ( world_type in ('singleplayer', 'server') ) NOT NULL,
+    world_id TEXT NOT NULL,
+    display_status TEXT NOT NULL DEFAULT 'normal',
+
+    PRIMARY KEY (profile_path, world_type, world_id),
+    FOREIGN KEY (profile_path) REFERENCES profiles(path) ON DELETE CASCADE
+);
+CREATE INDEX attached_world_data_profile_path ON attached_world_data(profile_path);
diff --git a/packages/app-lib/src/api/handler.rs b/packages/app-lib/src/api/handler.rs
index fd6b766e..67e36b2f 100644
--- a/packages/app-lib/src/api/handler.rs
+++ b/packages/app-lib/src/api/handler.rs
@@ -2,8 +2,8 @@ use std::path::PathBuf;
 
 use crate::{
     event::{
-        emit::{emit_command, emit_warning},
         CommandPayload,
+        emit::{emit_command, emit_warning},
     },
     util::io,
 };
diff --git a/packages/app-lib/src/api/jre.rs b/packages/app-lib/src/api/jre.rs
index df511169..ef193aac 100644
--- a/packages/app-lib/src/api/jre.rs
+++ b/packages/app-lib/src/api/jre.rs
@@ -6,12 +6,13 @@ use dashmap::DashMap;
 use reqwest::Method;
 use serde::Deserialize;
 use std::path::PathBuf;
+use sysinfo::{MemoryRefreshKind, RefreshKind};
 
 use crate::util::io;
 use crate::util::jre::extract_java_majorminor_version;
 use crate::{
-    util::jre::{self},
     LoadingBarType, State,
+    util::jre::{self},
 };
 
 pub async fn get_java_versions() -> crate::Result<DashMap<u32, JavaVersion>> {
@@ -175,11 +176,10 @@ pub async fn test_jre(
 
 // Gets maximum memory in KiB.
 pub async fn get_max_memory() -> crate::Result<u64> {
-    Ok(sys_info::mem_info()
-        .map_err(|_| {
-            crate::Error::from(crate::ErrorKind::LauncherError(
-                "Unable to get computer memory".to_string(),
-            ))
-        })?
-        .total)
+    Ok(sysinfo::System::new_with_specifics(
+        RefreshKind::nothing()
+            .with_memory(MemoryRefreshKind::nothing().with_ram()),
+    )
+    .total_memory()
+        / 1024)
 }
diff --git a/packages/app-lib/src/api/logs.rs b/packages/app-lib/src/api/logs.rs
index 8ba9108b..7d24418b 100644
--- a/packages/app-lib/src/api/logs.rs
+++ b/packages/app-lib/src/api/logs.rs
@@ -9,9 +9,9 @@ use tokio::{
 };
 
 use crate::{
+    State,
     prelude::Credentials,
     util::io::{self, IOError},
-    State,
 };
 
 #[derive(Serialize, Debug)]
@@ -42,8 +42,8 @@ impl CensoredString {
     pub fn censor(mut s: String, credentials_set: &Vec<Credentials>) -> Self {
         let username = whoami::username();
         s = s
-            .replace(&format!("/{}/", username), "/{COMPUTER_USERNAME}/")
-            .replace(&format!("\\{}\\", username), "\\{COMPUTER_USERNAME}\\");
+            .replace(&format!("/{username}/"), "/{COMPUTER_USERNAME}/")
+            .replace(&format!("\\{username}\\"), "\\{COMPUTER_USERNAME}\\");
         for credentials in credentials_set {
             s = s
                 .replace(&credentials.access_token, "{MINECRAFT_ACCESS_TOKEN}")
@@ -298,7 +298,7 @@ pub async fn get_latest_log_cursor(
     profile_path: &str,
     cursor: u64, // 0 to start at beginning of file
 ) -> crate::Result<LatestLogCursor> {
-    get_generic_live_log_cursor(profile_path, "latest.log", cursor).await
+    get_generic_live_log_cursor(profile_path, "launcher_log.txt", cursor).await
 }
 
 #[tracing::instrument]
diff --git a/packages/app-lib/src/api/metadata.rs b/packages/app-lib/src/api/metadata.rs
index 7b4e7139..59b3b89c 100644
--- a/packages/app-lib/src/api/metadata.rs
+++ b/packages/app-lib/src/api/metadata.rs
@@ -1,5 +1,5 @@
-use crate::state::CachedEntry;
 use crate::State;
+use crate::state::CachedEntry;
 pub use daedalus::minecraft::VersionManifest;
 pub use daedalus::modded::Manifest;
 
@@ -30,7 +30,7 @@ pub async fn get_loader_versions(loader: &str) -> crate::Result<Manifest> {
     )
     .await?
     .ok_or_else(|| {
-        crate::ErrorKind::NoValueFor(format!("{} loader versions", loader))
+        crate::ErrorKind::NoValueFor(format!("{loader} loader versions"))
     })?;
 
     Ok(loaders.manifest)
diff --git a/packages/app-lib/src/api/minecraft_auth.rs b/packages/app-lib/src/api/minecraft_auth.rs
index eb8b02d0..aa917a6f 100644
--- a/packages/app-lib/src/api/minecraft_auth.rs
+++ b/packages/app-lib/src/api/minecraft_auth.rs
@@ -1,7 +1,7 @@
 //! Authentication flow interface
 
-use crate::state::{Credentials, MinecraftLoginFlow};
 use crate::State;
+use crate::state::{Credentials, MinecraftLoginFlow};
 
 #[tracing::instrument]
 pub async fn begin_login() -> crate::Result<MinecraftLoginFlow> {
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
index 239cdc91..bb9f0a5c 100644
--- a/packages/app-lib/src/api/mod.rs
+++ b/packages/app-lib/src/api/mod.rs
@@ -12,7 +12,8 @@ pub mod process;
 pub mod profile;
 pub mod settings;
 pub mod tags;
-pub mod download;
+pub mod download; // AstralRinth
+pub mod worlds;
 
 pub mod data {
     pub use crate::state::{
@@ -27,12 +28,12 @@ pub mod data {
 
 pub mod prelude {
     pub use crate::{
+        State,
         data::*,
         event::CommandPayload,
         jre, metadata, minecraft_auth, mr_auth, pack, process,
-        profile::{self, create, Profile},
+        profile::{self, Profile, create},
         settings,
-        util::io::{canonicalize, IOError},
-        State,
+        util::io::{IOError, canonicalize},
     };
 }
diff --git a/packages/app-lib/src/api/pack/import/atlauncher.rs b/packages/app-lib/src/api/pack/import/atlauncher.rs
index a29ff0ae..f6dabca4 100644
--- a/packages/app-lib/src/api/pack/import/atlauncher.rs
+++ b/packages/app-lib/src/api/pack/import/atlauncher.rs
@@ -3,6 +3,7 @@ use std::{collections::HashMap, path::PathBuf};
 use serde::{Deserialize, Serialize};
 
 use crate::{
+    State,
     pack::{
         self,
         import::{self, copy_dotminecraft},
@@ -11,7 +12,6 @@ use crate::{
     prelude::ModLoader,
     state::{LinkedData, ProfileInstallStage},
     util::io,
-    State,
 };
 
 #[derive(Serialize, Deserialize)]
@@ -162,7 +162,7 @@ pub async fn import_atlauncher(
         profile_path: profile_path.to_string(),
     };
 
-    let backup_name = format!("ATLauncher-{}", instance_folder);
+    let backup_name = format!("ATLauncher-{instance_folder}");
     let minecraft_folder = atlauncher_instance_path;
 
     import_atlauncher_unmanaged(
@@ -190,8 +190,7 @@ async fn import_atlauncher_unmanaged(
     let mod_loader: ModLoader = serde_json::from_str::<ModLoader>(&mod_loader)
         .map_err(|_| {
             crate::ErrorKind::InputError(format!(
-                "Could not parse mod loader type: {}",
-                mod_loader
+                "Could not parse mod loader type: {mod_loader}"
             ))
         })?;
 
diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs
index 9aac5992..1c0819e4 100644
--- a/packages/app-lib/src/api/pack/import/curseforge.rs
+++ b/packages/app-lib/src/api/pack/import/curseforge.rs
@@ -3,13 +3,13 @@ use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
 
 use crate::{
+    State,
     prelude::ModLoader,
     state::ProfileInstallStage,
     util::{
         fetch::{fetch, write_cached_icon},
         io,
     },
-    State,
 };
 
 use super::{copy_dotminecraft, recache_icon};
diff --git a/packages/app-lib/src/api/pack/import/gdlauncher.rs b/packages/app-lib/src/api/pack/import/gdlauncher.rs
index b6481e59..30730101 100644
--- a/packages/app-lib/src/api/pack/import/gdlauncher.rs
+++ b/packages/app-lib/src/api/pack/import/gdlauncher.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{prelude::ModLoader, state::ProfileInstallStage, util::io, State};
+use crate::{State, prelude::ModLoader, state::ProfileInstallStage, util::io};
 
 use super::{copy_dotminecraft, recache_icon};
 
diff --git a/packages/app-lib/src/api/pack/import/mmc.rs b/packages/app-lib/src/api/pack/import/mmc.rs
index dcc15d30..94083be8 100644
--- a/packages/app-lib/src/api/pack/import/mmc.rs
+++ b/packages/app-lib/src/api/pack/import/mmc.rs
@@ -1,14 +1,14 @@
 use std::path::{Path, PathBuf};
 
-use serde::{de, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de};
 
 use crate::{
+    State,
     pack::{
         import::{self, copy_dotminecraft},
         install_from::{self, CreatePackDescription, PackDependency},
     },
     util::io,
-    State,
 };
 
 // instance.cfg
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
index be25b1b9..1f79d5e5 100644
--- a/packages/app-lib/src/api/pack/import/mod.rs
+++ b/packages/app-lib/src/api/pack/import/mod.rs
@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     event::{
-        emit::{emit_loading, init_or_edit_loading},
         LoadingBarId,
+        emit::{emit_loading, init_or_edit_loading},
     },
     util::{
         fetch::{self, IoSemaphore},
@@ -71,7 +71,7 @@ pub async fn get_importable_instances(
             return Err(crate::ErrorKind::InputError(
                 "Launcher type Unknown".to_string(),
             )
-            .into())
+            .into());
         }
     };
 
@@ -187,11 +187,7 @@ pub fn get_default_launcher_path(
         ImportLauncherType::Unknown => None,
     };
     let path = path?;
-    if path.exists() {
-        Some(path)
-    } else {
-        None
-    }
+    if path.exists() { Some(path) } else { None }
 }
 
 /// Checks if this PathBuf is a valid instance for the given launcher type
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index 6b78919c..b1f35e01 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -1,10 +1,10 @@
+use crate::State;
 use crate::data::ModLoader;
 use crate::event::emit::{emit_loading, init_loading};
 use crate::event::{LoadingBarId, LoadingBarType};
 use crate::state::{CachedEntry, LinkedData, ProfileInstallStage, SideType};
 use crate::util::fetch::{fetch, fetch_advanced, write_cached_icon};
 use crate::util::io;
-use crate::State;
 
 use reqwest::Method;
 use serde::{Deserialize, Serialize};
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index f6c6ead7..fd2b6bc5 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -1,21 +1,21 @@
+use crate::event::LoadingBarType;
 use crate::event::emit::{
     emit_loading, init_or_edit_loading, loading_try_for_each_concurrent,
 };
-use crate::event::LoadingBarType;
 use crate::pack::install_from::{
-    set_profile_information, EnvType, PackFile, PackFileHash,
+    EnvType, PackFile, PackFileHash, set_profile_information,
 };
 use crate::state::{
-    cache_file_hash, CacheBehaviour, CachedEntry, ProfileInstallStage, SideType,
+    CacheBehaviour, CachedEntry, ProfileInstallStage, SideType, cache_file_hash,
 };
 use crate::util::fetch::{fetch_mirrors, write};
 use crate::util::io;
-use crate::{profile, State};
+use crate::{State, profile};
 use async_zip::base::read::seek::ZipFileReader;
 
 use super::install_from::{
-    generate_pack_from_file, generate_pack_from_version_id, CreatePack,
-    CreatePackLocation, PackFormat,
+    CreatePack, CreatePackLocation, PackFormat, generate_pack_from_file,
+    generate_pack_from_version_id,
 };
 use crate::data::ProjectType;
 use std::io::Cursor;
@@ -266,10 +266,7 @@ pub async fn install_zipped_mrpack_files(
                 emit_loading(
                     &loading_bar,
                     30.0 / total_len as f64,
-                    Some(&format!(
-                        "Extracting override {}/{}",
-                        index, total_len
-                    )),
+                    Some(&format!("Extracting override {index}/{total_len}")),
                 )?;
             }
         }
diff --git a/packages/app-lib/src/api/process.rs b/packages/app-lib/src/api/process.rs
index af33fbf9..2871c070 100644
--- a/packages/app-lib/src/api/process.rs
+++ b/packages/app-lib/src/api/process.rs
@@ -2,8 +2,8 @@
 
 use crate::state::ProcessMetadata;
 pub use crate::{
-    state::{Hooks, MemorySettings, Profile, Settings, WindowSize},
     State,
+    state::{Hooks, MemorySettings, Profile, Settings, WindowSize},
 };
 use uuid::Uuid;
 
diff --git a/packages/app-lib/src/api/profile/create.rs b/packages/app-lib/src/api/profile/create.rs
index b32c95e5..20ec874a 100644
--- a/packages/app-lib/src/api/profile/create.rs
+++ b/packages/app-lib/src/api/profile/create.rs
@@ -1,14 +1,14 @@
 //! Theseus profile management interface
 use crate::launcher::get_loader_version_from_profile;
 use crate::settings::Hooks;
-use crate::state::{LinkedData, ProfileInstallStage};
+use crate::state::{LauncherFeatureVersion, LinkedData, ProfileInstallStage};
 use crate::util::io::{self, canonicalize};
+use crate::{ErrorKind, pack, profile};
+pub use crate::{State, state::Profile};
 use crate::{
-    event::{emit::emit_profile, ProfilePayloadType},
+    event::{ProfilePayloadType, emit::emit_profile},
     prelude::ModLoader,
 };
-use crate::{pack, profile, ErrorKind};
-pub use crate::{state::Profile, State};
 use chrono::Utc;
 use std::path::PathBuf;
 use tracing::{info, trace};
@@ -74,9 +74,11 @@ pub async fn profile_create(
     let mut profile = Profile {
         path: path.clone(),
         install_stage: ProfileInstallStage::NotInstalled,
+        launcher_feature_version: LauncherFeatureVersion::MOST_RECENT,
         name,
         icon_path: None,
         game_version,
+        protocol_version: None,
         loader: modloader,
         loader_version: loader.map(|x| x.id),
         groups: Vec::new(),
diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs
index 1e1944aa..3bc4b8d2 100644
--- a/packages/app-lib/src/api/profile/mod.rs
+++ b/packages/app-lib/src/api/profile/mod.rs
@@ -1,9 +1,9 @@
 //! Theseus profile management interface
 
+use crate::event::LoadingBarType;
 use crate::event::emit::{
     emit_loading, init_loading, loading_try_for_each_concurrent,
 };
-use crate::event::LoadingBarType;
 use crate::pack::install_from::{
     EnvType, PackDependency, PackFile, PackFileHash, PackFormat,
 };
@@ -12,10 +12,10 @@ use crate::state::{
     ProfileFile, ProfileInstallStage, ProjectType, SideType,
 };
 
-use crate::event::{emit::emit_profile, ProfilePayloadType};
+use crate::event::{ProfilePayloadType, emit::emit_profile};
 use crate::util::fetch;
 use crate::util::io::{self, IOError};
-pub use crate::{state::Profile, State};
+pub use crate::{State, state::Profile};
 use async_zip::tokio::write::ZipFileWriter;
 use async_zip::{Compression, ZipEntryBuilder};
 use serde_json::json;
@@ -36,6 +36,13 @@ use tokio::{fs::File, process::Command, sync::RwLock};
 pub mod create;
 pub mod update;
 
+#[derive(Debug, Clone)]
+pub enum QuickPlayType {
+    None,
+    Singleplayer(String),
+    Server(String),
+}
+
 /// Remove a profile
 #[tracing::instrument]
 pub async fn remove(path: &str) -> crate::Result<()> {
@@ -463,8 +470,7 @@ pub async fn export_mrpack(
         state.io_semaphore.0.acquire().await?;
     let profile = get(profile_path).await?.ok_or_else(|| {
         crate::ErrorKind::OtherError(format!(
-            "Tried to export a nonexistent or unloaded profile at path {}!",
-            profile_path
+            "Tried to export a nonexistent or unloaded profile at path {profile_path}!"
         ))
     })?;
 
@@ -610,8 +616,7 @@ fn pack_get_relative_path(
         .strip_prefix(profile_path)
         .map_err(|_| {
             crate::ErrorKind::FSError(format!(
-                "Path {path:?} does not correspond to a profile",
-                path = path
+                "Path {path:?} does not correspond to a profile"
             ))
         })?
         .components()
@@ -623,14 +628,17 @@ fn pack_get_relative_path(
 /// Run Minecraft using a profile and the default credentials, logged in credentials,
 /// failing with an error if no credentials are available
 #[tracing::instrument]
-pub async fn run(path: &str) -> crate::Result<ProcessMetadata> {
+pub async fn run(
+    path: &str,
+    quick_play_type: &QuickPlayType,
+) -> crate::Result<ProcessMetadata> {
     let state = State::get().await?;
 
     let default_account = Credentials::get_default_credential(&state.pool)
         .await?
         .ok_or_else(|| crate::ErrorKind::NoCredentialsError.as_error())?;
 
-    run_credentials(path, &default_account).await
+    run_credentials(path, &default_account, quick_play_type).await
 }
 
 /// Run Minecraft using a profile, and credentials for authentication
@@ -640,13 +648,13 @@ pub async fn run(path: &str) -> crate::Result<ProcessMetadata> {
 pub async fn run_credentials(
     path: &str,
     credentials: &Credentials,
+    quick_play_type: &QuickPlayType,
 ) -> crate::Result<ProcessMetadata> {
     let state = State::get().await?;
     let settings = Settings::get(&state.pool).await?;
     let profile = get(path).await?.ok_or_else(|| {
         crate::ErrorKind::OtherError(format!(
-            "Tried to run a nonexistent or unloaded profile at path {}!",
-            path
+            "Tried to run a nonexistent or unloaded profile at path {path}!"
         ))
     })?;
 
@@ -719,6 +727,7 @@ pub async fn run_credentials(
         credentials,
         post_exit_hook,
         &profile,
+        quick_play_type,
     )
     .await
 }
@@ -741,8 +750,7 @@ pub async fn try_update_playtime(path: &str) -> crate::Result<()> {
 
     let profile = get(path).await?.ok_or_else(|| {
         crate::ErrorKind::OtherError(format!(
-            "Tried to update playtime for a nonexistent or unloaded profile at path {}!",
-            path
+            "Tried to update playtime for a nonexistent or unloaded profile at path {path}!"
         ))
     })?;
     let updated_recent_playtime = profile.recent_time_played;
@@ -823,7 +831,7 @@ pub async fn create_mrpack_json(
             return Err(crate::ErrorKind::OtherError(
                 "Loader version mismatch".to_string(),
             )
-            .into())
+            .into());
         }
     };
     dependencies
diff --git a/packages/app-lib/src/api/profile/update.rs b/packages/app-lib/src/api/profile/update.rs
index fb5425d4..5174e9f2 100644
--- a/packages/app-lib/src/api/profile/update.rs
+++ b/packages/app-lib/src/api/profile/update.rs
@@ -1,13 +1,13 @@
 use crate::state::CacheBehaviour;
 use crate::{
+    LoadingBarType,
     event::{
-        emit::{emit_profile, init_loading},
         ProfilePayloadType,
+        emit::{emit_profile, init_loading},
     },
     pack::{self, install_from::generate_pack_from_version_id},
     profile::get,
     state::ProfileInstallStage,
-    LoadingBarType,
 };
 use futures::try_join;
 
@@ -24,9 +24,9 @@ pub async fn update_managed_modrinth_version(
     })?;
 
     let unmanaged_err = || {
-        crate::ErrorKind::InputError(
-            format!("Profile at {} is not a managed modrinth pack, or has been disconnected.", profile_path),
-        )
+        crate::ErrorKind::InputError(format!(
+            "Profile at {profile_path} is not a managed modrinth pack, or has been disconnected."
+        ))
     };
 
     // Extract modrinth pack information, if appropriate
@@ -58,9 +58,9 @@ pub async fn repair_managed_modrinth(profile_path: &str) -> crate::Result<()> {
     })?;
 
     let unmanaged_err = || {
-        crate::ErrorKind::InputError(
-            format!("Profile at {} is not a managed modrinth pack, or has been disconnected.", profile_path),
-        )
+        crate::ErrorKind::InputError(format!(
+            "Profile at {profile_path} is not a managed modrinth pack, or has been disconnected."
+        ))
     };
 
     // For repairing specifically, first we remove all installed projects (to ensure we do remove ones that aren't in the pack)
diff --git a/packages/app-lib/src/api/settings.rs b/packages/app-lib/src/api/settings.rs
index dba91a5d..75e34d33 100644
--- a/packages/app-lib/src/api/settings.rs
+++ b/packages/app-lib/src/api/settings.rs
@@ -1,8 +1,8 @@
 //! Theseus profile management interface
 
 pub use crate::{
-    state::{Hooks, MemorySettings, Profile, Settings, WindowSize},
     State,
+    state::{Hooks, MemorySettings, Profile, Settings, WindowSize},
 };
 
 /// Gets entire settings
diff --git a/packages/app-lib/src/api/tags.rs b/packages/app-lib/src/api/tags.rs
index ed22c1eb..f43ad0a0 100644
--- a/packages/app-lib/src/api/tags.rs
+++ b/packages/app-lib/src/api/tags.rs
@@ -1,8 +1,8 @@
 //! Theseus tag management interface
 use crate::state::CachedEntry;
 pub use crate::{
-    state::{Category, DonationPlatform, GameVersion, Loader},
     State,
+    state::{Category, DonationPlatform, GameVersion, Loader},
 };
 
 /// Get category tags
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
new file mode 100644
index 00000000..44704dfa
--- /dev/null
+++ b/packages/app-lib/src/api/worlds.rs
@@ -0,0 +1,967 @@
+use crate::data::ModLoader;
+use crate::launcher::get_loader_version_from_profile;
+use crate::profile::get_full_path;
+use crate::state::attached_world_data::AttachedWorldData;
+use crate::state::{
+    Profile, ProfileInstallStage, attached_world_data, server_join_log,
+};
+pub use crate::util::server_ping::{
+    ServerGameProfile, ServerPlayers, ServerStatus, ServerVersion,
+};
+use crate::util::{io, server_ping};
+use crate::{Error, ErrorKind, Result, State, launcher};
+use async_walkdir::WalkDir;
+use async_zip::{Compression, ZipEntryBuilder};
+use chrono::{DateTime, Local, TimeZone, Utc};
+use either::Either;
+use enumset::{EnumSet, EnumSetType};
+use fs4::tokio::AsyncFileExt;
+use futures::StreamExt;
+use quartz_nbt::{NbtCompound, NbtTag};
+use regex::{Regex, RegexBuilder};
+use serde::{Deserialize, Serialize};
+use std::cmp::Reverse;
+use std::io::Cursor;
+use std::net::{Ipv4Addr, Ipv6Addr};
+use std::path::{Path, PathBuf};
+use std::sync::LazyLock;
+use tokio::io::AsyncWriteExt;
+use tokio_util::compat::FuturesAsyncWriteCompatExt;
+use url::Url;
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct WorldWithProfile {
+    pub profile: String,
+    #[serde(flatten)]
+    pub world: World,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct World {
+    pub name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub last_played: Option<DateTime<Utc>>,
+    #[serde(
+        skip_serializing_if = "Option::is_none",
+        with = "either::serde_untagged_optional"
+    )]
+    pub icon: Option<Either<PathBuf, Url>>,
+    pub display_status: DisplayStatus,
+    #[serde(flatten)]
+    pub details: WorldDetails,
+}
+
+impl World {
+    pub fn world_type(&self) -> WorldType {
+        match self.details {
+            WorldDetails::Singleplayer { .. } => WorldType::Singleplayer,
+            WorldDetails::Server { .. } => WorldType::Server,
+        }
+    }
+
+    pub fn world_id(&self) -> &str {
+        match &self.details {
+            WorldDetails::Singleplayer { path, .. } => path,
+            WorldDetails::Server { address, .. } => address,
+        }
+    }
+}
+
+#[derive(
+    Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash, Default,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum WorldType {
+    #[default]
+    Singleplayer,
+    Server,
+}
+
+impl WorldType {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::Singleplayer => "singleplayer",
+            Self::Server => "server",
+        }
+    }
+
+    pub fn from_string(string: &str) -> Self {
+        match string {
+            "singleplayer" => Self::Singleplayer,
+            "server" => Self::Server,
+            _ => Self::Singleplayer,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, EnumSetType, Debug, Default)]
+#[serde(rename_all = "snake_case")]
+#[enumset(serialize_repr = "list")]
+pub enum DisplayStatus {
+    #[default]
+    Normal,
+    Hidden,
+    Favorite,
+}
+
+impl DisplayStatus {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Self::Normal => "normal",
+            Self::Hidden => "hidden",
+            Self::Favorite => "favorite",
+        }
+    }
+
+    pub fn from_string(string: &str) -> Self {
+        match string {
+            "normal" => Self::Normal,
+            "hidden" => Self::Hidden,
+            "favorite" => Self::Favorite,
+            _ => Self::Normal,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum WorldDetails {
+    Singleplayer {
+        path: String,
+        game_mode: SingleplayerGameMode,
+        hardcore: bool,
+        locked: bool,
+    },
+    Server {
+        index: usize,
+        address: String,
+        pack_status: ServerPackStatus,
+    },
+}
+
+#[derive(Deserialize, Serialize, Debug, Copy, Clone, Default)]
+#[serde(rename_all = "snake_case")]
+pub enum SingleplayerGameMode {
+    #[default]
+    Survival,
+    Creative,
+    Adventure,
+    Spectator,
+}
+
+#[derive(Deserialize, Serialize, Debug, Copy, Clone, Default)]
+#[serde(rename_all = "snake_case")]
+pub enum ServerPackStatus {
+    Enabled,
+    Disabled,
+    #[default]
+    Prompt,
+}
+
+impl From<Option<bool>> for ServerPackStatus {
+    fn from(value: Option<bool>) -> Self {
+        match value {
+            Some(true) => ServerPackStatus::Enabled,
+            Some(false) => ServerPackStatus::Disabled,
+            None => ServerPackStatus::Prompt,
+        }
+    }
+}
+
+impl From<ServerPackStatus> for Option<bool> {
+    fn from(val: ServerPackStatus) -> Self {
+        match val {
+            ServerPackStatus::Enabled => Some(true),
+            ServerPackStatus::Disabled => Some(false),
+            ServerPackStatus::Prompt => None,
+        }
+    }
+}
+
+pub async fn get_recent_worlds(
+    limit: usize,
+    display_statuses: EnumSet<DisplayStatus>,
+) -> Result<Vec<WorldWithProfile>> {
+    let state = State::get().await?;
+    let profiles_dir = state.directories.profiles_dir();
+
+    let mut profiles = Profile::get_all(&state.pool).await?;
+    profiles.sort_by_key(|x| Reverse(x.last_played));
+
+    let mut result = Vec::with_capacity(limit);
+
+    let mut least_recent_time = None;
+    for profile in profiles {
+        if result.len() >= limit && profile.last_played < least_recent_time {
+            break;
+        }
+        let profile_path = &profile.path;
+        let profile_dir = profiles_dir.join(profile_path);
+        let profile_worlds =
+            get_all_worlds_in_profile(profile_path, &profile_dir).await;
+        if let Err(e) = profile_worlds {
+            tracing::error!(
+                "Failed to get worlds for profile {}: {}",
+                profile_path,
+                e
+            );
+            continue;
+        }
+        for world in profile_worlds? {
+            let is_older = least_recent_time.is_none()
+                || world.last_played < least_recent_time;
+            if result.len() >= limit && is_older {
+                continue;
+            }
+            if !display_statuses.contains(world.display_status) {
+                continue;
+            }
+            if is_older {
+                least_recent_time = world.last_played;
+            }
+            result.push(WorldWithProfile {
+                profile: profile_path.clone(),
+                world,
+            });
+        }
+        if result.len() > limit {
+            result.sort_by_key(|x| Reverse(x.world.last_played));
+            result.truncate(limit);
+        }
+    }
+
+    if result.len() <= limit {
+        result.sort_by_key(|x| Reverse(x.world.last_played));
+    }
+    Ok(result)
+}
+
+pub async fn get_profile_worlds(profile_path: &str) -> Result<Vec<World>> {
+    get_all_worlds_in_profile(profile_path, &get_full_path(profile_path).await?)
+        .await
+}
+
+async fn get_all_worlds_in_profile(
+    profile_path: &str,
+    profile_dir: &Path,
+) -> Result<Vec<World>> {
+    let mut worlds = vec![];
+    get_singleplayer_worlds_in_profile(profile_dir, &mut worlds).await?;
+    get_server_worlds_in_profile(profile_path, profile_dir, &mut worlds)
+        .await?;
+
+    let state = State::get().await?;
+    let attached_data =
+        AttachedWorldData::get_all_for_instance(profile_path, &state.pool)
+            .await?;
+    if !attached_data.is_empty() {
+        for world in worlds.iter_mut() {
+            if let Some(data) = attached_data
+                .get(&(world.world_type(), world.world_id().to_owned()))
+            {
+                attach_world_data_to_world(world, data);
+            }
+        }
+    }
+
+    Ok(worlds)
+}
+
+async fn get_singleplayer_worlds_in_profile(
+    instance_dir: &Path,
+    worlds: &mut Vec<World>,
+) -> Result<()> {
+    let saves_dir = instance_dir.join("saves");
+    if !saves_dir.exists() {
+        return Ok(());
+    }
+    let mut saves_dir = io::read_dir(saves_dir).await?;
+    while let Some(world_dir) = saves_dir.next_entry().await? {
+        let world_path = world_dir.path();
+        let level_dat_path = world_path.join("level.dat");
+        if !level_dat_path.exists() {
+            continue;
+        }
+        if let Ok(world) = read_singleplayer_world(world_path).await {
+            worlds.push(world);
+        }
+    }
+
+    Ok(())
+}
+
+pub async fn get_singleplayer_world(
+    instance: &str,
+    world: &str,
+) -> Result<World> {
+    let state = State::get().await?;
+    let profile_path = state.directories.profiles_dir().join(instance);
+    let mut world =
+        read_singleplayer_world(get_world_dir(&profile_path, world)).await?;
+
+    if let Some(data) = AttachedWorldData::get_for_world(
+        instance,
+        world.world_type(),
+        world.world_id(),
+        &state.pool,
+    )
+    .await?
+    {
+        attach_world_data_to_world(&mut world, &data);
+    }
+    Ok(world)
+}
+
+async fn read_singleplayer_world(world_path: PathBuf) -> Result<World> {
+    if let Some(_lock) = try_get_world_session_lock(&world_path).await? {
+        read_singleplayer_world_maybe_locked(world_path, false).await
+    } else {
+        read_singleplayer_world_maybe_locked(world_path, true).await
+    }
+}
+
+async fn read_singleplayer_world_maybe_locked(
+    world_path: PathBuf,
+    locked: bool,
+) -> Result<World> {
+    #[derive(Deserialize, Debug)]
+    #[serde(rename_all = "PascalCase")]
+    struct LevelDataRoot {
+        data: LevelData,
+    }
+
+    #[derive(Deserialize, Debug)]
+    #[serde(rename_all = "PascalCase")]
+    struct LevelData {
+        #[serde(default)]
+        level_name: String,
+        #[serde(default)]
+        last_played: i64,
+        #[serde(default)]
+        game_type: i32,
+        #[serde(default, rename = "hardcore")]
+        hardcore: bool,
+    }
+
+    let level_data = io::read(world_path.join("level.dat")).await?;
+    let level_data: LevelDataRoot = quartz_nbt::serde::deserialize(
+        &level_data,
+        quartz_nbt::io::Flavor::GzCompressed,
+    )?
+    .0;
+    let level_data = level_data.data;
+
+    let icon = Some(world_path.join("icon.png")).filter(|i| i.exists());
+
+    let game_mode = match level_data.game_type {
+        0 => SingleplayerGameMode::Survival,
+        1 => SingleplayerGameMode::Creative,
+        2 => SingleplayerGameMode::Adventure,
+        3 => SingleplayerGameMode::Spectator,
+        _ => SingleplayerGameMode::Survival,
+    };
+
+    Ok(World {
+        name: level_data.level_name,
+        last_played: Utc.timestamp_millis_opt(level_data.last_played).single(),
+        icon: icon.map(Either::Left),
+        display_status: DisplayStatus::Normal,
+        details: WorldDetails::Singleplayer {
+            path: world_path
+                .file_name()
+                .unwrap()
+                .to_string_lossy()
+                .to_string(),
+            game_mode,
+            hardcore: level_data.hardcore,
+            locked,
+        },
+    })
+}
+
+async fn get_server_worlds_in_profile(
+    profile_path: &str,
+    instance_dir: &Path,
+    worlds: &mut Vec<World>,
+) -> Result<()> {
+    let servers = servers_data::read(instance_dir).await?;
+    if servers.is_empty() {
+        return Ok(());
+    }
+
+    let state = State::get().await?;
+    let join_log = server_join_log::get_joins(profile_path, &state.pool)
+        .await
+        .ok();
+
+    for (index, server) in servers.into_iter().enumerate() {
+        if server.hidden {
+            // TODO: Figure out whether we want to hide or show direct connect servers
+            continue;
+        }
+        let icon = server.icon.and_then(|icon| {
+            Url::parse(&format!("data:image/png;base64,{icon}")).ok()
+        });
+        let last_played = join_log
+            .as_ref()
+            .and_then(|log| {
+                let address = parse_server_address(&server.ip).ok()?;
+                log.get(&(address.0.to_owned(), address.1))
+            })
+            .copied();
+        let world = World {
+            name: server.name,
+            last_played,
+            icon: icon.map(Either::Right),
+            display_status: DisplayStatus::Normal,
+            details: WorldDetails::Server {
+                index,
+                address: server.ip,
+                pack_status: server.accept_textures.into(),
+            },
+        };
+        worlds.push(world);
+    }
+
+    Ok(())
+}
+
+fn attach_world_data_to_world(world: &mut World, data: &AttachedWorldData) {
+    world.display_status = data.display_status;
+}
+
+pub async fn set_world_display_status(
+    instance: &str,
+    world_type: WorldType,
+    world_id: &str,
+    display_status: DisplayStatus,
+) -> Result<()> {
+    let state = State::get().await?;
+    attached_world_data::set_display_status(
+        instance,
+        world_type,
+        world_id,
+        display_status,
+        &state.pool,
+    )
+    .await?;
+    Ok(())
+}
+
+pub async fn rename_world(
+    instance: &Path,
+    world: &str,
+    new_name: &str,
+) -> Result<()> {
+    let world = get_world_dir(instance, world);
+    let level_dat_path = world.join("level.dat");
+    if !level_dat_path.exists() {
+        return Ok(());
+    }
+    let _lock = get_world_session_lock(&world).await?;
+
+    let level_data = io::read(&level_dat_path).await?;
+    let (mut root_data, _) = quartz_nbt::io::read_nbt(
+        &mut Cursor::new(level_data),
+        quartz_nbt::io::Flavor::GzCompressed,
+    )?;
+    let data = root_data.get_mut::<_, &mut NbtCompound>("Data")?;
+
+    data.insert(
+        "LevelName",
+        NbtTag::String(new_name.trim_ascii().to_string()),
+    );
+
+    let mut level_data = vec![];
+    quartz_nbt::io::write_nbt(
+        &mut level_data,
+        None,
+        &root_data,
+        quartz_nbt::io::Flavor::GzCompressed,
+    )?;
+    io::write(level_dat_path, level_data).await?;
+    Ok(())
+}
+
+pub async fn reset_world_icon(instance: &Path, world: &str) -> Result<()> {
+    let world = get_world_dir(instance, world);
+    let icon = world.join("icon.png");
+    if let Some(_lock) = try_get_world_session_lock(&world).await? {
+        let _ = io::remove_file(icon).await;
+    }
+    Ok(())
+}
+
+pub async fn backup_world(instance: &Path, world: &str) -> Result<u64> {
+    let world_dir = get_world_dir(instance, world);
+    let _lock = get_world_session_lock(&world_dir).await?;
+    let backups_dir = instance.join("backups");
+
+    io::create_dir_all(&backups_dir).await?;
+
+    let name_base = {
+        let now = Local::now();
+        let formatted_time = now.format("%Y-%m-%d_%H-%M-%S");
+        format!("{formatted_time}_{world}")
+    };
+    let output_path =
+        backups_dir.join(find_available_name(&backups_dir, &name_base, ".zip"));
+
+    let writer = tokio::fs::File::create(&output_path).await?;
+    let mut writer = async_zip::tokio::write::ZipFileWriter::with_tokio(writer);
+
+    let mut walker = WalkDir::new(&world_dir);
+    while let Some(entry) = walker.next().await {
+        let entry = entry.map_err(|e| io::IOError::IOPathError {
+            path: e.path().unwrap().to_string_lossy().to_string(),
+            source: e.into_io().unwrap(),
+        })?;
+        if !entry.file_type().await?.is_file() {
+            continue;
+        }
+        if entry.file_name() == "session.lock" {
+            continue;
+        }
+        let zip_filename = format!(
+            "{world}/{}",
+            entry
+                .path()
+                .strip_prefix(&world_dir)?
+                .display()
+                .to_string()
+                .replace('\\', "/")
+        );
+        let mut stream = writer
+            .write_entry_stream(
+                ZipEntryBuilder::new(zip_filename.into(), Compression::Deflate)
+                    .build(),
+            )
+            .await?
+            .compat_write();
+        let mut source = tokio::fs::File::open(entry.path()).await?;
+        tokio::io::copy(&mut source, &mut stream).await?;
+        stream.into_inner().close().await?;
+    }
+
+    writer.close().await?;
+    Ok(io::metadata(output_path).await?.len())
+}
+
+fn find_available_name(dir: &Path, file_name: &str, extension: &str) -> String {
+    static RESERVED_WINDOWS_FILENAMES: LazyLock<Regex> = LazyLock::new(|| {
+        RegexBuilder::new(r#"^.*\.|(?:COM|CLOCK\$|CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(?:\..*)?$"#)
+            .case_insensitive(true)
+            .build()
+            .unwrap()
+    });
+    static COPY_COUNTER_PATTERN: LazyLock<Regex> = LazyLock::new(|| {
+        RegexBuilder::new(r#"^(?<name>.*) \((?<count>\d*)\)$"#)
+            .case_insensitive(true)
+            .unicode(true)
+            .build()
+            .unwrap()
+    });
+
+    let mut file_name = file_name.replace(
+        [
+            '/', '\n', '\r', '\t', '\0', '\x0c', '`', '?', '*', '\\', '<', '>',
+            '|', '"', ':', '.', '/', '"',
+        ],
+        "_",
+    );
+    if RESERVED_WINDOWS_FILENAMES.is_match(&file_name) {
+        file_name.insert(0, '_');
+        file_name.push('_');
+    }
+
+    let mut count = 0;
+    if let Some(find) = COPY_COUNTER_PATTERN.captures(&file_name) {
+        count = find
+            .name("count")
+            .unwrap()
+            .as_str()
+            .parse::<i32>()
+            .unwrap_or(0);
+        let end = find.name("name").unwrap().end();
+        drop(find);
+        file_name.truncate(end);
+    }
+
+    if file_name.len() > 255 - extension.len() {
+        file_name.truncate(255 - extension.len());
+    }
+
+    let mut current_attempt = file_name.clone();
+    loop {
+        if count != 0 {
+            let with_count = format!(" ({count})");
+            if file_name.len() > 255 - with_count.len() {
+                current_attempt.truncate(255 - with_count.len());
+            }
+            current_attempt.push_str(&with_count);
+        }
+
+        current_attempt.push_str(extension);
+
+        let result = dir.join(&current_attempt);
+        if !result.exists() {
+            return current_attempt;
+        }
+
+        count += 1;
+        current_attempt.replace_range(..current_attempt.len(), &file_name);
+    }
+}
+
+pub async fn delete_world(instance: &Path, world: &str) -> Result<()> {
+    let world = get_world_dir(instance, world);
+    let lock = get_world_session_lock(&world).await?;
+    let lock_path = world.join("session.lock");
+
+    let mut dir = io::read_dir(&world).await?;
+    while let Some(entry) = dir.next_entry().await? {
+        let path = entry.path();
+        if entry.file_type().await?.is_dir() {
+            io::remove_dir_all(path).await?;
+            continue;
+        }
+        if path != lock_path {
+            io::remove_file(path).await?;
+        }
+    }
+
+    drop(lock);
+    io::remove_file(lock_path).await?;
+    io::remove_dir(world).await?;
+
+    Ok(())
+}
+
+fn get_world_dir(instance: &Path, world: &str) -> PathBuf {
+    instance.join("saves").join(world)
+}
+
+async fn get_world_session_lock(world: &Path) -> Result<tokio::fs::File> {
+    let lock_path = world.join("session.lock");
+    let mut file = tokio::fs::File::options()
+        .create(true)
+        .write(true)
+        .truncate(false)
+        .open(&lock_path)
+        .await?;
+    file.write_all("☃".as_bytes()).await?;
+    file.sync_all().await?;
+    let locked = file.try_lock_exclusive()?;
+    locked.then_some(file).ok_or_else(|| {
+        io::IOError::IOPathError {
+            source: std::io::Error::new(
+                std::io::ErrorKind::ResourceBusy,
+                "already locked by Minecraft",
+            ),
+            path: lock_path.to_string_lossy().into_owned(),
+        }
+        .into()
+    })
+}
+
+async fn try_get_world_session_lock(
+    world: &Path,
+) -> Result<Option<tokio::fs::File>> {
+    let file = tokio::fs::File::options()
+        .create(true)
+        .write(true)
+        .truncate(false)
+        .open(world.join("session.lock"))
+        .await?;
+    file.sync_all().await?;
+    let locked = file.try_lock_exclusive()?;
+    Ok(locked.then_some(file))
+}
+
+pub async fn add_server_to_profile(
+    profile_path: &Path,
+    name: String,
+    address: String,
+    pack_status: ServerPackStatus,
+) -> Result<usize> {
+    let mut servers = servers_data::read(profile_path).await?;
+    let insert_index = servers
+        .iter()
+        .position(|x| x.hidden)
+        .unwrap_or(servers.len());
+    servers.insert(
+        insert_index,
+        servers_data::ServerData {
+            name,
+            ip: address,
+            accept_textures: pack_status.into(),
+            hidden: false,
+            icon: None,
+        },
+    );
+    servers_data::write(profile_path, &servers).await?;
+    Ok(insert_index)
+}
+
+pub async fn edit_server_in_profile(
+    profile_path: &Path,
+    index: usize,
+    name: String,
+    address: String,
+    pack_status: ServerPackStatus,
+) -> Result<()> {
+    let mut servers = servers_data::read(profile_path).await?;
+    let server =
+        servers
+            .get_mut(index)
+            .filter(|x| !x.hidden)
+            .ok_or_else(|| {
+                ErrorKind::InputError(format!(
+                    "No editable server at index {index}"
+                ))
+                .as_error()
+            })?;
+    server.name = name;
+    server.ip = address;
+    server.accept_textures = pack_status.into();
+    servers_data::write(profile_path, &servers).await?;
+    Ok(())
+}
+
+pub async fn remove_server_from_profile(
+    profile_path: &Path,
+    index: usize,
+) -> Result<()> {
+    let mut servers = servers_data::read(profile_path).await?;
+    if servers.get(index).filter(|x| !x.hidden).is_none() {
+        return Err(ErrorKind::InputError(format!(
+            "No removable server at index {index}"
+        ))
+        .into());
+    }
+    servers.remove(index);
+    servers_data::write(profile_path, &servers).await?;
+    Ok(())
+}
+
+mod servers_data {
+    use crate::Result;
+    use crate::util::io;
+    use serde::{Deserialize, Serialize};
+    use std::path::Path;
+
+    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[serde(rename_all = "camelCase")]
+    pub struct ServerData {
+        #[serde(default)]
+        pub hidden: bool,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub icon: Option<String>,
+        #[serde(default)]
+        pub ip: String,
+        #[serde(default)]
+        pub name: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub accept_textures: Option<bool>,
+    }
+
+    pub async fn read(instance_dir: &Path) -> Result<Vec<ServerData>> {
+        #[derive(Deserialize, Debug)]
+        struct ServersData {
+            #[serde(default)]
+            servers: Vec<ServerData>,
+        }
+
+        let servers_dat_path = instance_dir.join("servers.dat");
+        if !servers_dat_path.exists() {
+            return Ok(vec![]);
+        }
+        let servers_data = io::read(servers_dat_path).await?;
+        let servers_data: ServersData = quartz_nbt::serde::deserialize(
+            &servers_data,
+            quartz_nbt::io::Flavor::Uncompressed,
+        )?
+        .0;
+        Ok(servers_data.servers)
+    }
+
+    pub async fn write(
+        instance_dir: &Path,
+        servers: &[ServerData],
+    ) -> Result<()> {
+        #[derive(Serialize, Debug)]
+        struct ServersData<'a> {
+            servers: &'a [ServerData],
+        }
+
+        let servers_dat_path = instance_dir.join("servers.dat");
+        let data = quartz_nbt::serde::serialize(
+            &ServersData { servers },
+            None,
+            quartz_nbt::io::Flavor::Uncompressed,
+        )?;
+        io::write(servers_dat_path, data).await?;
+        Ok(())
+    }
+}
+
+pub async fn get_profile_protocol_version(
+    profile: &str,
+) -> Result<Option<i32>> {
+    let mut profile = super::profile::get(profile).await?.ok_or_else(|| {
+        ErrorKind::UnmanagedProfileError(format!(
+            "Could not find profile {profile}"
+        ))
+    })?;
+    if profile.install_stage != ProfileInstallStage::Installed {
+        return Ok(None);
+    }
+
+    if let Some(protocol_version) = profile.protocol_version {
+        return Ok(Some(protocol_version));
+    }
+
+    let minecraft = crate::api::metadata::get_minecraft_versions().await?;
+    let version_index = minecraft
+        .versions
+        .iter()
+        .position(|it| it.id == profile.game_version)
+        .ok_or(crate::ErrorKind::LauncherError(format!(
+            "Invalid game version: {}",
+            profile.game_version
+        )))?;
+    let version = &minecraft.versions[version_index];
+
+    let loader_version = get_loader_version_from_profile(
+        &profile.game_version,
+        profile.loader,
+        profile.loader_version.as_deref(),
+    )
+    .await?;
+    if profile.loader != ModLoader::Vanilla && loader_version.is_none() {
+        return Ok(None);
+    }
+
+    let version_jar =
+        loader_version.as_ref().map_or(version.id.clone(), |it| {
+            format!("{}-{}", version.id.clone(), it.id.clone())
+        });
+
+    let state = State::get().await?;
+    let client_path = state
+        .directories
+        .version_dir(&version_jar)
+        .join(format!("{version_jar}.jar"));
+
+    if !client_path.exists() {
+        return Ok(None);
+    }
+
+    let version = launcher::read_protocol_version_from_jar(client_path).await?;
+    if version.is_some() {
+        profile.protocol_version = version;
+        profile.upsert(&state.pool).await?;
+    }
+    Ok(version)
+}
+
+pub async fn get_server_status(
+    address: &str,
+    protocol_version: Option<i32>,
+) -> Result<ServerStatus> {
+    let (original_host, original_port) = parse_server_address(address)?;
+    let (host, port) =
+        resolve_server_address(original_host, original_port).await?;
+    server_ping::get_server_status(
+        &(&host as &str, port),
+        (original_host, original_port),
+        protocol_version,
+    )
+    .await
+}
+
+pub fn parse_server_address(address: &str) -> Result<(&str, u16)> {
+    parse_server_address_inner(address)
+        .map_err(|e| Error::from(ErrorKind::InputError(e)))
+}
+
+// Reimplementation of Guava's HostAndPort#fromString with a default port of 25565
+fn parse_server_address_inner(
+    address: &str,
+) -> std::result::Result<(&str, u16), String> {
+    let (host, port_str) = if address.starts_with("[") {
+        let colon_index = address.find(':');
+        let close_bracket_index = address.rfind(']');
+        if colon_index.is_none() || close_bracket_index.is_none() {
+            return Err(format!("Invalid bracketed host/port: {address}"));
+        }
+        let close_bracket_index = close_bracket_index.unwrap();
+
+        let host = &address[1..close_bracket_index];
+        if close_bracket_index + 1 == address.len() {
+            (host, "")
+        } else {
+            if address.as_bytes().get(close_bracket_index).copied()
+                != Some(b':')
+            {
+                return Err(format!(
+                    "Only a colon may follow a close bracket: {address}"
+                ));
+            }
+            let port_str = &address[close_bracket_index + 2..];
+            for c in port_str.chars() {
+                if !c.is_ascii_digit() {
+                    return Err(format!("Port must be numeric: {address}"));
+                }
+            }
+            (host, port_str)
+        }
+    } else {
+        let colon_pos = address.find(':');
+        if let Some(colon_pos) = colon_pos {
+            (&address[..colon_pos], &address[colon_pos + 1..])
+        } else {
+            (address, "")
+        }
+    };
+
+    let mut port = None;
+    if !port_str.is_empty() {
+        if port_str.starts_with('+') {
+            return Err(format!("Unparseable port number: {port_str}"));
+        }
+        port = port_str.parse::<u16>().ok();
+        if port.is_none() {
+            return Err(format!("Unparseable port number: {port_str}"));
+        }
+    }
+
+    Ok((host, port.unwrap_or(25565)))
+}
+
+async fn resolve_server_address(
+    host: &str,
+    port: u16,
+) -> Result<(String, u16)> {
+    if host.parse::<Ipv4Addr>().is_ok() || host.parse::<Ipv6Addr>().is_ok() {
+        return Ok((host.to_owned(), port));
+    }
+    let resolver = hickory_resolver::TokioResolver::builder_tokio()?.build();
+    Ok(
+        match resolver.srv_lookup(format!("_minecraft._tcp.{host}")).await {
+            Err(e)
+                if e.proto()
+                    .filter(|x| x.kind().is_no_records_found())
+                    .is_some() =>
+            {
+                None
+            }
+            Err(e) => return Err(e.into()),
+            Ok(lookup) => lookup
+                .into_iter()
+                .next()
+                .map(|r| (r.target().to_string(), r.port())),
+        }
+        .unwrap_or_else(|| (host.to_owned(), port)),
+    )
+}
diff --git a/packages/app-lib/src/error.rs b/packages/app-lib/src/error.rs
index 9eabe33a..587c9559 100644
--- a/packages/app-lib/src/error.rs
+++ b/packages/app-lib/src/error.rs
@@ -13,6 +13,12 @@ pub enum ErrorKind {
     #[error("Serialization error (JSON): {0}")]
     JSONError(#[from] serde_json::Error),
 
+    #[error("Serialization error (NBT): {0}")]
+    NBTError(#[from] quartz_nbt::io::NbtIoError),
+
+    #[error("NBT data structure error: {0}")]
+    NBTReprError(#[from] quartz_nbt::NbtReprError),
+
     #[error("Serialization error (websocket): {0}")]
     WebsocketSerializationError(
         #[from] ariadne::networking::serialization::SerializationError,
@@ -116,6 +122,9 @@ pub enum ErrorKind {
 
     #[error("Move directory error: {0}")]
     DirectoryMoveError(String),
+
+    #[error("Error resolving DNS: {0}")]
+    DNSError(#[from] hickory_resolver::ResolveError),
 }
 
 #[derive(Debug)]
diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs
index 174a06c7..e2e43861 100644
--- a/packages/app-lib/src/event/emit.rs
+++ b/packages/app-lib/src/event/emit.rs
@@ -161,7 +161,7 @@ pub fn emit_loading(
     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)
+    // any further updates will be ignored (also sending None)
     } else {
         Some(display_frac)
     };
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index 0c0ac023..92b7b53f 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -1,5 +1,7 @@
 //! Theseus state management system
-use ariadne::users::{UserId, UserStatus};
+use ariadne::ids::UserId;
+use ariadne::users::UserStatus;
+use chrono::{DateTime, Utc};
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::{path::PathBuf, sync::Arc};
@@ -234,13 +236,23 @@ pub enum ProcessPayloadType {
 #[derive(Serialize, Clone)]
 pub struct ProfilePayload {
     pub profile_path_id: String,
+    #[serde(flatten)]
     pub event: ProfilePayloadType,
 }
 #[derive(Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
+#[serde(tag = "event", rename_all = "snake_case")]
 pub enum ProfilePayloadType {
     Created,
     Synced,
+    ServersUpdated,
+    WorldUpdated {
+        world: String,
+    },
+    ServerJoined {
+        host: String,
+        port: u16,
+        timestamp: DateTime<Utc>,
+    },
     Edited,
     Removed,
 }
diff --git a/packages/app-lib/src/launcher/args.rs b/packages/app-lib/src/launcher/args.rs
index 919c3304..4617320d 100644
--- a/packages/app-lib/src/launcher/args.rs
+++ b/packages/app-lib/src/launcher/args.rs
@@ -1,5 +1,6 @@
 //! Minecraft CLI argument logic
 use crate::launcher::parse_rules;
+use crate::profile::QuickPlayType;
 use crate::state::Credentials;
 use crate::{
     state::{MemorySettings, WindowSize},
@@ -31,7 +32,12 @@ pub fn get_class_paths(
         .iter()
         .filter_map(|library| {
             if let Some(rules) = &library.rules {
-                if !parse_rules(rules, java_arch, minecraft_updated) {
+                if !parse_rules(
+                    rules,
+                    java_arch,
+                    &QuickPlayType::None,
+                    minecraft_updated,
+                ) {
                     return None;
                 }
             }
@@ -111,6 +117,7 @@ pub fn get_jvm_arguments(
     memory: MemorySettings,
     custom_args: Vec<String>,
     java_arch: &str,
+    quick_play_type: &QuickPlayType,
     log_config: Option<&LoggingConfiguration>,
 ) -> crate::Result<Vec<String>> {
     let mut parsed_arguments = Vec::new();
@@ -130,6 +137,7 @@ pub fn get_jvm_arguments(
                 )
             },
             java_arch,
+            quick_play_type,
         )?;
     } else {
         parsed_arguments.push(format!(
@@ -214,6 +222,7 @@ pub fn get_minecraft_arguments(
     version_type: &VersionType,
     resolution: WindowSize,
     java_arch: &str,
+    quick_play_type: &QuickPlayType,
 ) -> crate::Result<Vec<String>> {
     if let Some(arguments) = arguments {
         let mut parsed_arguments = Vec::new();
@@ -233,9 +242,11 @@ pub fn get_minecraft_arguments(
                     assets_directory,
                     version_type,
                     resolution,
+                    quick_play_type,
                 )
             },
             java_arch,
+            quick_play_type,
         )?;
 
         Ok(parsed_arguments)
@@ -253,6 +264,7 @@ pub fn get_minecraft_arguments(
                 assets_directory,
                 version_type,
                 resolution,
+                quick_play_type,
             )?);
         }
         Ok(parsed_arguments)
@@ -273,6 +285,7 @@ fn parse_minecraft_argument(
     assets_directory: &Path,
     version_type: &VersionType,
     resolution: WindowSize,
+    quick_play_type: &QuickPlayType,
 ) -> crate::Result<String> {
     Ok(argument
         .replace("${accessToken}", access_token)
@@ -326,7 +339,21 @@ fn parse_minecraft_argument(
         )
         .replace("${version_type}", version_type.as_str())
         .replace("${resolution_width}", &resolution.0.to_string())
-        .replace("${resolution_height}", &resolution.1.to_string()))
+        .replace("${resolution_height}", &resolution.1.to_string())
+        .replace(
+            "${quickPlaySingleplayer}",
+            match quick_play_type {
+                QuickPlayType::Singleplayer(world) => world,
+                _ => "",
+            },
+        )
+        .replace(
+            "${quickPlayMultiplayer}",
+            match quick_play_type {
+                QuickPlayType::Server(address) => address,
+                _ => "",
+            },
+        ))
 }
 
 fn parse_arguments<F>(
@@ -334,6 +361,7 @@ fn parse_arguments<F>(
     parsed_arguments: &mut Vec<String>,
     parse_function: F,
     java_arch: &str,
+    quick_play_type: &QuickPlayType,
 ) -> crate::Result<()>
 where
     F: Fn(&str) -> crate::Result<String>,
@@ -348,7 +376,7 @@ where
                 }
             }
             Argument::Ruled { rules, value } => {
-                if parse_rules(rules, java_arch, true) {
+                if parse_rules(rules, java_arch, quick_play_type, true) {
                     match value {
                         ArgumentValue::Single(arg) => {
                             parsed_arguments.push(parse_function(
@@ -410,16 +438,14 @@ pub async fn get_processor_main_class(
             .map_err(|e| IOError::with_path(e, &path))?;
         let mut archive = zip::ZipArchive::new(zipfile).map_err(|_| {
             crate::ErrorKind::LauncherError(format!(
-                "Cannot read processor at {}",
-                path
+                "Cannot read processor at {path}"
             ))
             .as_error()
         })?;
 
         let file = archive.by_name("META-INF/MANIFEST.MF").map_err(|_| {
             crate::ErrorKind::LauncherError(format!(
-                "Cannot read processor manifest at {}",
-                path
+                "Cannot read processor manifest at {path}"
             ))
             .as_error()
         })?;
diff --git a/packages/app-lib/src/launcher/download.rs b/packages/app-lib/src/launcher/download.rs
index fbd239c8..c7c73887 100644
--- a/packages/app-lib/src/launcher/download.rs
+++ b/packages/app-lib/src/launcher/download.rs
@@ -1,10 +1,11 @@
 //! Downloader for Minecraft data
 
 use crate::launcher::parse_rules;
+use crate::profile::QuickPlayType;
 use crate::{
     event::{
-        emit::{emit_loading, loading_try_for_each_concurrent},
         LoadingBarId,
+        emit::{emit_loading, loading_try_for_each_concurrent},
     },
     state::State,
     util::{fetch::*, io, platform::OsExt},
@@ -295,7 +296,7 @@ pub async fn download_libraries(
         stream::iter(libraries.iter())
             .map(Ok::<&Library, crate::Error>), None, loading_bar,loading_amount,num_files, None,|library| async move {
                 if let Some(rules) = &library.rules {
-                    if !parse_rules(rules, java_arch, minecraft_updated) {
+                    if !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) {
                         tracing::trace!("Skipped library {}", &library.name);
                         return Ok(());
                     }
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index f794ab99..9f26b725 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -4,18 +4,21 @@ use crate::event::emit::{emit_loading, init_or_edit_loading};
 use crate::event::{LoadingBarId, LoadingBarType};
 use crate::launcher::download::download_log_config;
 use crate::launcher::io::IOError;
+use crate::profile::QuickPlayType;
 use crate::state::{
     Credentials, JavaVersion, ProcessMetadata, ProfileInstallStage,
 };
 use crate::util::io;
-use crate::{process, state as st, State};
+use crate::{State, process, state as st};
 use chrono::Utc;
 use daedalus as d;
 use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo};
 use daedalus::modded::LoaderVersion;
-use rand::seq::SliceRandom;
+use rand::seq::SliceRandom; // AstralRinth
+use serde::Deserialize;
 use st::Profile;
 use std::collections::HashMap;
+use std::path::PathBuf;
 use tokio::process::Command;
 
 mod args;
@@ -31,11 +34,14 @@ use crate::state::ACTIVE_STATE;
 pub fn parse_rules(
     rules: &[d::minecraft::Rule],
     java_version: &str,
+    quick_play_type: &QuickPlayType,
     minecraft_updated: bool,
 ) -> bool {
     let mut x = rules
         .iter()
-        .map(|x| parse_rule(x, java_version, minecraft_updated))
+        .map(|x| {
+            parse_rule(x, java_version, quick_play_type, minecraft_updated)
+        })
         .collect::<Vec<Option<bool>>>();
 
     if rules
@@ -56,26 +62,30 @@ pub fn parse_rules(
 pub fn parse_rule(
     rule: &d::minecraft::Rule,
     java_version: &str,
+    quick_play_type: &QuickPlayType,
     minecraft_updated: bool,
 ) -> Option<bool> {
     use d::minecraft::{Rule, RuleAction};
 
     let res = match rule {
-        Rule {
-            os: Some(ref os), ..
-        } => {
+        Rule { os: Some(os), .. } => {
             crate::util::platform::os_rule(os, java_version, minecraft_updated)
         }
         Rule {
-            features: Some(ref features),
+            features: Some(features),
             ..
         } => {
             !features.is_demo_user.unwrap_or(true)
                 || features.has_custom_resolution.unwrap_or(false)
                 || !features.has_quick_plays_support.unwrap_or(true)
-                || !features.is_quick_play_multiplayer.unwrap_or(true)
+                || (features.is_quick_play_singleplayer.unwrap_or(false)
+                    && matches!(
+                        quick_play_type,
+                        QuickPlayType::Singleplayer(_)
+                    ))
+                || (features.is_quick_play_multiplayer.unwrap_or(false)
+                    && matches!(quick_play_type, QuickPlayType::Server(..)))
                 || !features.is_quick_play_realms.unwrap_or(true)
-                || !features.is_quick_play_singleplayer.unwrap_or(true)
         }
         _ => return Some(true),
     };
@@ -288,8 +298,7 @@ pub async fn install_minecraft(
         .await?
         .ok_or_else(|| {
             crate::ErrorKind::LauncherError(format!(
-                "Java path invalid or non-functional: {:?}",
-                java_version
+                "Java path invalid or non-functional: {java_version:?}"
             ))
         })?;
 
@@ -308,12 +317,11 @@ pub async fn install_minecraft(
     )
     .await?;
 
+    let client_path = state
+        .directories
+        .version_dir(&version_jar)
+        .join(format!("{version_jar}.jar"));
     if let Some(processors) = &version_info.processors {
-        let client_path = state
-            .directories
-            .version_dir(&version_jar)
-            .join(format!("{version_jar}.jar"));
-
         let libraries_dir = state.directories.libraries_dir();
 
         if let Some(ref mut data) = version_info.data {
@@ -398,16 +406,18 @@ pub async fn install_minecraft(
                     &loading_bar,
                     30.0 / total_length as f64,
                     Some(&format!(
-                        "Running forge processor {}/{}",
-                        index, total_length
+                        "Running forge processor {index}/{total_length}"
                     )),
                 )?;
             }
         }
     }
 
+    let protocol_version = read_protocol_version_from_jar(client_path).await?;
+
     crate::api::profile::edit(&profile.path, |prof| {
         prof.install_stage = ProfileInstallStage::Installed;
+        prof.protocol_version = protocol_version;
 
         async { Ok(()) }
     })
@@ -417,6 +427,34 @@ pub async fn install_minecraft(
     Ok(())
 }
 
+pub async fn read_protocol_version_from_jar(
+    path: PathBuf,
+) -> crate::Result<Option<i32>> {
+    let zip = async_zip::tokio::read::fs::ZipFileReader::new(path).await?;
+    let Some(entry_index) = zip
+        .file()
+        .entries()
+        .iter()
+        .position(|x| matches!(x.filename().as_str(), Ok("version.json")))
+    else {
+        return Ok(None);
+    };
+
+    #[derive(Deserialize, Debug)]
+    struct VersionData {
+        protocol_version: Option<i32>,
+    }
+
+    let mut data = vec![];
+    zip.reader_with_entry(entry_index)
+        .await?
+        .read_to_end_checked(&mut data)
+        .await?;
+    let data: VersionData = serde_json::from_slice(&data)?;
+
+    Ok(data.protocol_version)
+}
+
 #[tracing::instrument(skip_all)]
 #[allow(clippy::too_many_arguments)]
 pub async fn launch_minecraft(
@@ -429,6 +467,7 @@ pub async fn launch_minecraft(
     credentials: &Credentials,
     post_exit_hook: Option<String>,
     profile: &Profile,
+    quick_play_type: &QuickPlayType,
 ) -> crate::Result<ProcessMetadata> {
     if profile.install_stage == ProfileInstallStage::PackInstalling
         || profile.install_stage == ProfileInstallStage::MinecraftInstalling
@@ -584,6 +623,7 @@ pub async fn launch_minecraft(
                 *memory,
                 Vec::from(java_args),
                 &java_version.architecture,
+                quick_play_type,
                 version_info
                     .logging
                     .as_ref()
@@ -606,6 +646,7 @@ pub async fn launch_minecraft(
                 &version.type_,
                 *resolution,
                 &java_version.architecture,
+                quick_play_type,
             )?
             .into_iter()
             .collect::<Vec<_>>(),
@@ -637,10 +678,10 @@ pub async fn launch_minecraft(
             // 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));
+                options_string.push_str(&format!("\n{key}:{value}"));
             } else {
                 let replaced_string = re
-                    .replace_all(&options_string, &format!("{}:{}", key, value))
+                    .replace_all(&options_string, &format!("{key}:{value}"))
                     .to_string();
                 options_string = replaced_string;
             }
@@ -658,12 +699,10 @@ pub async fn launch_minecraft(
 
     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(
-        format!("\\{}\\", username),
+        format!("\\{username}\\"),
         "\\{COMPUTER_USERNAME}\\".to_string(),
     );
     censor_strings.insert(
@@ -712,6 +751,12 @@ pub async fn launch_minecraft(
     // This also spawns the process and prepares the subsequent processes
     state
         .process_manager
-        .insert_new_process(&profile.path, command, post_exit_hook)
+        .insert_new_process(
+            &profile.path,
+            command,
+            post_exit_hook,
+            state.directories.profile_logs_dir(&profile.path),
+            version_info.logging.is_some(),
+        )
         .await
 }
diff --git a/packages/app-lib/src/lib.rs b/packages/app-lib/src/lib.rs
index 523ad495..55f4459a 100644
--- a/packages/app-lib/src/lib.rs
+++ b/packages/app-lib/src/lib.rs
@@ -21,8 +21,8 @@ mod state;
 pub use api::*;
 pub use error::*;
 pub use event::{
-    emit::emit_loading, emit::init_loading, EventState, LoadingBar,
-    LoadingBarType,
+    EventState, LoadingBar, LoadingBarType, emit::emit_loading,
+    emit::init_loading,
 };
 pub use logger::start_logger;
 pub use state::State;
diff --git a/packages/app-lib/src/state/attached_world_data.rs b/packages/app-lib/src/state/attached_world_data.rs
new file mode 100644
index 00000000..9d161799
--- /dev/null
+++ b/packages/app-lib/src/state/attached_world_data.rs
@@ -0,0 +1,122 @@
+use crate::worlds::{DisplayStatus, WorldType};
+use paste::paste;
+use std::collections::HashMap;
+
+#[derive(Debug, Clone, Default)]
+pub struct AttachedWorldData {
+    pub display_status: DisplayStatus,
+}
+
+impl AttachedWorldData {
+    pub async fn get_for_world(
+        instance: &str,
+        world_type: WorldType,
+        world_id: &str,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+    ) -> crate::Result<Option<Self>> {
+        let world_type = world_type.as_str();
+
+        let attached_data = sqlx::query!(
+            "
+            SELECT display_status
+            FROM attached_world_data
+            WHERE profile_path = $1 and world_type = $2 and world_id = $3
+            ",
+            instance,
+            world_type,
+            world_id
+        )
+        .fetch_optional(exec)
+        .await?;
+
+        Ok(attached_data.map(|x| AttachedWorldData {
+            display_status: DisplayStatus::from_string(&x.display_status),
+        }))
+    }
+
+    pub async fn get_all_for_instance(
+        instance: &str,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+    ) -> crate::Result<HashMap<(WorldType, String), Self>> {
+        let attached_data = sqlx::query!(
+            "
+            SELECT world_type, world_id, display_status
+            FROM attached_world_data
+            WHERE profile_path = $1
+            ",
+            instance
+        )
+        .fetch_all(exec)
+        .await?;
+
+        Ok(attached_data
+            .into_iter()
+            .map(|x| {
+                let world_type = WorldType::from_string(&x.world_type);
+                let display_status =
+                    DisplayStatus::from_string(&x.display_status);
+                (
+                    (world_type, x.world_id),
+                    AttachedWorldData { display_status },
+                )
+            })
+            .collect())
+    }
+
+    pub async fn remove_for_world(
+        instance: &str,
+        world_type: WorldType,
+        world_id: &str,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+    ) -> crate::Result<()> {
+        let world_type = world_type.as_str();
+
+        sqlx::query!(
+            "
+            DELETE FROM attached_world_data
+            WHERE profile_path = $1 and world_type = $2 and world_id = $3
+            ",
+            instance,
+            world_type,
+            world_id
+        )
+        .execute(exec)
+        .await?;
+
+        Ok(())
+    }
+}
+
+macro_rules! attached_data_setter {
+    ($parameter:ident: $parameter_type:ty, $column:expr $(=> $adapter:expr)?) => {
+        paste! {
+            pub async fn [<set_ $parameter>](
+                instance: &str,
+                world_type: WorldType,
+                world_id: &str,
+                $parameter: $parameter_type,
+                exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+            ) -> crate::Result<()> {
+                let world_type = world_type.as_str();
+                $(let $parameter = $adapter;)?
+
+                sqlx::query!(
+                    "INSERT INTO attached_world_data (profile_path, world_type, world_id, " + $column + ")\n" +
+                    "VALUES ($1, $2, $3, $4)\n" +
+                    "ON CONFLICT (profile_path, world_type, world_id) DO UPDATE\n" +
+                    "    SET " + $column + " = $4",
+                    instance,
+                    world_type,
+                    world_id,
+                    $parameter
+                )
+                .execute(exec)
+                .await?;
+
+                Ok(())
+            }
+        }
+    }
+}
+
+attached_data_setter!(display_status: DisplayStatus, "display_status" => display_status.as_str());
diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index 000ff4ee..de42549c 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -1,6 +1,6 @@
 use crate::config::{META_URL, MODRINTH_API_URL, MODRINTH_API_URL_V3};
 use crate::state::ProjectType;
-use crate::util::fetch::{fetch_json, sha1_async, FetchSemaphore};
+use crate::util::fetch::{FetchSemaphore, fetch_json, sha1_async};
 use chrono::{DateTime, Utc};
 use dashmap::DashSet;
 use reqwest::Method;
@@ -843,7 +843,7 @@ impl CachedEntry {
             fetch_semaphore: &FetchSemaphore,
             pool: &SqlitePool,
         ) -> crate::Result<Vec<T>> {
-            const MAX_REQUEST_SIZE: usize = 1000;
+            const MAX_REQUEST_SIZE: usize = 800;
 
             let urls = keys
                 .iter()
@@ -1072,7 +1072,7 @@ impl CachedEntry {
             CacheValueType::File => {
                 let mut versions = fetch_json::<HashMap<String, Version>>(
                     Method::POST,
-                    &format!("{}version_files", MODRINTH_API_URL),
+                    &format!("{MODRINTH_API_URL}version_files"),
                     None,
                     Some(serde_json::json!({
                         "algorithm": "sha1",
@@ -1285,7 +1285,7 @@ impl CachedEntry {
 
                         if let Some(values) =
                             filtered_keys.iter_mut().find(|x| {
-                                x.0 .0 == loaders_key && x.0 .1 == game_version
+                                x.0.0 == loaders_key && x.0.1 == game_version
                             })
                         {
                             values.1.push(hash.to_string());
@@ -1307,7 +1307,7 @@ impl CachedEntry {
                 });
 
                 let version_update_url =
-                    format!("{}version_files/update", MODRINTH_API_URL);
+                    format!("{MODRINTH_API_URL}version_files/update");
                 let variations =
                     futures::future::try_join_all(filtered_keys.iter().map(
                         |((loaders_key, game_version), hashes)| {
@@ -1481,7 +1481,7 @@ pub async fn cache_file_hash(
 
     CachedEntry::upsert_many(
         &[CacheValue::FileHash(CachedFileHash {
-            path: format!("{}/{}", profile_path, path),
+            path: format!("{profile_path}/{path}"),
             size: size as u64,
             hash,
             project_type,
diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs
index ac1bc458..0d2293e6 100644
--- a/packages/app-lib/src/state/dirs.rs
+++ b/packages/app-lib/src/state/dirs.rs
@@ -1,8 +1,8 @@
 //! Theseus directory information
+use crate::LoadingBarType;
 use crate::event::emit::{emit_loading, init_loading};
 use crate::state::{JavaVersion, Profile, Settings};
 use crate::util::fetch::IoSemaphore;
-use crate::LoadingBarType;
 use dashmap::DashSet;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
diff --git a/packages/app-lib/src/state/discord.rs b/packages/app-lib/src/state/discord.rs
index d5803cd2..39a8eaf0 100644
--- a/packages/app-lib/src/state/discord.rs
+++ b/packages/app-lib/src/state/discord.rs
@@ -1,17 +1,16 @@
 use std::{
     sync::{atomic::AtomicBool, Arc},
-    time::{SystemTime, UNIX_EPOCH},
+    time::{SystemTime, UNIX_EPOCH}, // AstralRinth
 };
 
 use discord_rich_presence::{
-    activity::{Activity, Assets, Timestamps},
+    activity::{Activity, Assets, Timestamps}, // AstralRinth
     DiscordIpc, DiscordIpcClient,
 };
-use rand::seq::SliceRandom;
+use rand::seq::SliceRandom; // AstralRinth
 use tokio::sync::RwLock;
 
-// use crate::state::Profile;
-use crate::util::utils;
+use crate::util::utils; // AstralRinth
 use crate::State;
 
 pub struct DiscordGuard {
@@ -43,8 +42,7 @@ impl DiscordGuard {
         let dipc =
             DiscordIpcClient::new("1190718475832918136").map_err(|e| {
                 crate::ErrorKind::OtherError(format!(
-                    "Could not create Discord client {}",
-                    e,
+                    "Could not create Discord client {e}",
                 ))
             })?;
 
@@ -133,8 +131,7 @@ impl DiscordGuard {
         let res = client.set_activity(activity.clone());
         let could_not_set_err = |e: Box<dyn serde::ser::StdError>| {
             crate::ErrorKind::OtherError(format!(
-                "Could not update Discord activity {}",
-                e,
+                "Could not update Discord activity {e}",
             ))
         };
 
@@ -142,8 +139,7 @@ impl DiscordGuard {
             if let Err(_e) = res {
                 client.reconnect().map_err(|e| {
                     crate::ErrorKind::OtherError(format!(
-                        "Could not reconnect to Discord IPC {}",
-                        e,
+                        "Could not reconnect to Discord IPC {e}",
                     ))
                 })?;
                 return Ok(client
@@ -174,8 +170,7 @@ impl DiscordGuard {
 
         let could_not_clear_err = |e: Box<dyn serde::ser::StdError>| {
             crate::ErrorKind::OtherError(format!(
-                "Could not clear Discord activity {}",
-                e,
+                "Could not clear Discord activity {e}",
             ))
         };
 
@@ -183,8 +178,7 @@ impl DiscordGuard {
             if res.is_err() {
                 client.reconnect().map_err(|e| {
                     crate::ErrorKind::OtherError(format!(
-                        "Could not reconnect to Discord IPC {}",
-                        e,
+                        "Could not reconnect to Discord IPC {e}",
                     ))
                 })?;
                 return Ok(client
diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs
index 0775b04d..831b3155 100644
--- a/packages/app-lib/src/state/friends.rs
+++ b/packages/app-lib/src/state/friends.rs
@@ -1,32 +1,34 @@
 use crate::config::{MODRINTH_API_URL_V3, MODRINTH_SOCKET_URL};
 use crate::data::ModrinthCredentials;
-use crate::event::emit::emit_friend;
 use crate::event::FriendPayload;
+use crate::event::emit::emit_friend;
 use crate::state::tunnel::InternalTunnelSocket;
 use crate::state::{ProcessManager, Profile, TunnelSocket};
-use crate::util::fetch::{fetch_advanced, fetch_json, FetchSemaphore};
+use crate::util::fetch::{FetchSemaphore, fetch_advanced, fetch_json};
+use ariadne::ids::UserId;
 use ariadne::networking::message::{
     ClientToServerMessage, ServerToClientMessage,
 };
-use ariadne::users::{UserId, UserStatus};
-use async_tungstenite::tokio::{connect_async, ConnectStream};
-use async_tungstenite::tungstenite::client::IntoClientRequest;
-use async_tungstenite::tungstenite::Message;
+use ariadne::users::UserStatus;
 use async_tungstenite::WebSocketStream;
+use async_tungstenite::tokio::{ConnectStream, connect_async};
+use async_tungstenite::tungstenite::Message;
+use async_tungstenite::tungstenite::client::IntoClientRequest;
+use bytes::Bytes;
 use chrono::{DateTime, Utc};
 use dashmap::DashMap;
 use either::Either;
 use futures::stream::SplitSink;
 use futures::{SinkExt, StreamExt};
-use reqwest::header::HeaderValue;
 use reqwest::Method;
+use reqwest::header::HeaderValue;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use std::ops::Deref;
 use std::sync::Arc;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::net::tcp::OwnedReadHalf;
 use tokio::net::TcpStream;
+use tokio::net::tcp::OwnedReadHalf;
 use tokio::sync::{Mutex, RwLock};
 use uuid::Uuid;
 
@@ -204,7 +206,10 @@ impl FriendsSocket {
                                     }
                                 }
                                 Err(e) => {
-                                    tracing::error!("Error handling message from websocket server: {:?}", e);
+                                    tracing::error!(
+                                        "Error handling message from websocket server: {:?}",
+                                        e
+                                    );
                                 }
                             }
                         }
@@ -258,7 +263,7 @@ impl FriendsSocket {
                     last_ping = Utc::now();
                     let mut write = state.friends_socket.write.write().await;
                     if let Some(write) = write.as_mut() {
-                        let _ = write.send(Message::Ping(Vec::new())).await;
+                        let _ = write.send(Message::Ping(Bytes::new())).await;
                     }
                 }
 
diff --git a/packages/app-lib/src/state/fs_watcher.rs b/packages/app-lib/src/state/fs_watcher.rs
index f30e3a3c..12bd8931 100644
--- a/packages/app-lib/src/state/fs_watcher.rs
+++ b/packages/app-lib/src/state/fs_watcher.rs
@@ -1,30 +1,31 @@
-use crate::event::emit::{emit_profile, emit_warning};
+use crate::State;
 use crate::event::ProfilePayloadType;
-use crate::state::{DirectoryInfo, ProfileInstallStage, ProjectType};
-use futures::{channel::mpsc::channel, SinkExt, StreamExt};
+use crate::event::emit::{emit_profile, emit_warning};
+use crate::state::{
+    DirectoryInfo, ProfileInstallStage, ProjectType, attached_world_data,
+};
+use crate::worlds::WorldType;
 use notify::{RecommendedWatcher, RecursiveMode};
-use notify_debouncer_mini::{new_debouncer, DebounceEventResult, Debouncer};
+use notify_debouncer_mini::{DebounceEventResult, Debouncer, new_debouncer};
 use std::time::Duration;
-use tokio::sync::RwLock;
+use tokio::sync::{RwLock, mpsc::channel};
 
 pub type FileWatcher = RwLock<Debouncer<RecommendedWatcher>>;
 
 pub async fn init_watcher() -> crate::Result<FileWatcher> {
-    let (mut tx, mut rx) = channel(1);
+    let (tx, mut rx) = channel(1);
 
     let file_watcher = new_debouncer(
         Duration::from_secs_f32(1.0),
         move |res: DebounceEventResult| {
-            futures::executor::block_on(async {
-                tx.send(res).await.unwrap();
-            })
+            tx.blocking_send(res).ok();
         },
     )?;
 
     tokio::task::spawn(async move {
         let span = tracing::span!(tracing::Level::INFO, "init_watcher");
         tracing::info!(parent: &span, "Initting watcher");
-        while let Some(res) = rx.next().await {
+        while let Some(res) = rx.recv().await {
             let _span = span.enter();
 
             match res {
@@ -37,9 +38,7 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                         let mut found = false;
                         for component in e.path.components() {
                             if found {
-                                profile_path = Some(
-                                    component.as_os_str().to_string_lossy(),
-                                );
+                                profile_path = Some(component.as_os_str());
                                 break;
                             }
 
@@ -51,26 +50,87 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                         }
 
                         if let Some(profile_path) = profile_path {
-                            if e.path
+                            let profile_path_str =
+                                profile_path.to_string_lossy().to_string();
+                            let first_file_name = e
+                                .path
                                 .components()
-                                .any(|x| x.as_os_str() == "crash-reports")
+                                .skip_while(|x| x.as_os_str() != profile_path)
+                                .nth(1)
+                                .map(|x| x.as_os_str());
+                            if first_file_name
+                                .filter(|x| *x == "crash-reports")
+                                .is_some()
                                 && e.path
                                     .extension()
-                                    .map(|x| x == "txt")
-                                    .unwrap_or(false)
+                                    .filter(|x| *x == "txt")
+                                    .is_some()
                             {
-                                crash_task(profile_path.to_string());
+                                crash_task(profile_path_str);
                             } else if !visited_profiles.contains(&profile_path)
                             {
-                                let path = profile_path.to_string();
-                                tokio::spawn(async move {
-                                    let _ = emit_profile(
-                                        &path,
-                                        ProfilePayloadType::Synced,
-                                    )
-                                    .await;
-                                });
-                                visited_profiles.push(profile_path);
+                                let event = if first_file_name
+                                    .filter(|x| *x == "servers.dat")
+                                    .is_some()
+                                {
+                                    Some(ProfilePayloadType::ServersUpdated)
+                                } else if first_file_name
+                                    .filter(|x| {
+                                        *x == "saves"
+                                            && e.path
+                                                .file_name()
+                                                .filter(|x| *x == "level.dat")
+                                                .is_some()
+                                    })
+                                    .is_some()
+                                {
+                                    tracing::info!(
+                                        "World updated: {}",
+                                        e.path.display()
+                                    );
+                                    let world = e
+                                        .path
+                                        .parent()
+                                        .unwrap()
+                                        .file_name()
+                                        .unwrap()
+                                        .to_string_lossy()
+                                        .to_string();
+                                    if !e.path.is_file() {
+                                        let profile_path_str = profile_path_str.clone();
+                                        let world = world.clone();
+                                        tokio::spawn(async move {
+                                            if let Ok(state) = State::get().await {
+                                                if let Err(e) = attached_world_data::AttachedWorldData::remove_for_world(
+                                                    &profile_path_str,
+                                                    WorldType::Singleplayer,
+                                                    &world,
+                                                    &state.pool
+                                                ).await {
+                                                    tracing::warn!("Failed to remove AttachedWorldData for '{world}': {e}")
+                                                }
+                                            }
+                                        });
+                                    }
+                                    Some(ProfilePayloadType::WorldUpdated { world })
+                                } else if first_file_name
+                                    .filter(|x| *x == "saves")
+                                    .is_none()
+                                {
+                                    Some(ProfilePayloadType::Synced)
+                                } else {
+                                    None
+                                };
+                                if let Some(event) = event {
+                                    tokio::spawn(async move {
+                                        let _ = emit_profile(
+                                            &profile_path_str,
+                                            event,
+                                        )
+                                        .await;
+                                    });
+                                    visited_profiles.push(profile_path);
+                                }
                             }
                         }
                     });
@@ -111,27 +171,47 @@ pub(crate) async fn watch_profile(
     let profile_path = dirs.profiles_dir().join(profile_path);
 
     if profile_path.exists() && profile_path.is_dir() {
-        for folder in ProjectType::iterator()
-            .map(|x| x.get_folder())
-            .chain(["crash-reports"])
-        {
-            let path = profile_path.join(folder);
+        for sub_path in ProjectType::iterator().map(|x| x.get_folder()).chain([
+            "crash-reports",
+            "saves",
+            "servers.dat",
+        ]) {
+            let full_path = profile_path.join(sub_path);
 
-            if !path.exists() && !path.is_symlink() {
-                if let Err(e) = crate::util::io::create_dir_all(&path).await {
-                    tracing::error!(
-                        "Failed to create directory for watcher {path:?}: {e}"
-                    );
-                    return;
+            if !full_path.exists() && !full_path.is_symlink() {
+                if !sub_path.contains(".") {
+                    if let Err(e) =
+                        crate::util::io::create_dir_all(&full_path).await
+                    {
+                        tracing::error!(
+                            "Failed to create directory for watcher {full_path:?}: {e}"
+                        );
+                        return;
+                    }
+                } else if sub_path == "servers.dat" {
+                    const EMPTY_NBT: &[u8] = &[
+                        10, // Compound tag
+                        0, 0, // Empty name
+                        0, // End of compound tag
+                    ];
+                    if let Err(e) =
+                        crate::util::io::write(&full_path, EMPTY_NBT).await
+                    {
+                        tracing::error!(
+                            "Failed to create file for watcher {full_path:?}: {e}"
+                        );
+                        return;
+                    }
                 }
             }
 
             let mut watcher = watcher.write().await;
-            if let Err(e) =
-                watcher.watcher().watch(&path, RecursiveMode::Recursive)
+            if let Err(e) = watcher
+                .watcher()
+                .watch(&full_path, RecursiveMode::Recursive)
             {
                 tracing::error!(
-                    "Failed to watch directory for watcher {path:?}: {e}"
+                    "Failed to watch directory for watcher {full_path:?}: {e}"
                 );
                 return;
             }
diff --git a/packages/app-lib/src/state/legacy_converter.rs b/packages/app-lib/src/state/legacy_converter.rs
index e0cb60c3..0fcc01dd 100644
--- a/packages/app-lib/src/state/legacy_converter.rs
+++ b/packages/app-lib/src/state/legacy_converter.rs
@@ -5,11 +5,11 @@ use crate::state;
 use crate::state::{
     CacheValue, CachedEntry, CachedFile, CachedFileHash, CachedFileUpdate,
     Credentials, DefaultPage, DependencyType, DeviceToken, DeviceTokenKey,
-    DeviceTokenPair, FileType, Hooks, LinkedData, MemorySettings,
-    ModrinthCredentials, Profile, ProfileInstallStage, TeamMember, Theme,
-    VersionFile, WindowSize,
+    DeviceTokenPair, FileType, Hooks, LauncherFeatureVersion, LinkedData,
+    MemorySettings, ModrinthCredentials, Profile, ProfileInstallStage,
+    TeamMember, Theme, VersionFile, WindowSize,
 };
-use crate::util::fetch::{read_json, IoSemaphore};
+use crate::util::fetch::{IoSemaphore, read_json};
 use chrono::{DateTime, Utc};
 use p256::ecdsa::SigningKey;
 use p256::pkcs8::DecodePrivateKey;
@@ -250,9 +250,11 @@ where
                                                     .metadata
                                                     .game_version
                                                     .clone(),
-                                                loaders: vec![mod_loader
-                                                    .as_str()
-                                                    .to_string()],
+                                                loaders: vec![
+                                                    mod_loader
+                                                        .as_str()
+                                                        .to_string(),
+                                                ],
                                                 update_version_id:
                                                     update_version.id.clone(),
                                             },
@@ -317,9 +319,11 @@ where
                             ProfileInstallStage::NotInstalled
                         }
                     },
+                    launcher_feature_version: LauncherFeatureVersion::None,
                     name: profile.metadata.name,
                     icon_path: profile.metadata.icon,
                     game_version: profile.metadata.game_version,
+                    protocol_version: None,
                     loader: profile.metadata.loader.into(),
                     loader_version: profile
                         .metadata
diff --git a/packages/app-lib/src/state/minecraft_auth.rs b/packages/app-lib/src/state/minecraft_auth.rs
index c181aebd..4cc045b8 100644
--- a/packages/app-lib/src/state/minecraft_auth.rs
+++ b/packages/app-lib/src/state/minecraft_auth.rs
@@ -1,18 +1,17 @@
-use crate::util::fetch::REQWEST_CLIENT;
 use crate::ErrorKind;
-use base64::prelude::{BASE64_STANDARD, BASE64_URL_SAFE_NO_PAD};
+use crate::util::fetch::REQWEST_CLIENT;
 use base64::Engine;
-use byteorder::BigEndian;
+use base64::prelude::{BASE64_STANDARD, BASE64_URL_SAFE_NO_PAD};
 use chrono::{DateTime, Duration, TimeZone, Utc};
 use dashmap::DashMap;
 use futures::TryStreamExt;
 use p256::ecdsa::signature::Signer;
 use p256::ecdsa::{Signature, SigningKey, VerifyingKey};
 use p256::pkcs8::{DecodePrivateKey, EncodePrivateKey, LineEnding};
-use rand::rngs::OsRng;
 use rand::Rng;
-use reqwest::header::HeaderMap;
+use rand::rngs::OsRng;
 use reqwest::Response;
+use reqwest::header::HeaderMap;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
@@ -62,12 +61,6 @@ pub enum MinecraftAuthenticationError {
         #[source]
         source: reqwest::Error,
     },
-    #[error("Error creating signed request buffer {step:?}: {source}")]
-    ConstructingSignedRequest {
-        step: MinecraftAuthStep,
-        #[source]
-        source: std::io::Error,
-    },
     #[error("Error reading XBOX Session ID header")]
     NoSessionId,
     #[error("Error reading user hash")]
@@ -1110,56 +1103,25 @@ async fn send_signed_request<T: DeserializeOwned>(
     let time: u128 =
         { ((current_date.timestamp() as u128) + 11644473600) * 10000000 };
 
-    use byteorder::WriteBytesExt;
     let mut buffer = Vec::new();
-    buffer.write_u32::<BigEndian>(1).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
-    buffer.write_u8(0).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
-    buffer
-        .write_u64::<BigEndian>(time as u64)
-        .map_err(|source| {
-            MinecraftAuthenticationError::ConstructingSignedRequest {
-                source,
-                step,
-            }
-        })?;
-    buffer.write_u8(0).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
+    buffer.extend_from_slice(&1_u32.to_be_bytes()[..]);
+    buffer.push(0_u8);
+    buffer.extend_from_slice(&(time as u64).to_be_bytes()[..]);
+    buffer.push(0_u8);
     buffer.extend_from_slice("POST".as_bytes());
-    buffer.write_u8(0).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
+    buffer.push(0_u8);
     buffer.extend_from_slice(url_path.as_bytes());
-    buffer.write_u8(0).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
+    buffer.push(0_u8);
     buffer.extend_from_slice(&auth);
-    buffer.write_u8(0).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
+    buffer.push(0_u8);
     buffer.extend_from_slice(&body);
-    buffer.write_u8(0).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
+    buffer.push(0_u8);
 
     let ecdsa_sig: Signature = key.key.sign(&buffer);
 
     let mut sig_buffer = Vec::new();
-    sig_buffer.write_i32::<BigEndian>(1).map_err(|source| {
-        MinecraftAuthenticationError::ConstructingSignedRequest { source, step }
-    })?;
-    sig_buffer
-        .write_u64::<BigEndian>(time as u64)
-        .map_err(|source| {
-            MinecraftAuthenticationError::ConstructingSignedRequest {
-                source,
-                step,
-            }
-        })?;
+    sig_buffer.extend_from_slice(&1_i32.to_be_bytes()[..]);
+    sig_buffer.extend_from_slice(&(time as u64).to_be_bytes()[..]);
     sig_buffer.extend_from_slice(&ecdsa_sig.r().to_bytes());
     sig_buffer.extend_from_slice(&ecdsa_sig.s().to_bytes());
 
@@ -1224,6 +1186,6 @@ fn get_date_header(headers: &HeaderMap) -> DateTime<Utc> {
 fn generate_oauth_challenge() -> String {
     let mut rng = rand::thread_rng();
 
-    let bytes: Vec<u8> = (0..64).map(|_| rng.gen::<u8>()).collect();
-    bytes.iter().map(|byte| format!("{:02x}", byte)).collect()
+    let bytes: Vec<u8> = (0..64).map(|_| rng.r#gen::<u8>()).collect();
+    bytes.iter().map(|byte| format!("{byte:02x}")).collect()
 }
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index 75f73f68..ec6d5426 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -45,6 +45,9 @@ pub use self::mr_auth::*;
 
 mod legacy_converter;
 
+pub mod attached_world_data;
+pub mod server_join_log;
+
 // Global state
 // RwLock on state only has concurrent reads, except for config dir change which takes control of the State
 static LAUNCHER_STATE: OnceCell<Arc<State>> = OnceCell::const_new();
@@ -108,7 +111,9 @@ impl State {
     /// Get the current launcher state, waiting for initialization
     pub async fn get() -> crate::Result<Arc<Self>> {
         if !LAUNCHER_STATE.initialized() {
-            tracing::error!("Attempted to get state before it is initialized - this should never happen!");
+            tracing::error!(
+                "Attempted to get state before it is initialized - this should never happen!"
+            );
             while !LAUNCHER_STATE.initialized() {
                 tokio::time::sleep(std::time::Duration::from_millis(100)).await;
             }
diff --git a/packages/app-lib/src/state/mr_auth.rs b/packages/app-lib/src/state/mr_auth.rs
index b15de7e5..8aab2a37 100644
--- a/packages/app-lib/src/state/mr_auth.rs
+++ b/packages/app-lib/src/state/mr_auth.rs
@@ -1,6 +1,6 @@
 use crate::config::{MODRINTH_API_URL, MODRINTH_URL};
 use crate::state::{CacheBehaviour, CachedEntry};
-use crate::util::fetch::{fetch_advanced, FetchSemaphore};
+use crate::util::fetch::{FetchSemaphore, fetch_advanced};
 use chrono::{DateTime, Duration, TimeZone, Utc};
 use dashmap::DashMap;
 use futures::TryStreamExt;
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index cfce1fd9..324fcda4 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -1,15 +1,23 @@
-use crate::event::emit::emit_process;
-use crate::event::ProcessPayloadType;
+use crate::event::emit::{emit_process, emit_profile};
+use crate::event::{ProcessPayloadType, ProfilePayloadType};
 use crate::profile;
 use crate::util::io::IOError;
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, TimeZone, Utc};
 use dashmap::DashMap;
+use quick_xml::Reader;
+use quick_xml::events::Event;
 use serde::Deserialize;
 use serde::Serialize;
+use std::fs::OpenOptions;
+use std::io::Write;
+use std::path::{Path, PathBuf};
 use std::process::ExitStatus;
+use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::{Child, Command};
 use uuid::Uuid;
 
+const LAUNCHER_LOG_PATH: &str = "launcher_log.txt";
+
 pub struct ProcessManager {
     processes: DashMap<Uuid, Process>,
 }
@@ -32,8 +40,16 @@ impl ProcessManager {
         profile_path: &str,
         mut mc_command: Command,
         post_exit_command: Option<String>,
+        logs_folder: PathBuf,
+        xml_logging: bool,
     ) -> crate::Result<ProcessMetadata> {
-        let mc_proc = mc_command.spawn().map_err(IOError::from)?;
+        mc_command.stdout(std::process::Stdio::piped());
+        mc_command.stderr(std::process::Stdio::piped());
+
+        let mut mc_proc = mc_command.spawn().map_err(IOError::from)?;
+
+        let stdout = mc_proc.stdout.take();
+        let stderr = mc_proc.stderr.take();
 
         let process = Process {
             metadata: ProcessMetadata {
@@ -46,6 +62,65 @@ impl ProcessManager {
 
         let metadata = process.metadata.clone();
 
+        if !logs_folder.exists() {
+            tokio::fs::create_dir_all(&logs_folder)
+                .await
+                .map_err(|e| IOError::with_path(e, &logs_folder))?;
+        }
+
+        let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
+
+        {
+            let mut log_file = OpenOptions::new()
+                .write(true)
+                .create(true)
+                .truncate(true)
+                .open(&log_path)
+                .map_err(|e| IOError::with_path(e, &log_path))?;
+
+            // Initialize with timestamp header
+            let now = chrono::Local::now();
+            writeln!(
+                log_file,
+                "# Minecraft launcher log started at {}",
+                now.format("%Y-%m-%d %H:%M:%S")
+            )
+            .map_err(|e| IOError::with_path(e, &log_path))?;
+            writeln!(log_file, "# Profile: {profile_path} \n")
+                .map_err(|e| IOError::with_path(e, &log_path))?;
+            writeln!(log_file).map_err(|e| IOError::with_path(e, &log_path))?;
+        }
+
+        if let Some(stdout) = stdout {
+            let log_path_clone = log_path.clone();
+
+            let profile_path = metadata.profile_path.clone();
+            tokio::spawn(async move {
+                Process::process_output(
+                    &profile_path,
+                    stdout,
+                    log_path_clone,
+                    xml_logging,
+                )
+                .await;
+            });
+        }
+
+        if let Some(stderr) = stderr {
+            let log_path_clone = log_path.clone();
+
+            let profile_path = metadata.profile_path.clone();
+            tokio::spawn(async move {
+                Process::process_output(
+                    &profile_path,
+                    stderr,
+                    log_path_clone,
+                    xml_logging,
+                )
+                .await;
+            });
+        }
+
         tokio::spawn(Process::sequential_process_manager(
             profile_path.to_string(),
             post_exit_command,
@@ -120,7 +195,384 @@ struct Process {
     child: Child,
 }
 
+#[derive(Debug, Default)]
+struct Log4jEvent {
+    timestamp: Option<String>,
+    logger: Option<String>,
+    level: Option<String>,
+    thread: Option<String>,
+    message: Option<String>,
+}
+
 impl Process {
+    async fn process_output<R>(
+        profile_path: &str,
+        reader: R,
+        log_path: impl AsRef<Path>,
+        xml_logging: bool,
+    ) where
+        R: tokio::io::AsyncRead + Unpin,
+    {
+        let mut buf_reader = BufReader::new(reader);
+
+        if xml_logging {
+            let mut reader = Reader::from_reader(buf_reader);
+            reader.config_mut().enable_all_checks(false);
+
+            let mut buf = Vec::new();
+            let mut current_event = Log4jEvent::default();
+            let mut in_event = false;
+            let mut in_message = false;
+            let mut in_throwable = false;
+            let mut current_content = String::new();
+
+            loop {
+                match reader.read_event_into_async(&mut buf).await {
+                    Err(e) => {
+                        tracing::error!(
+                            "Error at position {}: {:?}",
+                            reader.buffer_position(),
+                            e
+                        );
+                        break;
+                    }
+                    // exits the loop when reaching end of file
+                    Ok(Event::Eof) => break,
+
+                    Ok(Event::Start(e)) => {
+                        match e.name().as_ref() {
+                            b"log4j:Event" => {
+                                // Reset for new event
+                                current_event = Log4jEvent::default();
+                                in_event = true;
+
+                                // Extract attributes
+                                for attr in e.attributes().flatten() {
+                                    let key = String::from_utf8_lossy(
+                                        attr.key.into_inner(),
+                                    )
+                                    .to_string();
+                                    let value =
+                                        String::from_utf8_lossy(&attr.value)
+                                            .to_string();
+
+                                    match key.as_str() {
+                                        "logger" => {
+                                            current_event.logger = Some(value)
+                                        }
+                                        "level" => {
+                                            current_event.level = Some(value)
+                                        }
+                                        "thread" => {
+                                            current_event.thread = Some(value)
+                                        }
+                                        "timestamp" => {
+                                            current_event.timestamp =
+                                                Some(value)
+                                        }
+                                        _ => {}
+                                    }
+                                }
+                            }
+                            b"log4j:Message" => {
+                                in_message = true;
+                                current_content = String::new();
+                            }
+                            b"log4j:Throwable" => {
+                                in_throwable = true;
+                                current_content = String::new();
+                            }
+                            _ => {}
+                        }
+                    }
+                    Ok(Event::End(e)) => {
+                        match e.name().as_ref() {
+                            b"log4j:Message" => {
+                                in_message = false;
+                                current_event.message =
+                                    Some(current_content.clone());
+                            }
+                            b"log4j:Throwable" => {
+                                in_throwable = false;
+                                // Process and write the log entry
+                                let thread = current_event
+                                    .thread
+                                    .as_deref()
+                                    .unwrap_or("");
+                                let level = current_event
+                                    .level
+                                    .as_deref()
+                                    .unwrap_or("");
+                                let logger = current_event
+                                    .logger
+                                    .as_deref()
+                                    .unwrap_or("");
+
+                                if let Some(message) = &current_event.message {
+                                    let formatted_time =
+                                        Process::format_timestamp(
+                                            current_event.timestamp.as_deref(),
+                                        );
+                                    let formatted_log = format!(
+                                        "{} [{}] [{}{}]: {}\n",
+                                        formatted_time,
+                                        thread,
+                                        if !logger.is_empty() {
+                                            format!("{logger}/")
+                                        } else {
+                                            String::new()
+                                        },
+                                        level,
+                                        message.trim()
+                                    );
+
+                                    // Write the log message
+                                    if let Err(e) = Process::append_to_log_file(
+                                        &log_path,
+                                        &formatted_log,
+                                    ) {
+                                        tracing::error!(
+                                            "Failed to write to log file: {}",
+                                            e
+                                        );
+                                    }
+
+                                    // Write the throwable if present
+                                    if !current_content.is_empty() {
+                                        if let Err(e) =
+                                            Process::append_to_log_file(
+                                                &log_path,
+                                                &current_content,
+                                            )
+                                        {
+                                            tracing::error!(
+                                                "Failed to write throwable to log file: {}",
+                                                e
+                                            );
+                                        }
+                                    }
+                                }
+                            }
+                            b"log4j:Event" => {
+                                in_event = false;
+                                // If no throwable was present, write the log entry at the end of the event
+                                if current_event.message.is_some()
+                                    && !in_throwable
+                                {
+                                    let thread = current_event
+                                        .thread
+                                        .as_deref()
+                                        .unwrap_or("");
+                                    let level = current_event
+                                        .level
+                                        .as_deref()
+                                        .unwrap_or("");
+                                    let logger = current_event
+                                        .logger
+                                        .as_deref()
+                                        .unwrap_or("");
+                                    let message = current_event
+                                        .message
+                                        .as_deref()
+                                        .unwrap_or("")
+                                        .trim();
+
+                                    let formatted_time =
+                                        Process::format_timestamp(
+                                            current_event.timestamp.as_deref(),
+                                        );
+                                    let formatted_log = format!(
+                                        "{} [{}] [{}{}]: {}\n",
+                                        formatted_time,
+                                        thread,
+                                        if !logger.is_empty() {
+                                            format!("{logger}/")
+                                        } else {
+                                            String::new()
+                                        },
+                                        level,
+                                        message
+                                    );
+
+                                    // Write the log message
+                                    if let Err(e) = Process::append_to_log_file(
+                                        &log_path,
+                                        &formatted_log,
+                                    ) {
+                                        tracing::error!(
+                                            "Failed to write to log file: {}",
+                                            e
+                                        );
+                                    }
+
+                                    if let Some(timestamp) =
+                                        current_event.timestamp.as_deref()
+                                    {
+                                        if let Err(e) = Self::maybe_handle_server_join_logging(
+                                            profile_path,
+                                            timestamp,
+                                            message
+                                        ).await {
+                                            tracing::error!("Failed to handle server join logging: {e}");
+                                        }
+                                    }
+                                }
+                            }
+                            _ => {}
+                        }
+                    }
+                    Ok(Event::Text(mut e)) => {
+                        if in_message || in_throwable {
+                            if let Ok(text) = e.unescape() {
+                                current_content.push_str(&text);
+                            }
+                        } else if !in_event
+                            && !e.inplace_trim_end()
+                            && !e.inplace_trim_start()
+                        {
+                            if let Ok(text) = e.unescape() {
+                                if let Err(e) = Process::append_to_log_file(
+                                    &log_path,
+                                    &format!("{text}\n"),
+                                ) {
+                                    tracing::error!(
+                                        "Failed to write to log file: {}",
+                                        e
+                                    );
+                                }
+                            }
+                        }
+                    }
+                    Ok(Event::CData(e)) => {
+                        if in_message || in_throwable {
+                            if let Ok(text) = e
+                                .escape()
+                                .map_err(|x| x.into())
+                                .and_then(|x| x.unescape())
+                            {
+                                current_content.push_str(&text);
+                            }
+                        }
+                    }
+                    _ => (),
+                }
+
+                buf.clear();
+            }
+        } else {
+            let mut line = String::new();
+
+            while let Ok(bytes_read) = buf_reader.read_line(&mut line).await {
+                if bytes_read == 0 {
+                    break; // End of stream
+                }
+
+                if !line.is_empty() {
+                    if let Err(e) = Self::append_to_log_file(&log_path, &line) {
+                        tracing::warn!("Failed to write to log file: {}", e);
+                    }
+                }
+
+                line.clear();
+            }
+        }
+    }
+
+    fn format_timestamp(timestamp: Option<&str>) -> String {
+        if let Some(timestamp_str) = timestamp {
+            if let Ok(timestamp_val) = timestamp_str.parse::<i64>() {
+                let datetime_utc = if timestamp_val > i32::MAX as i64 {
+                    let secs = timestamp_val / 1000;
+                    let nsecs = ((timestamp_val % 1000) * 1_000_000) as u32;
+
+                    chrono::DateTime::<Utc>::from_timestamp(secs, nsecs)
+                        .unwrap_or_default()
+                } else {
+                    chrono::DateTime::<Utc>::from_timestamp(timestamp_val, 0)
+                        .unwrap_or_default()
+                };
+
+                let datetime_local = datetime_utc.with_timezone(&chrono::Local);
+                format!("[{}]", datetime_local.format("%H:%M:%S"))
+            } else {
+                "[??:??:??]".to_string()
+            }
+        } else {
+            "[??:??:??]".to_string()
+        }
+    }
+
+    fn append_to_log_file(
+        path: impl AsRef<Path>,
+        line: &str,
+    ) -> std::io::Result<()> {
+        let mut file =
+            OpenOptions::new().append(true).create(true).open(path)?;
+
+        file.write_all(line.as_bytes())?;
+        Ok(())
+    }
+
+    async fn maybe_handle_server_join_logging(
+        profile_path: &str,
+        timestamp: &str,
+        message: &str,
+    ) -> crate::Result<()> {
+        let Some(host_port_string) = message.strip_prefix("Connecting to ")
+        else {
+            return Ok(());
+        };
+        let Some((host, port_string)) = host_port_string.rsplit_once(", ")
+        else {
+            return Ok(());
+        };
+        let Some(port) = port_string.parse::<u16>().ok() else {
+            return Ok(());
+        };
+        let timestamp = timestamp
+            .parse::<i64>()
+            .map(|x| x / 1000)
+            .map_err(|x| {
+                crate::ErrorKind::OtherError(format!(
+                    "Failed to parse timestamp: {x}"
+                ))
+            })
+            .and_then(|x| {
+                Utc.timestamp_opt(x, 0).single().ok_or_else(|| {
+                    crate::ErrorKind::OtherError(
+                        "Failed to convert timestamp to DateTime".to_string(),
+                    )
+                })
+            })?;
+
+        let state = crate::State::get().await?;
+        crate::state::server_join_log::JoinLogEntry {
+            profile_path: profile_path.to_owned(),
+            host: host.to_string(),
+            port,
+            join_time: timestamp,
+        }
+        .upsert(&state.pool)
+        .await?;
+        {
+            let profile_path = profile_path.to_owned();
+            let host = host.to_owned();
+            tokio::spawn(async move {
+                let _ = emit_profile(
+                    &profile_path,
+                    ProfilePayloadType::ServerJoined {
+                        host,
+                        port,
+                        timestamp,
+                    },
+                )
+                .await;
+            });
+        }
+
+        Ok(())
+    }
+
     // Spawns a new child process and inserts it into the hashmap
     // Also, as the process ends, it spawns the follow-up process if it exists
     // By convention, ExitStatus is last command's exit status, and we exit on the first non-zero exit status
@@ -204,6 +656,21 @@ impl Process {
             }
         });
 
+        let logs_folder = state.directories.profile_logs_dir(&profile_path);
+        let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
+
+        if log_path.exists() {
+            if let Err(e) = Process::append_to_log_file(
+                &log_path,
+                &format!("\n# Process exited with status: {mc_exit_status}\n"),
+            ) {
+                tracing::warn!(
+                    "Failed to write exit status to log file: {}",
+                    e
+                );
+            }
+        }
+
         let _ = state.discord_rpc.clear_to_default(true).await;
 
         let _ = state.friends_socket.update_status(None).await;
diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs
index 97b92cf8..2aa09ece 100644
--- a/packages/app-lib/src/state/profiles.rs
+++ b/packages/app-lib/src/state/profiles.rs
@@ -1,28 +1,38 @@
 use super::settings::{Hooks, MemorySettings, WindowSize};
+use crate::profile::get_full_path;
+use crate::state::server_join_log::JoinLogEntry;
 use crate::state::{
-    cache_file_hash, CacheBehaviour, CachedEntry, CachedFileHash,
+    CacheBehaviour, CachedEntry, CachedFileHash, cache_file_hash,
 };
 use crate::util;
-use crate::util::fetch::{write_cached_icon, FetchSemaphore, IoSemaphore};
+use crate::util::fetch::{FetchSemaphore, IoSemaphore, write_cached_icon};
 use crate::util::io::{self};
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::{DateTime, TimeDelta, TimeZone, Utc};
 use dashmap::DashMap;
+use regex::Regex;
 use serde::{Deserialize, Serialize};
 use sqlx::SqlitePool;
+use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::convert::TryInto;
 use std::path::Path;
+use std::sync::LazyLock;
+use tokio::fs::DirEntry;
+use tokio::io::{AsyncBufReadExt, AsyncRead};
+use tokio::task::JoinSet;
 
 // Represent a Minecraft instance.
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Profile {
     pub path: String,
     pub install_stage: ProfileInstallStage,
+    pub launcher_feature_version: LauncherFeatureVersion,
 
     pub name: String,
     pub icon_path: Option<String>,
 
     pub game_version: String,
+    pub protocol_version: Option<i32>,
     pub loader: ModLoader,
     pub loader_version: Option<String>,
 
@@ -86,6 +96,38 @@ impl ProfileInstallStage {
     }
 }
 
+#[derive(
+    Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum LauncherFeatureVersion {
+    None,
+    MigratedServerLastPlayTime,
+}
+
+impl LauncherFeatureVersion {
+    pub const MOST_RECENT: Self = Self::MigratedServerLastPlayTime;
+
+    pub fn as_str(&self) -> &'static str {
+        match *self {
+            Self::None => "none",
+            Self::MigratedServerLastPlayTime => {
+                "migrated_server_last_play_time"
+            }
+        }
+    }
+
+    pub fn from_str(val: &str) -> Self {
+        match val {
+            "none" => Self::None,
+            "migrated_server_last_play_time" => {
+                Self::MigratedServerLastPlayTime
+            }
+            _ => Self::None,
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct LinkedData {
     pub project_id: String,
@@ -261,6 +303,8 @@ struct ProfileQueryResult {
     override_hook_pre_launch: Option<String>,
     override_hook_wrapper: Option<String>,
     override_hook_post_exit: Option<String>,
+    protocol_version: Option<i64>,
+    launcher_feature_version: String,
 }
 
 impl TryFrom<ProfileQueryResult> for Profile {
@@ -270,9 +314,13 @@ impl TryFrom<ProfileQueryResult> for Profile {
         Ok(Profile {
             path: x.path,
             install_stage: ProfileInstallStage::from_str(&x.install_stage),
+            launcher_feature_version: LauncherFeatureVersion::from_str(
+                &x.launcher_feature_version,
+            ),
             name: x.name,
             icon_path: x.icon_path,
             game_version: x.game_version,
+            protocol_version: x.protocol_version.map(|x| x as i32),
             loader: ModLoader::from_string(&x.mod_loader),
             loader_version: x.mod_loader_version,
             groups: serde_json::from_value(x.groups).unwrap_or_default(),
@@ -336,8 +384,8 @@ macro_rules! select_profiles_with_predicate {
             ProfileQueryResult,
             r#"
             SELECT
-                path, install_stage, name, icon_path,
-                game_version, mod_loader, mod_loader_version,
+                path, install_stage, launcher_feature_version, name, icon_path,
+                game_version, protocol_version, mod_loader, mod_loader_version,
                 json(groups) as "groups!: serde_json::Value",
                 linked_project_id, linked_version_id, locked,
                 created, modified, last_played,
@@ -399,6 +447,8 @@ impl Profile {
         exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     ) -> crate::Result<()> {
         let install_stage = self.install_stage.as_str();
+        let launcher_feature_version = self.launcher_feature_version.as_str();
+
         let mod_loader = self.loader.as_str();
 
         let groups = serde_json::to_string(&self.groups)?;
@@ -435,7 +485,8 @@ impl Profile {
                 submitted_time_played, recent_time_played,
                 override_java_path, override_extra_launch_args, override_custom_env_vars,
                 override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,
-                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit
+                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit,
+                protocol_version, launcher_feature_version
             )
             VALUES (
                 $1, $2, $3, $4,
@@ -446,7 +497,8 @@ impl Profile {
                 $15, $16,
                 $17, jsonb($18), jsonb($19),
                 $20, $21, $22, $23,
-                $24, $25, $26
+                $24, $25, $26,
+                $27, $28
             )
             ON CONFLICT (path) DO UPDATE SET
                 install_stage = $2,
@@ -480,7 +532,10 @@ impl Profile {
 
                 override_hook_pre_launch = $24,
                 override_hook_wrapper = $25,
-                override_hook_post_exit = $26
+                override_hook_post_exit = $26,
+
+                protocol_version = $27,
+                launcher_feature_version = $28
             ",
             self.path,
             install_stage,
@@ -508,6 +563,8 @@ impl Profile {
             self.hooks.pre_launch,
             self.hooks.wrapper,
             self.hooks.post_exit,
+            self.protocol_version,
+            launcher_feature_version
         )
             .execute(exec)
             .await?;
@@ -557,10 +614,10 @@ impl Profile {
         let mut all = Self::get_all(&state.pool).await?;
 
         let mut keys = vec![];
+        let mut migrations = JoinSet::new();
 
         for profile in &mut all {
-            let path =
-                crate::api::profile::get_full_path(&profile.path).await?;
+            let path = get_full_path(&profile.path).await?;
 
             for project_type in ProjectType::iterator() {
                 let folder = project_type.get_folder();
@@ -602,7 +659,42 @@ impl Profile {
                 profile.install_stage = ProfileInstallStage::NotInstalled;
                 profile.upsert(&state.pool).await?;
             }
+
+            if profile.launcher_feature_version
+                < LauncherFeatureVersion::MOST_RECENT
+            {
+                let state = state.clone();
+                let profile_path = profile.path.clone();
+                migrations.spawn(async move {
+                    let Ok(Some(mut profile)) = Self::get(&profile_path, &state.pool).await else {
+                        tracing::error!("Failed to find instance '{}' for migration", profile_path);
+                        return;
+                    };
+                    drop(profile_path);
+
+                    tracing::info!(
+                        "Migrating profile '{}' from launcher feature version {:?} to {:?}",
+                        profile.path, profile.launcher_feature_version, LauncherFeatureVersion::MOST_RECENT
+                    );
+                    loop {
+                        let result = profile.perform_launcher_feature_migration(&state).await;
+                        if result.is_err() || profile.launcher_feature_version == LauncherFeatureVersion::MOST_RECENT {
+                            if let Err(err) = result {
+                                tracing::error!("Failed to migrate instance '{}': {}", profile.path, err);
+                                return;
+                            }
+                            if let Err(err) = profile.upsert(&state.pool).await {
+                                tracing::error!("Failed to update instance '{}' migration state: {}", profile.path, err);
+                                return;
+                            }
+                            break;
+                        }
+                    }
+                    tracing::info!("Finished migration for profile '{}'", profile.path);
+                });
+            }
         }
+        migrations.join_all().await;
 
         let file_hashes = CachedEntry::get_file_hash_many(
             &keys.iter().map(|s| &**s).collect::<Vec<_>>(),
@@ -643,6 +735,144 @@ impl Profile {
         Ok(())
     }
 
+    async fn perform_launcher_feature_migration(
+        &mut self,
+        state: &crate::State,
+    ) -> crate::Result<()> {
+        match self.launcher_feature_version {
+            LauncherFeatureVersion::None => {
+                if self.last_played.is_none() {
+                    self.launcher_feature_version =
+                        LauncherFeatureVersion::MigratedServerLastPlayTime;
+                    return Ok(());
+                }
+                let mut join_log_entry = JoinLogEntry {
+                    profile_path: self.path.clone(),
+                    ..Default::default()
+                };
+                let logs_path = state.directories.profile_logs_dir(&self.path);
+                let Ok(mut directory) = io::read_dir(&logs_path).await else {
+                    self.launcher_feature_version =
+                        LauncherFeatureVersion::MigratedServerLastPlayTime;
+                    return Ok(());
+                };
+                let existing_joins_map =
+                    super::server_join_log::get_joins(&self.path, &state.pool)
+                        .await?;
+                let existing_joins = existing_joins_map
+                    .keys()
+                    .map(|x| (&x.0 as &str, x.1))
+                    .collect::<HashSet<_>>();
+                while let Some(log_file) = directory.next_entry().await? {
+                    if let Err(err) = Self::parse_log_file(
+                        &log_file,
+                        |host, port| existing_joins.contains(&(host, port)),
+                        state,
+                        &mut join_log_entry,
+                    )
+                    .await
+                    {
+                        tracing::error!(
+                            "Failed to parse log file '{}': {}",
+                            log_file.path().display(),
+                            err
+                        );
+                    }
+                }
+                self.launcher_feature_version =
+                    LauncherFeatureVersion::MigratedServerLastPlayTime;
+            }
+            LauncherFeatureVersion::MOST_RECENT => unreachable!(
+                "LauncherFeatureVersion::MOST_RECENT was not updated"
+            ),
+        }
+        Ok(())
+    }
+
+    // Parses a log file on a best-effort basis, using the log's creation time, rather than the
+    // actual times mentioned in the log file, which are missing date information.
+    async fn parse_log_file(
+        log_file: &DirEntry,
+        should_skip: impl Fn(&str, u16) -> bool,
+        state: &crate::State,
+        join_entry: &mut JoinLogEntry,
+    ) -> crate::Result<()> {
+        let file_name = log_file.file_name();
+        let Some(file_name) = file_name.to_str() else {
+            return Ok(());
+        };
+        let log_time = io::metadata(&log_file.path()).await?.created()?.into();
+        if file_name == "latest.log" {
+            let file = io::open_file(&log_file.path()).await?;
+            Self::parse_open_log_file(
+                file,
+                should_skip,
+                log_time,
+                state,
+                join_entry,
+            )
+            .await
+        } else if file_name.ends_with(".log.gz") {
+            let file = io::open_file(&log_file.path()).await?;
+            let file = tokio::io::BufReader::new(file);
+            let file =
+                async_compression::tokio::bufread::GzipDecoder::new(file);
+            Self::parse_open_log_file(
+                file,
+                should_skip,
+                log_time,
+                state,
+                join_entry,
+            )
+            .await
+        } else {
+            Ok(())
+        }
+    }
+
+    async fn parse_open_log_file(
+        reader: impl AsyncRead + Unpin,
+        should_skip: impl Fn(&str, u16) -> bool,
+        mut log_time: DateTime<Utc>,
+        state: &crate::State,
+        join_entry: &mut JoinLogEntry,
+    ) -> crate::Result<()> {
+        static LOG_LINE_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+            Regex::new(r"^\[[0-9]{2}(?::[0-9]{2}){2}] \[.+?/[A-Z]+?]: Connecting to (.+?), ([1-9][0-9]{0,4})$").unwrap()
+        });
+        let reader = tokio::io::BufReader::new(reader);
+        let mut lines = reader.lines();
+        while let Some(log_line) = lines.next_line().await? {
+            let Some(log_line) = LOG_LINE_REGEX.captures(&log_line) else {
+                continue;
+            };
+
+            let Some(host) = log_line.get(1) else {
+                continue;
+            };
+            let host = host.as_str();
+
+            let Some(port) = log_line.get(2) else {
+                continue;
+            };
+            let Ok(port) = port.as_str().parse::<u16>() else {
+                continue;
+            };
+
+            if should_skip(host, port) {
+                continue;
+            }
+
+            join_entry.host = host.to_string();
+            join_entry.port = port;
+            join_entry.join_time = log_time;
+            join_entry.upsert(&state.pool).await?;
+
+            log_time += TimeDelta::seconds(1);
+        }
+        Ok(())
+    }
+
     pub async fn get_projects(
         &self,
         cache_behaviour: Option<CacheBehaviour>,
diff --git a/packages/app-lib/src/state/server_join_log.rs b/packages/app-lib/src/state/server_join_log.rs
new file mode 100644
index 00000000..63580d49
--- /dev/null
+++ b/packages/app-lib/src/state/server_join_log.rs
@@ -0,0 +1,65 @@
+use std::collections::HashMap;
+
+use chrono::{DateTime, TimeZone, Utc};
+
+#[derive(Default)]
+pub struct JoinLogEntry {
+    pub profile_path: String,
+    pub host: String,
+    pub port: u16,
+    pub join_time: DateTime<Utc>,
+}
+
+impl JoinLogEntry {
+    pub async fn upsert(
+        &self,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+    ) -> crate::Result<()> {
+        let join_time = self.join_time.timestamp();
+
+        sqlx::query!(
+            "
+            INSERT INTO join_log (profile_path, host, port, join_time)
+            VALUES ($1, $2, $3, $4)
+            ON CONFLICT (profile_path, host, port) DO UPDATE SET
+                join_time = $4
+            ",
+            self.profile_path,
+            self.host,
+            self.port,
+            join_time
+        )
+        .execute(exec)
+        .await?;
+
+        Ok(())
+    }
+}
+
+pub async fn get_joins(
+    instance: &str,
+    exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
+) -> crate::Result<HashMap<(String, u16), DateTime<Utc>>> {
+    let joins = sqlx::query!(
+        "
+        SELECT profile_path, host, port, join_time
+        FROM join_log
+        WHERE profile_path = $1
+        ",
+        instance
+    )
+    .fetch_all(exec)
+    .await?;
+
+    Ok(joins
+        .into_iter()
+        .map(|x| {
+            (
+                (x.host, x.port as u16),
+                Utc.timestamp_opt(x.join_time, 0)
+                    .single()
+                    .unwrap_or_else(Utc::now),
+            )
+        })
+        .collect())
+}
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 5c3b0074..89d7bc04 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -44,6 +44,8 @@ pub struct Settings {
 pub enum FeatureFlag {
     PagePath,
     ProjectBackground,
+    WorldsTab,
+    WorldsInHome,
 }
 
 impl Settings {
diff --git a/packages/app-lib/src/state/tunnel.rs b/packages/app-lib/src/state/tunnel.rs
index a6ff41ea..86c5d59c 100644
--- a/packages/app-lib/src/state/tunnel.rs
+++ b/packages/app-lib/src/state/tunnel.rs
@@ -1,5 +1,5 @@
-use crate::state::friends::{TunnelSockets, WriteSocket};
 use crate::state::FriendsSocket;
+use crate::state::friends::{TunnelSockets, WriteSocket};
 use ariadne::networking::message::ClientToServerMessage;
 use std::net::SocketAddr;
 use std::sync::Arc;
diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs
index 83dd0275..2323ec7d 100644
--- a/packages/app-lib/src/util/fetch.rs
+++ b/packages/app-lib/src/util/fetch.rs
@@ -1,14 +1,14 @@
-//! Functions for fetching infromation from the Internet
+//! Functions for fetching information from the Internet
 use super::io::{self, IOError};
 use crate::config::{MODRINTH_API_URL, MODRINTH_API_URL_V3};
-use crate::event::emit::emit_loading;
 use crate::event::LoadingBarId;
+use crate::event::emit::emit_loading;
 use bytes::Bytes;
-use lazy_static::lazy_static;
 use reqwest::Method;
 use serde::de::DeserializeOwned;
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
+use std::sync::LazyLock;
 use std::time::{self};
 use tokio::sync::Semaphore;
 use tokio::{fs::File, io::AsyncWriteExt};
@@ -18,22 +18,20 @@ pub struct IoSemaphore(pub Semaphore);
 #[derive(Debug)]
 pub struct FetchSemaphore(pub Semaphore);
 
-lazy_static! {
-    pub static ref REQWEST_CLIENT: reqwest::Client = {
-        let mut headers = reqwest::header::HeaderMap::new();
-        let header = reqwest::header::HeaderValue::from_str(&format!(
-            "modrinth/theseus/{} (support@modrinth.com)",
-            env!("CARGO_PKG_VERSION")
-        ))
-        .unwrap();
-        headers.insert(reqwest::header::USER_AGENT, header);
-        reqwest::Client::builder()
-            .tcp_keepalive(Some(time::Duration::from_secs(10)))
-            .default_headers(headers)
-            .build()
-            .expect("Reqwest Client Building Failed")
-    };
-}
+pub static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
+    let mut headers = reqwest::header::HeaderMap::new();
+    let header = reqwest::header::HeaderValue::from_str(&format!(
+        "modrinth/theseus/{} (support@modrinth.com)",
+        env!("CARGO_PKG_VERSION")
+    ))
+    .unwrap();
+    headers.insert(reqwest::header::USER_AGENT, header);
+    reqwest::Client::builder()
+        .tcp_keepalive(Some(time::Duration::from_secs(10)))
+        .default_headers(headers)
+        .build()
+        .expect("Reqwest Client Building Failed")
+});
 const FETCH_ATTEMPTS: usize = 3;
 
 #[tracing::instrument(skip(semaphore))]
diff --git a/packages/app-lib/src/util/io.rs b/packages/app-lib/src/util/io.rs
index 684cc2b9..9d82c24d 100644
--- a/packages/app-lib/src/util/io.rs
+++ b/packages/app-lib/src/util/io.rs
@@ -255,3 +255,42 @@ pub async fn remove_file(
             path: path.to_string_lossy().to_string(),
         })
 }
+
+// open file
+pub async fn open_file(
+    path: impl AsRef<std::path::Path>,
+) -> Result<tokio::fs::File, IOError> {
+    let path = path.as_ref();
+    tokio::fs::File::open(path)
+        .await
+        .map_err(|e| IOError::IOPathError {
+            source: e,
+            path: path.to_string_lossy().to_string(),
+        })
+}
+
+// remove dir
+pub async fn remove_dir(
+    path: impl AsRef<std::path::Path>,
+) -> Result<(), IOError> {
+    let path = path.as_ref();
+    tokio::fs::remove_dir(path)
+        .await
+        .map_err(|e| IOError::IOPathError {
+            source: e,
+            path: path.to_string_lossy().to_string(),
+        })
+}
+
+// metadata
+pub async fn metadata(
+    path: impl AsRef<std::path::Path>,
+) -> Result<std::fs::Metadata, IOError> {
+    let path = path.as_ref();
+    tokio::fs::metadata(path)
+        .await
+        .map_err(|e| IOError::IOPathError {
+            source: e,
+            path: path.to_string_lossy().to_string(),
+        })
+}
diff --git a/packages/app-lib/src/util/jre.rs b/packages/app-lib/src/util/jre.rs
index 11e9c316..e32c9364 100644
--- a/packages/app-lib/src/util/jre.rs
+++ b/packages/app-lib/src/util/jre.rs
@@ -10,8 +10,8 @@ use tokio::task::JoinError;
 use crate::State;
 #[cfg(target_os = "windows")]
 use winreg::{
-    enums::{HKEY_LOCAL_MACHINE, KEY_READ, KEY_WOW64_32KEY, KEY_WOW64_64KEY},
     RegKey,
+    enums::{HKEY_LOCAL_MACHINE, KEY_READ, KEY_WOW64_32KEY, KEY_WOW64_64KEY},
 };
 
 // Entrypoint function (Windows)
@@ -276,11 +276,10 @@ pub async fn check_java_at_filepath(path: &Path) -> Option<JavaVersion> {
     };
 
     let bytes = include_bytes!("../../library/JavaInfo.class");
-    let tempdir: PathBuf = tempfile::tempdir().ok()?.into_path();
-    if !tempdir.exists() {
+    let Ok(tempdir) = tempfile::tempdir() else {
         return None;
-    }
-    let file_path = tempdir.join("JavaInfo.class");
+    };
+    let file_path = tempdir.path().join("JavaInfo.class");
     io::write(&file_path, bytes).await.ok()?;
 
     let output = Command::new(&java)
diff --git a/packages/app-lib/src/util/mod.rs b/packages/app-lib/src/util/mod.rs
index 407456b4..086e7b67 100644
--- a/packages/app-lib/src/util/mod.rs
+++ b/packages/app-lib/src/util/mod.rs
@@ -3,7 +3,8 @@ pub mod fetch;
 pub mod io;
 pub mod jre;
 pub mod platform;
-pub mod utils;
+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 {
diff --git a/packages/app-lib/src/util/platform.rs b/packages/app-lib/src/util/platform.rs
index e1c4c524..3eb57e2a 100644
--- a/packages/app-lib/src/util/platform.rs
+++ b/packages/app-lib/src/util/platform.rs
@@ -1,6 +1,5 @@
 //! Platform-related code
 use daedalus::minecraft::{Os, OsRule};
-use regex::Regex;
 
 // OS detection
 pub trait OsExt {
@@ -92,12 +91,16 @@ pub fn os_rule(
         }
     }
 
-    if let Some(version) = &rule.version {
-        if let Ok(regex) = Regex::new(version.as_str()) {
-            rule_match &=
-                regex.is_match(&sys_info::os_release().unwrap_or_default());
-        }
-    }
+    // `rule.version` is ignored because it's not usually seen on real recent
+    // Minecraft version manifests, its alleged regex syntax is undefined and is
+    // likely to not match `Regex`'s, and the way to get the value to match it
+    // against is allegedly calling `System.getProperty("os.version")`, which
+    // on Windows the OpenJDK implements by fetching the kernel32.dll version,
+    // an approach that no public Rust library implements. Moreover, launchers
+    // such as PrismLauncher also ignore this field. Code references:
+    // - https://github.com/openjdk/jdk/blob/948ade8e7003a41683600428c8e3155c7ed798db/src/java.base/windows/native/libjava/java_props_md.c#L556
+    // - https://github.com/PrismLauncher/PrismLauncher/blob/1c20faccf88999474af70db098a4c10e7a03af33/launcher/minecraft/Rule.h#L77
+    // - https://github.com/FillZpp/sys-info-rs/blob/60ecf1470a5b7c90242f429934a3bacb6023ec4d/c/windows.c#L23-L38
 
     rule_match
 }
diff --git a/packages/app-lib/src/util/server_ping.rs b/packages/app-lib/src/util/server_ping.rs
new file mode 100644
index 00000000..852bed50
--- /dev/null
+++ b/packages/app-lib/src/util/server_ping.rs
@@ -0,0 +1,223 @@
+use crate::ErrorKind;
+use crate::error::Result;
+use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
+use std::time::Duration;
+use tokio::net::ToSocketAddrs;
+use tokio::select;
+use url::Url;
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct ServerStatus {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<Box<RawValue>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub players: Option<ServerPlayers>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub version: Option<ServerVersion>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub favicon: Option<Url>,
+    #[serde(default)]
+    pub enforces_secure_chat: bool,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ping: Option<i64>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct ServerPlayers {
+    pub max: i32,
+    pub online: i32,
+    #[serde(default)]
+    pub sample: Vec<ServerGameProfile>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct ServerGameProfile {
+    pub id: String,
+    pub name: String,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct ServerVersion {
+    pub name: String,
+    pub protocol: i32,
+}
+
+pub async fn get_server_status(
+    address: &impl ToSocketAddrs,
+    original_address: (&str, u16),
+    protocol_version: Option<i32>,
+) -> Result<ServerStatus> {
+    select! {
+        res = modern::status(address, original_address, protocol_version) => res,
+        _ = tokio::time::sleep(Duration::from_secs(30)) => Err(ErrorKind::OtherError(
+            format!("Ping of {}:{} timed out", original_address.0, original_address.1)
+        ).into())
+    }
+}
+
+mod modern {
+    use super::ServerStatus;
+    use crate::ErrorKind;
+    use chrono::Utc;
+    use tokio::io::{AsyncReadExt, AsyncWriteExt};
+    use tokio::net::{TcpStream, ToSocketAddrs};
+
+    pub async fn status(
+        address: &impl ToSocketAddrs,
+        original_address: (&str, u16),
+        protocol_version: Option<i32>,
+    ) -> crate::Result<ServerStatus> {
+        let mut stream = TcpStream::connect(address).await?;
+        handshake(&mut stream, original_address, protocol_version).await?;
+        let mut result = status_body(&mut stream).await?;
+        result.ping = ping(&mut stream).await.ok();
+        Ok(result)
+    }
+
+    async fn handshake(
+        stream: &mut TcpStream,
+        original_address: (&str, u16),
+        protocol_version: Option<i32>,
+    ) -> crate::Result<()> {
+        let (host, port) = original_address;
+        let protocol_version = protocol_version.unwrap_or(-1);
+
+        const PACKET_ID: i32 = 0;
+        const NEXT_STATE: i32 = 1;
+
+        let packet_size = varint::get_byte_size(PACKET_ID)
+            + varint::get_byte_size(protocol_version)
+            + varint::get_byte_size(host.len() as i32)
+            + host.len()
+            + size_of::<u16>()
+            + varint::get_byte_size(NEXT_STATE);
+
+        let mut packet_buffer = Vec::with_capacity(
+            varint::get_byte_size(packet_size as i32) + packet_size,
+        );
+
+        varint::write(&mut packet_buffer, packet_size as i32);
+        varint::write(&mut packet_buffer, PACKET_ID);
+        varint::write(&mut packet_buffer, protocol_version);
+        varint::write(&mut packet_buffer, host.len() as i32);
+        packet_buffer.extend_from_slice(host.as_bytes());
+        packet_buffer.extend_from_slice(&port.to_be_bytes());
+        varint::write(&mut packet_buffer, NEXT_STATE);
+
+        stream.write_all(&packet_buffer).await?;
+        stream.flush().await?;
+
+        Ok(())
+    }
+
+    async fn status_body(
+        stream: &mut TcpStream,
+    ) -> crate::Result<ServerStatus> {
+        stream.write_all(&[0x01, 0x00]).await?;
+        stream.flush().await?;
+
+        let packet_length = varint::read(stream).await?;
+        if packet_length < 0 {
+            return Err(ErrorKind::InputError(
+                "Invalid status response packet length".to_string(),
+            )
+            .into());
+        }
+
+        let mut packet_stream = stream.take(packet_length as u64);
+        let packet_id = varint::read(&mut packet_stream).await?;
+        if packet_id != 0x00 {
+            return Err(ErrorKind::InputError(
+                "Unexpected status response".to_string(),
+            )
+            .into());
+        }
+        let response_length = varint::read(&mut packet_stream).await?;
+        let mut json_response = vec![0_u8; response_length as usize];
+        packet_stream.read_exact(&mut json_response).await?;
+
+        if packet_stream.limit() > 0 {
+            tokio::io::copy(&mut packet_stream, &mut tokio::io::sink()).await?;
+        }
+
+        Ok(serde_json::from_slice(&json_response)?)
+    }
+
+    async fn ping(stream: &mut TcpStream) -> crate::Result<i64> {
+        let start_time = Utc::now();
+        let ping_magic = start_time.timestamp_millis();
+
+        stream.write_all(&[0x09, 0x01]).await?;
+        stream.write_i64(ping_magic).await?;
+        stream.flush().await?;
+
+        let mut response_prefix = [0_u8; 2];
+        stream.read_exact(&mut response_prefix).await?;
+        let response_magic = stream.read_i64().await?;
+        if response_prefix != [0x09, 0x01] || response_magic != ping_magic {
+            return Err(ErrorKind::InputError(
+                "Unexpected ping response".to_string(),
+            )
+            .into());
+        }
+
+        let response_time = Utc::now();
+        Ok((response_time - start_time).num_milliseconds())
+    }
+
+    mod varint {
+        use std::io;
+        use tokio::io::{AsyncRead, AsyncReadExt};
+
+        const MAX_VARINT_SIZE: usize = 5;
+        const DATA_BITS_MASK: u32 = 0x7f;
+        const CONT_BIT_MASK_U8: u8 = 0x80;
+        const CONT_BIT_MASK_U32: u32 = CONT_BIT_MASK_U8 as u32;
+        const DATA_BITS_PER_BYTE: usize = 7;
+
+        pub fn get_byte_size(x: i32) -> usize {
+            let x = x as u32;
+            for size in 1..MAX_VARINT_SIZE {
+                if (x & (u32::MAX << (size * DATA_BITS_PER_BYTE))) == 0 {
+                    return size;
+                }
+            }
+            MAX_VARINT_SIZE
+        }
+
+        pub fn write(out: &mut Vec<u8>, value: i32) {
+            let mut value = value as u32;
+            while value >= CONT_BIT_MASK_U32 {
+                out.push(((value & DATA_BITS_MASK) | CONT_BIT_MASK_U32) as u8);
+                value >>= DATA_BITS_PER_BYTE;
+            }
+            out.push(value as u8);
+        }
+
+        pub async fn read<R: AsyncRead + Unpin>(
+            reader: &mut R,
+        ) -> io::Result<i32> {
+            let mut result = 0;
+            let mut shift = 0;
+
+            loop {
+                let b = reader.read_u8().await?;
+                result |=
+                    (b as u32 & DATA_BITS_MASK) << (shift * DATA_BITS_PER_BYTE);
+                shift += 1;
+                if shift > MAX_VARINT_SIZE {
+                    return Err(io::Error::new(
+                        io::ErrorKind::InvalidData,
+                        "VarInt too big",
+                    ));
+                }
+                if b & CONT_BIT_MASK_U8 == 0 {
+                    return Ok(result as i32);
+                }
+            }
+        }
+    }
+}
diff --git a/packages/app-lib/src/util/utils.rs b/packages/app-lib/src/util/utils.rs
index 9ec071e0..0f8fd7af 100644
--- a/packages/app-lib/src/util/utils.rs
+++ b/packages/app-lib/src/util/utils.rs
@@ -1,6 +1,9 @@
 use serde::{Deserialize, Serialize};
 use tokio::io;
 
+/*
+AstralRinth Utils
+*/
 const PACKAGE_JSON_CONTENT: &str =
     // include_str!("../../../../apps/app-frontend/package.json");
     include_str!("../../../../apps/app/tauri.conf.json");
diff --git a/packages/ariadne/Cargo.toml b/packages/ariadne/Cargo.toml
index 7410fd31..ed5947d1 100644
--- a/packages/ariadne/Cargo.toml
+++ b/packages/ariadne/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "ariadne"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-thiserror = "1.0"
-uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] }
-serde_bytes = "0.11"
-rand = "0.8.5"
-either = "1.13"
-chrono = { version = "0.4.26", features = ["serde"] }
-serde_cbor = "0.11"
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+thiserror.workspace = true
+uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
+serde_bytes.workspace = true
+rand.workspace = true
+either.workspace = true
+chrono = { workspace = true, features = ["serde"] }
+serde_cbor.workspace = true
diff --git a/packages/ariadne/src/ids.rs b/packages/ariadne/src/ids.rs
index c7baaa7e..9f51b145 100644
--- a/packages/ariadne/src/ids.rs
+++ b/packages/ariadne/src/ids.rs
@@ -1,4 +1,3 @@
-pub use super::users::UserId;
 use thiserror::Error;
 
 /// Generates a random 64 bit integer that is exactly `n` characters
@@ -33,7 +32,7 @@ pub fn random_base62_rng_range<R: rand::RngCore>(
 ) -> u64 {
     use rand::Rng;
     assert!(n_min > 0 && n_max <= 11 && n_min <= n_max);
-    // gen_range is [low, high): max value is `MULTIPLES[n] - 1`,
+    // random_range is [low, high): max value is `MULTIPLES[n] - 1`,
     // which is n characters long when encoded
     rng.gen_range(MULTIPLES[n_min - 1]..MULTIPLES[n_max])
 }
@@ -72,24 +71,7 @@ pub enum DecodingError {
 }
 
 #[macro_export]
-macro_rules! from_base62id {
-    ($($struct:ty, $con:expr;)+) => {
-        $(
-            impl From<Base62Id> for $struct {
-                fn from(id: Base62Id) -> $struct {
-                    $con(id.0)
-                }
-            }
-            impl From<$struct> for Base62Id {
-                fn from(id: $struct) -> Base62Id {
-                    Base62Id(id.0)
-                }
-            }
-        )+
-    };
-}
-
-#[macro_export]
+#[doc(hidden)]
 macro_rules! impl_base62_display {
     ($struct:ty) => {
         impl std::fmt::Display for $struct {
@@ -102,15 +84,42 @@ macro_rules! impl_base62_display {
 impl_base62_display!(Base62Id);
 
 #[macro_export]
-macro_rules! base62_id_impl {
-    ($struct:ty, $cons:expr) => {
-        $crate::ids::from_base62id!($struct, $cons;);
-        $crate::ids::impl_base62_display!($struct);
-    }
-}
-base62_id_impl!(UserId, UserId);
+macro_rules! base62_id {
+    ($struct:ident) => {
+        #[derive(
+            Copy,
+            Clone,
+            PartialEq,
+            Eq,
+            serde::Serialize,
+            serde::Deserialize,
+            Debug,
+            Hash,
+        )]
+        #[serde(from = "ariadne::ids::Base62Id")]
+        #[serde(into = "ariadne::ids::Base62Id")]
+        pub struct $struct(pub u64);
 
-pub use {base62_id_impl, from_base62id, impl_base62_display};
+        $crate::ids::impl_base62_display!($struct);
+
+        impl From<$crate::ids::Base62Id> for $struct {
+            fn from(id: $crate::ids::Base62Id) -> Self {
+                Self(id.0)
+            }
+        }
+
+        impl From<$struct> for $crate::ids::Base62Id {
+            fn from(id: $struct) -> Self {
+                Self(id.0)
+            }
+        }
+    };
+}
+
+use crate as ariadne; // Hack because serde(from) and serde(into) don't work with $crate
+base62_id!(UserId);
+
+pub use {base62_id, impl_base62_display};
 
 pub mod base62_impl {
     use serde::de::{self, Deserializer, Visitor};
diff --git a/packages/ariadne/src/lib.rs b/packages/ariadne/src/lib.rs
index 4a4251a3..a1ee7654 100644
--- a/packages/ariadne/src/lib.rs
+++ b/packages/ariadne/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod ids;
 pub mod networking;
 pub mod users;
+pub mod versions;
diff --git a/packages/ariadne/src/users.rs b/packages/ariadne/src/users.rs
index 2fe08728..848ee0b4 100644
--- a/packages/ariadne/src/users.rs
+++ b/packages/ariadne/src/users.rs
@@ -1,12 +1,7 @@
-use super::ids::Base62Id;
+use super::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, Hash)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct UserId(pub u64);
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct UserStatus {
     pub user_id: UserId,
diff --git a/packages/ariadne/src/versions.rs b/packages/ariadne/src/versions.rs
new file mode 100644
index 00000000..8cc29514
--- /dev/null
+++ b/packages/ariadne/src/versions.rs
@@ -0,0 +1,45 @@
+use std::{collections::HashMap, sync::LazyLock};
+
+static SPECIAL_PARENTS: LazyLock<HashMap<&'static str, &'static str>> =
+    LazyLock::new(|| {
+        let mut m = HashMap::new();
+        m.insert("15w14a", "1.8.3");
+        m.insert("1.RV-Pre1", "1.9.2");
+        m.insert("3D Shareware v1.34", "19w13b");
+        m.insert("20w14infinite", "20w13b");
+        m.insert("22w13oneblockatatime", "1.18.2");
+        m.insert("23w13a_or_b", "23w13a");
+        m.insert("24w14potato", "24w12a");
+        m
+    });
+
+pub fn is_feature_supported_in(
+    version: &str,
+    first_release: &str,
+    first_snapshot: &str,
+) -> bool {
+    let version = SPECIAL_PARENTS.get(version).copied().unwrap_or(version);
+    if version.contains('w') && version.len() == 6 {
+        return version >= first_snapshot;
+    }
+    if version == first_release {
+        return true;
+    }
+    let parts_version = version.split('.');
+    let parts_first_release = first_release.split('.');
+    for (part_version, part_first_release) in
+        parts_version.zip(parts_first_release)
+    {
+        if part_version == part_first_release {
+            continue;
+        }
+        if let Ok(part_version) = part_version.parse::<u32>() {
+            if let Ok(part_first_release) = part_first_release.parse::<u32>() {
+                if part_version > part_first_release {
+                    return true;
+                }
+            }
+        }
+    }
+    false
+}
diff --git a/packages/assets/branding/rinthbot/angry.webp b/packages/assets/branding/rinthbot/angry.webp
new file mode 100644
index 00000000..41494475
Binary files /dev/null and b/packages/assets/branding/rinthbot/angry.webp differ
diff --git a/packages/assets/branding/rinthbot/annoyed.webp b/packages/assets/branding/rinthbot/annoyed.webp
new file mode 100644
index 00000000..b794746a
Binary files /dev/null and b/packages/assets/branding/rinthbot/annoyed.webp differ
diff --git a/packages/assets/branding/rinthbot/confused.webp b/packages/assets/branding/rinthbot/confused.webp
new file mode 100644
index 00000000..e6de4695
Binary files /dev/null and b/packages/assets/branding/rinthbot/confused.webp differ
diff --git a/packages/assets/branding/rinthbot/excited.webp b/packages/assets/branding/rinthbot/excited.webp
new file mode 100644
index 00000000..4b45dc0b
Binary files /dev/null and b/packages/assets/branding/rinthbot/excited.webp differ
diff --git a/packages/assets/branding/rinthbot/laughing.webp b/packages/assets/branding/rinthbot/laughing.webp
new file mode 100644
index 00000000..403232a2
Binary files /dev/null and b/packages/assets/branding/rinthbot/laughing.webp differ
diff --git a/packages/assets/branding/rinthbot/sad.webp b/packages/assets/branding/rinthbot/sad.webp
new file mode 100644
index 00000000..1b6ae264
Binary files /dev/null and b/packages/assets/branding/rinthbot/sad.webp differ
diff --git a/packages/assets/branding/rinthbot/sleeping.webp b/packages/assets/branding/rinthbot/sleeping.webp
new file mode 100644
index 00000000..6964530a
Binary files /dev/null and b/packages/assets/branding/rinthbot/sleeping.webp differ
diff --git a/packages/assets/branding/rinthbot/sobbing.webp b/packages/assets/branding/rinthbot/sobbing.webp
new file mode 100644
index 00000000..b8371939
Binary files /dev/null and b/packages/assets/branding/rinthbot/sobbing.webp differ
diff --git a/packages/assets/branding/rinthbot/thinking.webp b/packages/assets/branding/rinthbot/thinking.webp
new file mode 100644
index 00000000..be35958b
Binary files /dev/null and b/packages/assets/branding/rinthbot/thinking.webp differ
diff --git a/packages/assets/branding/rinthbot/waving.webp b/packages/assets/branding/rinthbot/waving.webp
new file mode 100644
index 00000000..355bc8f9
Binary files /dev/null and b/packages/assets/branding/rinthbot/waving.webp differ
diff --git a/packages/assets/external/curseforge.svg b/packages/assets/external/curseforge.svg
new file mode 100644
index 00000000..a9ba42ff
--- /dev/null
+++ b/packages/assets/external/curseforge.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>CurseForge</title><path fill="currentColor" d="M18.326 9.2145S23.2261 8.4418 24 6.1882h-7.5066V4.4H0l2.0318 2.3576V9.173s5.1267-.2665 7.1098 1.2372c2.7146 2.516-3.053 5.917-3.053 5.917L5.0995 19.6c1.5465-1.4726 4.494-3.3775 9.8983-3.2857-2.0565.65-4.1245 1.6651-5.7344 3.2857h10.9248l-1.0288-3.2726s-7.918-4.6688-.8336-7.1127z"/></svg>
diff --git a/packages/assets/external/pyro.svg b/packages/assets/external/pyro.svg
deleted file mode 100644
index 16eebd78..00000000
--- a/packages/assets/external/pyro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26" fill="none" width="24" height="24"><path fill="currentColor" d="M9.1 23v-1.1c.3-1 1.1-1.7 2.2-1.9h2.5c1.1.2 2 1 2.2 1.9v2c0 .8 0 1.2-.2 1.5 0 .2-.3.3-.5.4-.3.2-.7.2-1.6.2h-2.3c-.8 0-1.3 0-1.6-.2-.2 0-.4-.2-.5-.4-.2-.3-.2-.7-.2-1.4v-1Z"></path><path fill="currentColor" d="M4 26h2.8v-.5c-1.5-10.4 9-7.2 9.8-13.9C17 7 14 7 15.2.6V0l-.7.2C9.5 3 6 8.2 7.3 11.5c.2.4.3.7.2.8-.2 0-.4 0-.8-.3-.7-.4-1.5-1-2.1-2l-.4-.4-.4.4c-6.2 6.7-3.7 13.5-.1 16H4Z"></path><path fill="currentColor" d="M19.3 10.2c.3 3-2 6.2-4.5 7.6-.4.2-.6.3-.6.5l.8.3c3.4 1 4.4 4.3 3.3 7v.3l.5.1H21c8-4.6 5.2-12.4-1-16.2l-.7-.3c-.2.1-.2.3-.1.7Z"></path></svg>
\ No newline at end of file
diff --git a/packages/assets/icons.d.ts b/packages/assets/icons.d.ts
index e43e0e7f..1715850f 100644
--- a/packages/assets/icons.d.ts
+++ b/packages/assets/icons.d.ts
@@ -4,3 +4,8 @@ declare module '*.svg?component' {
   const src: FunctionalComponent<SVGAttributes>
   export default src
 }
+
+declare module '*.webp' {
+  const src: string
+  export default src
+}
diff --git a/packages/assets/icons/blocks.svg b/packages/assets/icons/blocks.svg
new file mode 100644
index 00000000..4b78f505
--- /dev/null
+++ b/packages/assets/icons/blocks.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-blocks"><rect width="7" height="7" x="14" y="3" rx="1"/><path d="M10 21V8a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1H3"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/file-archive.svg b/packages/assets/icons/file-archive.svg
new file mode 100644
index 00000000..b653d1cc
--- /dev/null
+++ b/packages/assets/icons/file-archive.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-file-archive-icon lucide-file-archive"><path d="M10 12v-1"/><path d="M10 18v-2"/><path d="M10 7V6"/><path d="M14 2v4a2 2 0 0 0 2 2h4"/><path d="M15.5 22H18a2 2 0 0 0 2-2V7l-5-5H6a2 2 0 0 0-2 2v16a2 2 0 0 0 .274 1.01"/><circle cx="10" cy="20" r="2"/></svg>
diff --git a/packages/assets/icons/no-signal.svg b/packages/assets/icons/no-signal.svg
new file mode 100644
index 00000000..90318e97
--- /dev/null
+++ b/packages/assets/icons/no-signal.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+  <path d="M2 20h.01"/>
+  <path d="M7,20v-4" />
+  <path d="M12,20v-8" />
+  <path d="M17,20v-12" />
+  <path d="M22,4v16" />
+  <g stroke="var(--color-red)">
+    <line x1="2" y1="4" x2="7.1" y2="9.1" />
+    <line x1="2" y1="9.1" x2="7.1" y2="4" />
+  </g>
+</svg>
diff --git a/packages/assets/icons/pickaxe.svg b/packages/assets/icons/pickaxe.svg
new file mode 100644
index 00000000..40e92c49
--- /dev/null
+++ b/packages/assets/icons/pickaxe.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-pickaxe"><path d="M14.531 12.469 6.619 20.38a1 1 0 1 1-3-3l7.912-7.912"/><path d="M15.686 4.314A12.5 12.5 0 0 0 5.461 2.958 1 1 0 0 0 5.58 4.71a22 22 0 0 1 6.318 3.393"/><path d="M17.7 3.7a1 1 0 0 0-1.4 0l-4.6 4.6a1 1 0 0 0 0 1.4l2.6 2.6a1 1 0 0 0 1.4 0l4.6-4.6a1 1 0 0 0 0-1.4z"/><path d="M19.686 8.314a12.501 12.501 0 0 1 1.356 10.225 1 1 0 0 1-1.751-.119 22 22 0 0 0-3.393-6.319"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/signal.svg b/packages/assets/icons/signal.svg
new file mode 100644
index 00000000..dcdd3746
--- /dev/null
+++ b/packages/assets/icons/signal.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-signal"><path stroke="var(--_signal-1, var(--_signal-2, var(--_signal-3, var(--_signal-4, var(--_signal-5, currentColor)))))" d="M2 20h.01"/><path stroke="var(--_signal-2, var(--_signal-3, var(--_signal-4, var(--_signal-5, currentColor))))" d="M7 20v-4"/><path stroke="var(--_signal-3, var(--_signal-4, var(--_signal-5, currentColor)))" d="M12 20v-8"/><path stroke="var(--_signal-4, var(--_signal-5, currentColor))" d="M17 20V8"/><path stroke="var(--_signal-5, currentColor)" d="M22 4v16"/></svg>
diff --git a/packages/assets/icons/skull.svg b/packages/assets/icons/skull.svg
new file mode 100644
index 00000000..f56453eb
--- /dev/null
+++ b/packages/assets/icons/skull.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-skull"><path d="m12.5 17-.5-1-.5 1h1z"/><path d="M15 22a1 1 0 0 0 1-1v-1a2 2 0 0 0 1.56-3.25 8 8 0 1 0-11.12 0A2 2 0 0 0 8 20v1a1 1 0 0 0 1 1z"/><circle cx="15" cy="12" r="1"/><circle cx="9" cy="12" r="1"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/world.svg b/packages/assets/icons/world.svg
new file mode 100644
index 00000000..cb5c6846
--- /dev/null
+++ b/packages/assets/icons/world.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-earth-icon lucide-earth"><path d="M21.54 15H17a2 2 0 0 0-2 2v4.54"/><path d="M7 3.34V5a3 3 0 0 0 3 3a2 2 0 0 1 2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2c0-1.1.9-2 2-2h3.17"/><path d="M11 21.95V18a2 2 0 0 0-2-2a2 2 0 0 1-2-2v-1a2 2 0 0 0-2-2H2.05"/><circle cx="12" cy="12" r="10"/></svg>
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index f516a634..87c72413 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -4,6 +4,16 @@
 import _ModrinthIcon from './branding/logo.svg?component'
 import _FourOhFourNotFound from './branding/404.svg?component'
 import _ModrinthPlusIcon from './branding/modrinth-plus.svg?component'
+import _AngryRinthbot from './branding/rinthbot/angry.webp'
+import _AnnoyedRinthbot from './branding/rinthbot/annoyed.webp'
+import _ConfusedRinthbot from './branding/rinthbot/confused.webp'
+import _ExcitedRinthbot from './branding/rinthbot/excited.webp'
+import _LaughingRinthbot from './branding/rinthbot/laughing.webp'
+import _SadRinthbot from './branding/rinthbot/sad.webp'
+import _SleepingRinthbot from './branding/rinthbot/sleeping.webp'
+import _SobbingRinthbot from './branding/rinthbot/sobbing.webp'
+import _ThinkingRinthbot from './branding/rinthbot/thinking.webp'
+import _WavingRinthbot from './branding/rinthbot/waving.webp'
 
 // External Icons
 import _SSODiscordIcon from './external/sso/discord.svg?component'
@@ -15,6 +25,7 @@ import _SSOSteamIcon from './external/sso/steam.svg?component'
 import _AppleIcon from './external/apple.svg?component'
 import _BlueskyIcon from './external/bluesky.svg?component'
 import _BuyMeACoffeeIcon from './external/bmac.svg?component'
+import _CurseForgeIcon from './external/curseforge.svg?component'
 import _DiscordIcon from './external/discord.svg?component'
 import _GithubIcon from './external/github.svg?component'
 import _KoFiIcon from './external/kofi.svg?component'
@@ -27,7 +38,6 @@ import _TumblrIcon from './external/tumblr.svg?component'
 import _TwitterIcon from './external/twitter.svg?component'
 import _WindowsIcon from './external/windows.svg?component'
 import _YouTubeIcon from './external/youtube.svg?component'
-import _PyroIcon from './external/pyro.svg?component'
 
 // Icons
 import _AlignLeftIcon from './icons/align-left.svg?component'
@@ -37,6 +47,7 @@ import _AsteriskIcon from './icons/asterisk.svg?component'
 import _BanIcon from './icons/ban.svg?component'
 import _BellIcon from './icons/bell.svg?component'
 import _BellRingIcon from './icons/bell-ring.svg?component'
+import _BlocksIcon from './icons/blocks.svg?component'
 import _BookIcon from './icons/book.svg?component'
 import _BookTextIcon from './icons/book-text.svg?component'
 import _BookmarkIcon from './icons/bookmark.svg?component'
@@ -74,6 +85,7 @@ import _ExternalIcon from './icons/external.svg?component'
 import _EyeIcon from './icons/eye.svg?component'
 import _EyeOffIcon from './icons/eye-off.svg?component'
 import _FileIcon from './icons/file.svg?component'
+import _FileArchiveIcon from './icons/file-archive.svg?component'
 import _FileTextIcon from './icons/file-text.svg?component'
 import _FilterIcon from './icons/filter.svg?component'
 import _FilterXIcon from './icons/filter-x.svg?component'
@@ -123,12 +135,14 @@ import _MoonIcon from './icons/moon.svg?component'
 import _MoreHorizontalIcon from './icons/more-horizontal.svg?component'
 import _MoreVerticalIcon from './icons/more-vertical.svg?component'
 import _NewspaperIcon from './icons/newspaper.svg?component'
+import _NoSignalIcon from './icons/no-signal.svg?component'
 import _OmorphiaIcon from './icons/omorphia.svg?component'
 import _OrganizationIcon from './icons/organization.svg?component'
 import _PackageIcon from './icons/package.svg?component'
 import _PackageOpenIcon from './icons/package-open.svg?component'
 import _PackageClosedIcon from './icons/package-closed.svg?component'
 import _PaintBrushIcon from './icons/paintbrush.svg?component'
+import _PickaxeIcon from './icons/pickaxe.svg?component'
 import _PlayIcon from './icons/play.svg?component'
 import _PlugIcon from './icons/plug.svg?component'
 import _PlusIcon from './icons/plus.svg?component'
@@ -150,6 +164,8 @@ import _ServerIcon from './icons/server.svg?component'
 import _SettingsIcon from './icons/settings.svg?component'
 import _ShareIcon from './icons/share.svg?component'
 import _ShieldIcon from './icons/shield.svg?component'
+import _SignalIcon from './icons/signal.svg?component'
+import _SkullIcon from './icons/skull.svg?component'
 import _SlashIcon from './icons/slash.svg?component'
 import _SortAscendingIcon from './icons/sort-asc.svg?component'
 import _SortDescendingIcon from './icons/sort-desc.svg?component'
@@ -179,6 +195,7 @@ import _UsersIcon from './icons/users.svg?component'
 import _VersionIcon from './icons/version.svg?component'
 import _WikiIcon from './icons/wiki.svg?component'
 import _WindowIcon from './icons/window.svg?component'
+import _WorldIcon from './icons/world.svg?component'
 import _WrenchIcon from './icons/wrench.svg?component'
 import _XIcon from './icons/x.svg?component'
 import _XCircleIcon from './icons/x-circle.svg?component'
@@ -226,6 +243,16 @@ export const AstralRinthLogo = _AstralRinthLogo
 export const ModrinthIcon = _ModrinthIcon
 export const FourOhFourNotFound = _FourOhFourNotFound
 export const ModrinthPlusIcon = _ModrinthPlusIcon
+export const AngryRinthbot = _AngryRinthbot
+export const AnnoyedRinthbot = _AnnoyedRinthbot
+export const ConfusedRinthbot = _ConfusedRinthbot
+export const ExcitedRinthbot = _ExcitedRinthbot
+export const LaughingRinthbot = _LaughingRinthbot
+export const SadRinthbot = _SadRinthbot
+export const SleepingRinthbot = _SleepingRinthbot
+export const SobbingRinthbot = _SobbingRinthbot
+export const ThinkingRinthbot = _ThinkingRinthbot
+export const WavingRinthbot = _WavingRinthbot
 export const SSODiscordIcon = _SSODiscordIcon
 export const SSOGitHubIcon = _SSOGitHubIcon
 export const SSOGitLabIcon = _SSOGitLabIcon
@@ -236,13 +263,13 @@ export const AppleIcon = _AppleIcon
 export const BlueskyIcon = _BlueskyIcon
 export const BuyMeACoffeeIcon = _BuyMeACoffeeIcon
 export const GithubIcon = _GithubIcon
+export const CurseForgeIcon = _CurseForgeIcon
 export const DiscordIcon = _DiscordIcon
 export const KoFiIcon = _KoFiIcon
 export const MastodonIcon = _MastodonIcon
 export const OpenCollectiveIcon = _OpenCollectiveIcon
 export const PatreonIcon = _PatreonIcon
 export const PayPalIcon = _PayPalIcon
-export const PyroIcon = _PyroIcon
 export const RedditIcon = _RedditIcon
 export const TumblrIcon = _TumblrIcon
 export const TwitterIcon = _TwitterIcon
@@ -255,6 +282,7 @@ export const AsteriskIcon = _AsteriskIcon
 export const BanIcon = _BanIcon
 export const BellIcon = _BellIcon
 export const BellRingIcon = _BellRingIcon
+export const BlocksIcon = _BlocksIcon
 export const BookIcon = _BookIcon
 export const BookTextIcon = _BookTextIcon
 export const BookmarkIcon = _BookmarkIcon
@@ -292,6 +320,7 @@ export const ExternalIcon = _ExternalIcon
 export const EyeIcon = _EyeIcon
 export const EyeOffIcon = _EyeOffIcon
 export const FileIcon = _FileIcon
+export const FileArchiveIcon = _FileArchiveIcon
 export const FileTextIcon = _FileTextIcon
 export const FilterIcon = _FilterIcon
 export const FilterXIcon = _FilterXIcon
@@ -341,12 +370,14 @@ export const MoonIcon = _MoonIcon
 export const MoreHorizontalIcon = _MoreHorizontalIcon
 export const MoreVerticalIcon = _MoreVerticalIcon
 export const NewspaperIcon = _NewspaperIcon
+export const NoSignalIcon = _NoSignalIcon
 export const OmorphiaIcon = _OmorphiaIcon
 export const OrganizationIcon = _OrganizationIcon
 export const PackageIcon = _PackageIcon
 export const PackageOpenIcon = _PackageOpenIcon
 export const PackageClosedIcon = _PackageClosedIcon
 export const PaintBrushIcon = _PaintBrushIcon
+export const PickaxeIcon = _PickaxeIcon
 export const PlayIcon = _PlayIcon
 export const PlugIcon = _PlugIcon
 export const PlusIcon = _PlusIcon
@@ -368,6 +399,8 @@ export const ServerIcon = _ServerIcon
 export const SettingsIcon = _SettingsIcon
 export const ShareIcon = _ShareIcon
 export const ShieldIcon = _ShieldIcon
+export const SignalIcon = _SignalIcon
+export const SkullIcon = _SkullIcon
 export const SlashIcon = _SlashIcon
 export const SortAscendingIcon = _SortAscendingIcon
 export const SortDescendingIcon = _SortDescendingIcon
@@ -397,6 +430,7 @@ export const UsersIcon = _UsersIcon
 export const VersionIcon = _VersionIcon
 export const WikiIcon = _WikiIcon
 export const WindowIcon = _WindowIcon
+export const WorldIcon = _WorldIcon
 export const WrenchIcon = _WrenchIcon
 export const XIcon = _XIcon
 export const XCircleIcon = _XCircleIcon
diff --git a/packages/assets/styles/defaults.scss b/packages/assets/styles/defaults.scss
index 712817ee..36ecd625 100644
--- a/packages/assets/styles/defaults.scss
+++ b/packages/assets/styles/defaults.scss
@@ -59,7 +59,7 @@ textarea,
   padding: 0.5rem 1rem;
   font-weight: var(--font-weight-medium);
   transition: box-shadow 0.1s ease-in-out;
-  min-height: 40px;
+  min-height: 36px;
   box-shadow:
     var(--shadow-inset-sm),
     0 0 0 0 transparent;
@@ -159,7 +159,7 @@ input[type='number'] {
     @extend .transparent, .icon-only;
 
     position: absolute;
-    right: 0.25rem;
+    right: 0.125rem;
     z-index: 1;
 
     svg {
diff --git a/packages/assets/styles/variables.scss b/packages/assets/styles/variables.scss
index f462c886..315c9898 100644
--- a/packages/assets/styles/variables.scss
+++ b/packages/assets/styles/variables.scss
@@ -84,6 +84,8 @@
   --color-platform-velocity: #4b98b0;
   --color-platform-waterfall: #5f83cb;
   --color-platform-sponge: #c49528;
+
+  --hover-brightness: 0.9;
 }
 
 html {
@@ -196,6 +198,8 @@ html {
   --color-platform-velocity: #83d5ef;
   --color-platform-waterfall: #78a4fb;
   --color-platform-sponge: #f9e580;
+
+  --hover-brightness: 1.25;
 }
 
 .oled-mode {
diff --git a/packages/daedalus/Cargo.toml b/packages/daedalus/Cargo.toml
index 9fa0f512..014ce6f8 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 = "2021"
+edition = "2024"
 license = "MIT"
 description = "Utilities for querying and parsing Minecraft metadata"
 repository = "https://github.com/modrinth/daedalus/"
@@ -14,7 +14,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
-thiserror = "1.0"
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+chrono = { workspace = true, features = ["serde"] }
+thiserror.workspace = true
diff --git a/packages/ui/index.ts b/packages/ui/index.ts
index 690218b8..93cb1207 100644
--- a/packages/ui/index.ts
+++ b/packages/ui/index.ts
@@ -1,3 +1,3 @@
-export * from './src/components/index'
-export { commonMessages, commonSettingsMessages } from './src/utils/common-messages'
-export * from './src/utils/search'
+export * from './src/components'
+export * from './src/utils'
+export * from './src/composables'
diff --git a/packages/ui/package.json b/packages/ui/package.json
index cb02ad56..0599a807 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -16,9 +16,9 @@
     "eslint": "^8.57.0",
     "eslint-config-custom": "workspace:*",
     "tsconfig": "workspace:*",
+    "typescript": "^5.4.5",
     "vue": "^3.5.13",
-    "vue-router": "4.3.0",
-    "typescript": "^5.4.5"
+    "vue-router": "4.3.0"
   },
   "dependencies": {
     "@codemirror/commands": "^6.3.2",
@@ -29,6 +29,7 @@
     "@modrinth/assets": "workspace:*",
     "@modrinth/utils": "workspace:*",
     "@types/markdown-it": "^14.1.1",
+    "@vintl/how-ago": "^3.0.1",
     "apexcharts": "^3.44.0",
     "dayjs": "^1.11.10",
     "floating-vue": "^5.2.2",
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
index 4be4a2fc..7d3b8af9 100644
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ b/packages/ui/src/components/base/ButtonStyled.vue
@@ -4,7 +4,7 @@ import { computed } from 'vue'
 const props = withDefaults(
   defineProps<{
     color?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple'
-    size?: 'standard' | 'large'
+    size?: 'standard' | 'large' | 'small'
     circular?: boolean
     type?: 'standard' | 'outlined' | 'transparent' | 'highlight' | 'highlight-colored-text'
     colorFill?: 'auto' | 'background' | 'text' | 'none'
@@ -67,6 +67,8 @@ const colorVar = computed(() => {
 const height = computed(() => {
   if (props.size === 'large') {
     return '3rem'
+  } else if (props.size === 'small') {
+    return '1.5rem'
   }
   return '2.25rem'
 })
@@ -74,6 +76,8 @@ const height = computed(() => {
 const width = computed(() => {
   if (props.size === 'large') {
     return props.circular ? '3rem' : 'auto'
+  } else if (props.size === 'small') {
+    return props.circular ? '1.5rem' : 'auto'
   }
   return props.circular ? '2.25rem' : 'auto'
 })
@@ -82,6 +86,8 @@ const paddingX = computed(() => {
   let padding = props.circular ? '0.5rem' : '0.75rem'
   if (props.size === 'large') {
     padding = props.circular ? '0.75rem' : '1rem'
+  } else if (props.size === 'small') {
+    padding = props.circular ? '0.125rem' : '0.5rem'
   }
   return `calc(${padding} - 0.125rem)`
 })
@@ -96,6 +102,8 @@ const paddingY = computed(() => {
 const gap = computed(() => {
   if (props.size === 'large') {
     return '0.5rem'
+  } else if (props.size === 'small') {
+    return '0.25rem'
   }
   return '0.375rem'
 })
@@ -114,6 +122,8 @@ const radius = computed(() => {
 
   if (props.size === 'large') {
     return '1rem'
+  } else if (props.size === 'small') {
+    return '0.5rem'
   }
   return '0.75rem'
 })
@@ -121,6 +131,8 @@ const radius = computed(() => {
 const iconSize = computed(() => {
   if (props.size === 'large') {
     return '1.5rem'
+  } else if (props.size === 'small') {
+    return '1rem'
   }
   return '1.25rem'
 })
@@ -192,12 +204,19 @@ const colorVariables = computed(() => {
 
   return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text};`
 })
+
+const fontSize = computed(() => {
+  if (props.size === 'small') {
+    return 'text-sm'
+  }
+  return 'text-base'
+})
 </script>
 
 <template>
   <div
     class="btn-wrapper"
-    :class="{ outline: type === 'outlined' }"
+    :class="[{ outline: type === 'outlined' }, fontSize]"
     :style="`${colorVariables}--_height:${height};--_width:${width};--_radius: ${radius};--_padding-x:${paddingX};--_padding-y:${paddingY};--_gap:${gap};--_font-weight:${fontWeight};--_icon-size:${iconSize};`"
   >
     <slot />
@@ -245,7 +264,7 @@ const colorVariables = computed(() => {
   }
 
   &:not([disabled]):not([disabled='true']):not(.disabled) {
-    @apply active:scale-95 hover:brightness-125 focus-visible:brightness-125 hover:bg-[--_hover-bg] hover:text-[--_hover-text] focus-visible:bg-[--_hover-bg] focus-visible:text-[--_hover-text];
+    @apply active:scale-95 hover:brightness-[--hover-brightness] focus-visible:brightness-[--hover-brightness] hover:bg-[--_hover-bg] hover:text-[--_hover-text] focus-visible:bg-[--_hover-bg] focus-visible:text-[--_hover-text];
 
     &:hover svg:first-child,
     &:focus-visible svg:first-child {
diff --git a/packages/ui/src/components/base/FilterBar.vue b/packages/ui/src/components/base/FilterBar.vue
new file mode 100644
index 00000000..f5e688aa
--- /dev/null
+++ b/packages/ui/src/components/base/FilterBar.vue
@@ -0,0 +1,56 @@
+<template>
+  <div
+    v-if="(showAllOptions && options.length > 0) || options.length > 1"
+    class="flex flex-wrap gap-1 items-center"
+  >
+    <FilterIcon class="text-secondary h-5 w-5 mr-1" />
+    <button
+      v-for="filter in options"
+      :key="`filter-${filter.id}`"
+      :class="`px-2 py-1 rounded-full font-semibold leading-none border-none cursor-pointer active:scale-[0.97] duration-100 transition-all ${selectedFilters.includes(filter.id) ? 'bg-brand-highlight text-brand' : 'bg-bg-raised text-secondary'}`"
+      @click="toggleFilter(filter.id)"
+    >
+      {{ formatMessage(filter.message) }}
+    </button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { FilterIcon } from '@modrinth/assets'
+import { watch } from 'vue'
+import { type MessageDescriptor, useVIntl } from '@vintl/vintl'
+
+const { formatMessage } = useVIntl()
+
+export type FilterBarOption = {
+  id: string
+  message: MessageDescriptor
+}
+
+const selectedFilters = defineModel<string[]>({ required: true })
+
+const props = defineProps<{
+  options: FilterBarOption[]
+  showAllOptions?: boolean
+}>()
+
+watch(
+  () => props.options,
+  () => {
+    for (let i = 0; i < selectedFilters.value.length; i++) {
+      const option = selectedFilters.value[i]
+      if (!props.options.some((x) => x.id === option)) {
+        selectedFilters.value.splice(i, 1)
+      }
+    }
+  },
+)
+
+function toggleFilter(option: string) {
+  if (selectedFilters.value.includes(option)) {
+    selectedFilters.value.splice(selectedFilters.value.indexOf(option), 1)
+  } else {
+    selectedFilters.value.push(option)
+  }
+}
+</script>
diff --git a/packages/ui/src/components/base/HeadingLink.vue b/packages/ui/src/components/base/HeadingLink.vue
new file mode 100644
index 00000000..ecc2f501
--- /dev/null
+++ b/packages/ui/src/components/base/HeadingLink.vue
@@ -0,0 +1,20 @@
+<template>
+  <AutoLink
+    :to="to"
+    class="flex mb-3 leading-none items-center gap-1 text-primary text-lg font-bold hover:underline group w-fit"
+  >
+    <slot />
+    <ChevronRightIcon
+      class="h-5 w-5 stroke-[3px] group-hover:translate-x-1 transition-transform group-hover:text-brand"
+    />
+  </AutoLink>
+</template>
+
+<script setup lang="ts">
+import AutoLink from './AutoLink.vue'
+import { ChevronRightIcon } from '@modrinth/assets'
+
+defineProps<{
+  to: unknown
+}>()
+</script>
diff --git a/packages/ui/src/components/base/ProgressBar.vue b/packages/ui/src/components/base/ProgressBar.vue
index a5dfd409..eaf770b1 100644
--- a/packages/ui/src/components/base/ProgressBar.vue
+++ b/packages/ui/src/components/base/ProgressBar.vue
@@ -49,7 +49,10 @@ const colors = {
 const percent = computed(() => props.progress / props.max)
 </script>
 <template>
-  <div class="flex w-[15rem] h-1 rounded-full overflow-hidden" :class="colors[props.color].bg">
+  <div
+    class="flex w-full max-w-[15rem] h-1 rounded-full overflow-hidden"
+    :class="colors[props.color].bg"
+  >
     <div
       class="rounded-full progress-bar"
       :class="[colors[props.color].fg, { 'progress-bar--waiting': waiting }]"
diff --git a/packages/ui/src/components/base/ProjectCard.vue b/packages/ui/src/components/base/ProjectCard.vue
index 05c389cf..48fa6531 100644
--- a/packages/ui/src/components/base/ProjectCard.vue
+++ b/packages/ui/src/components/base/ProjectCard.vue
@@ -80,6 +80,8 @@ import EnvironmentIndicator from './EnvironmentIndicator.vue'
 </script>
 
 <script>
+import { useRelativeTime } from '../../composables'
+
 dayjs.extend(relativeTime)
 export default defineComponent({
   props: {
@@ -191,6 +193,10 @@ export default defineComponent({
       default: null,
     },
   },
+  setup(_) {
+    const formatRelativeTime = useRelativeTime()
+    return { formatRelativeTime }
+  },
   computed: {
     toColor() {
       let color = this.color
@@ -205,13 +211,13 @@ export default defineComponent({
       return dayjs(this.createdAt).format('MMMM D, YYYY [at] h:mm:ss A')
     },
     sinceCreation() {
-      return dayjs(this.createdAt).fromNow()
+      return this.formatRelativeTime(this.createdAt)
     },
     updatedDate() {
       return dayjs(this.updatedAt).format('MMMM D, YYYY [at] h:mm:ss A')
     },
     sinceUpdated() {
-      return dayjs(this.updatedAt).fromNow()
+      return this.formatRelativeTime(this.updatedAt)
     },
   },
   methods: {
diff --git a/packages/ui/src/components/base/RadialHeader.vue b/packages/ui/src/components/base/RadialHeader.vue
index 89e80b67..05de7544 100644
--- a/packages/ui/src/components/base/RadialHeader.vue
+++ b/packages/ui/src/components/base/RadialHeader.vue
@@ -1,8 +1,10 @@
 <template>
-  <div :style="colorClasses" class="radial-header relative pb-1" v-bind="$attrs">
-    <slot />
+  <div>
+    <div :style="colorClasses" class="radial-header relative" v-bind="$attrs">
+      <slot />
+    </div>
+    <div class="radial-header-divider" />
   </div>
-  <div class="radial-header-divider" />
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
diff --git a/packages/ui/src/components/base/SmartClickable.vue b/packages/ui/src/components/base/SmartClickable.vue
new file mode 100644
index 00000000..fbfc3fe5
--- /dev/null
+++ b/packages/ui/src/components/base/SmartClickable.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="smart-clickable" :class="{ 'smart-clickable--has-clickable': !!$slots.clickable }">
+    <slot name="clickable" />
+    <div v-bind="$attrs" class="smart-clickable__contents pointer-events-none">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  inheritAttrs: false,
+})
+</script>
+<style scoped lang="scss">
+.smart-clickable {
+  display: grid;
+
+  > * {
+    grid-area: 1 / 1;
+  }
+
+  .smart-clickable__contents {
+    // Utility classes for contents
+    :deep(.smart-clickable\:allow-pointer-events) {
+      pointer-events: all;
+    }
+  }
+}
+
+// Only apply effects when a clickable is present
+.smart-clickable.smart-clickable--has-clickable {
+  // Setup base styles for contents
+  .smart-clickable__contents {
+    transition: scale 0.125s ease-out;
+
+    // Why? I don't know. It forces the SVGs to render differently, which fixes some shift on hover otherwise.
+    //filter: brightness(1.00001);
+  }
+
+  // When clickable is being hovered or focus-visible, give contents an effect
+  &:has(> *:first-child:hover, > *:first-child:focus-visible) .smart-clickable__contents {
+    filter: var(--hover-filter-weak);
+
+    // Utility classes for contents
+    :deep(.smart-clickable\:underline-on-hover) {
+      text-decoration: underline;
+    }
+
+    // Utility classes for contents
+    :deep(.smart-clickable\:highlight-on-hover) {
+      filter: brightness(var(--hover-brightness, 1.25));
+    }
+  }
+
+  // When clickable is being clicked, give contents an effect
+  &:has(> *:first-child:active) .smart-clickable__contents {
+    scale: 0.97;
+  }
+}
+</style>
diff --git a/packages/ui/src/components/base/Timeline.vue b/packages/ui/src/components/base/Timeline.vue
index e35b0692..3466eabf 100644
--- a/packages/ui/src/components/base/Timeline.vue
+++ b/packages/ui/src/components/base/Timeline.vue
@@ -48,7 +48,7 @@ withDefaults(
     mask-image: linear-gradient(
       to bottom,
       transparent 0%,
-      black 8rem,
+      black,
       black calc(100% - 8rem),
       transparent 100%
     );
diff --git a/packages/ui/src/components/changelog/ChangelogEntry.vue b/packages/ui/src/components/changelog/ChangelogEntry.vue
index 2a6c1deb..fa8aef00 100644
--- a/packages/ui/src/components/changelog/ChangelogEntry.vue
+++ b/packages/ui/src/components/changelog/ChangelogEntry.vue
@@ -48,8 +48,10 @@ import dayjs from 'dayjs'
 import { useVIntl, defineMessages } from '@vintl/vintl'
 import { computed, ref } from 'vue'
 import AutoLink from '../base/AutoLink.vue'
+import { useRelativeTime } from '../../composables'
 
 const { formatMessage } = useVIntl()
+const formatRelativeTime = useRelativeTime()
 
 const props = withDefaults(
   defineProps<{
@@ -70,7 +72,7 @@ const recent = computed(() => props.entry.date.isAfter(currentDate.value.subtrac
 const future = computed(() => props.entry.date.isAfter(currentDate.value))
 const dateTooltip = computed(() => props.entry.date.format('MMMM D, YYYY [at] h:mm A'))
 
-const relativeDate = computed(() => props.entry.date.fromNow())
+const relativeDate = computed(() => formatRelativeTime(props.entry.date.toISOString()))
 const longDate = computed(() => props.entry.date.format('MMMM D, YYYY'))
 const versionName = computed(() => props.entry.version ?? longDate.value)
 
diff --git a/packages/ui/src/components/content/ContentListPanel.vue b/packages/ui/src/components/content/ContentListPanel.vue
index 4c7412df..c7da6501 100644
--- a/packages/ui/src/components/content/ContentListPanel.vue
+++ b/packages/ui/src/components/content/ContentListPanel.vue
@@ -26,7 +26,7 @@ const selected: Ref<string[]> = computed(() =>
 
 const allSelected = ref(false)
 
-const model = defineModel()
+const model = defineModel<string[]>()
 
 function updateSelection() {
   model.value = selected.value
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index 9aae805a..899a8932 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -17,6 +17,9 @@ 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 FileInput } from './base/FileInput.vue'
+export { default as FilterBar } from './base/FilterBar.vue'
+export type { FilterBarOption } from './base/FilterBar.vue'
+export { default as HeadingLink } from './base/HeadingLink.vue'
 export { default as LoadingIndicator } from './base/LoadingIndicator.vue'
 export { default as ManySelect } from './base/ManySelect.vue'
 export { default as MarkdownEditor } from './base/MarkdownEditor.vue'
@@ -34,6 +37,7 @@ export { default as ScrollablePanel } from './base/ScrollablePanel.vue'
 export { default as ServerNotice } from './base/ServerNotice.vue'
 export { default as SimpleBadge } from './base/SimpleBadge.vue'
 export { default as Slider } from './base/Slider.vue'
+export { default as SmartClickable } from './base/SmartClickable.vue'
 export { default as StatItem } from './base/StatItem.vue'
 export { default as TagItem } from './base/TagItem.vue'
 export { default as TeleportDropdownMenu } from './base/TeleportDropdownMenu.vue'
@@ -67,6 +71,7 @@ export { default as Breadcrumbs } from './nav/Breadcrumbs.vue'
 export { default as NavItem } from './nav/NavItem.vue'
 export { default as NavRow } from './nav/NavRow.vue'
 export { default as NavStack } from './nav/NavStack.vue'
+export { default as PagewideBanner } from './nav/PagewideBanner.vue'
 
 // Project
 export { default as NewProjectCard } from './project/NewProjectCard.vue'
diff --git a/packages/ui/src/components/modal/ConfirmModal.vue b/packages/ui/src/components/modal/ConfirmModal.vue
index e9925d43..37c9c0cf 100644
--- a/packages/ui/src/components/modal/ConfirmModal.vue
+++ b/packages/ui/src/components/modal/ConfirmModal.vue
@@ -6,11 +6,16 @@
       </slot>
     </template>
     <div class="flex flex-col gap-4">
-      <div
-        v-if="description"
-        class="markdown-body max-w-[35rem]"
-        v-html="renderString(description)"
-      />
+      <template v-if="description">
+        <div
+          v-if="markdown"
+          class="markdown-body max-w-[35rem]"
+          v-html="renderString(description)"
+        />
+        <p v-else class="max-w-[35rem] m-0">
+          {{ description }}
+        </p>
+      </template>
       <slot />
       <label v-if="hasToType" for="confirmation">
         <span>
@@ -46,7 +51,7 @@
 
 <script setup>
 import { renderString } from '@modrinth/utils'
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { TrashIcon, XIcon } from '@modrinth/assets'
 import NewModal from './NewModal.vue'
 import ButtonStyled from '../base/ButtonStyled.vue'
@@ -92,6 +97,10 @@ const props = defineProps({
       return () => {}
     },
   },
+  markdown: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const emit = defineEmits(['proceed'])
diff --git a/packages/ui/src/components/nav/PagewideBanner.vue b/packages/ui/src/components/nav/PagewideBanner.vue
new file mode 100644
index 00000000..caafdf1f
--- /dev/null
+++ b/packages/ui/src/components/nav/PagewideBanner.vue
@@ -0,0 +1,82 @@
+<template>
+  <div
+    :class="['banner-grid relative border-b-2 border-solid border-0', containerClasses[variant]]"
+  >
+    <div
+      :class="[
+        'grid-area-[title] flex items-center gap-2 font-bold text-[var(--font-size-md)]',
+        iconClasses[variant],
+      ]"
+    >
+      <IssuesIcon
+        v-if="variant === 'warning' || variant === 'error'"
+        aria-hidden="true"
+        class="w-6 h-6 flex-shrink-0"
+      />
+      <InfoIcon v-if="variant === 'info'" aria-hidden="true" class="w-6 h-6 flex-shrink-0" />
+      <slot name="title" />
+    </div>
+
+    <div class="grid-area-[description] flex flex-col gap-[var(--gap-md)]">
+      <slot name="description" />
+    </div>
+
+    <div v-if="$slots.actions" class="grid-area-[actions]">
+      <slot name="actions" />
+    </div>
+
+    <div v-if="$slots.actions_right" class="grid-area-[actions_right]">
+      <slot name="actions_right" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { InfoIcon, IssuesIcon } from '@modrinth/assets'
+
+defineProps<{
+  variant: 'error' | 'warning' | 'info'
+}>()
+
+const containerClasses = {
+  error: 'bg-banners-error-bg text-banners-error-text border-banners-error-border',
+  warning: 'bg-banners-warning-bg text-banners-warning-text border-banners-warning-border',
+  info: 'bg-banners-info-bg text-banners-info-text border-banners-info-border',
+}
+
+const iconClasses = {
+  error: 'text-brand-red',
+  warning: 'text-brand-orange',
+  info: 'text-brand-blue',
+}
+</script>
+
+<style scoped>
+.banner-grid {
+  display: grid;
+  gap: 0.5rem;
+  grid-template-areas:
+    'title         actions_right'
+    'description   actions_right'
+    'actions       actions_right';
+  padding-block: var(--gap-xl);
+  padding-inline: max(calc((100% - 80rem) / 2 + var(--gap-md)), var(--gap-xl));
+}
+
+.grid-area-\[title\] {
+  grid-area: title;
+}
+.grid-area-\[description\] {
+  grid-area: description;
+}
+.grid-area-\[actions\] {
+  grid-area: actions;
+}
+.grid-area-\[actions_right\] {
+  grid-area: actions_right;
+}
+
+.banner-grid a {
+  @apply underline text-current;
+}
+</style>
diff --git a/packages/ui/src/components/project/NewProjectCard.vue b/packages/ui/src/components/project/NewProjectCard.vue
index 58d8dded..b028c20e 100644
--- a/packages/ui/src/components/project/NewProjectCard.vue
+++ b/packages/ui/src/components/project/NewProjectCard.vue
@@ -50,7 +50,7 @@
           <HistoryIcon class="shrink-0" />
           <span>
             <span class="text-secondary">Updated</span>
-            {{ dayjs(project.date_modified ?? project.updated).fromNow() }}
+            {{ formatRelativeTime(project.date_modified ?? project.updated) }}
           </span>
         </div>
         <div
@@ -67,10 +67,9 @@
 import { TagsIcon, DownloadIcon, HeartIcon, HistoryIcon } from '@modrinth/assets'
 import Avatar from '../base/Avatar.vue'
 import { formatNumber, formatCategory } from '@modrinth/utils'
-import dayjs from 'dayjs'
-import relativeTime from 'dayjs/plugin/relativeTime'
+import { useRelativeTime } from '../../composables'
 
-dayjs.extend(relativeTime)
+const formatRelativeTime = useRelativeTime()
 
 defineProps({
   project: {
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index ce3a3b9e..279049b3 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -132,7 +132,7 @@
                 class="z-[1] flex cursor-help items-center gap-1 text-nowrap font-medium xl:self-center"
               >
                 <CalendarIcon class="xl:hidden" />
-                {{ dayjs(version.date_published).fromNow() }}
+                {{ formatRelativeTime(version.date_published) }}
               </div>
               <div
                 class="pointer-events-none z-[1] flex items-center gap-1 font-medium xl:self-center"
@@ -185,11 +185,12 @@ import { Pagination, VersionChannelIndicator, VersionFilterControl } from '../in
 import { useVIntl } from '@vintl/vintl'
 import { type Ref, ref, computed } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import dayjs from 'dayjs'
 import AutoLink from '../base/AutoLink.vue'
 import TagItem from '../base/TagItem.vue'
+import { useRelativeTime } from '../../composables'
 
 const { formatMessage } = useVIntl()
+const formatRelativeTime = useRelativeTime()
 
 type VersionWithDisplayUrlEnding = Version & {
   displayUrlEnding: string
diff --git a/packages/ui/src/components/project/ProjectSidebarDetails.vue b/packages/ui/src/components/project/ProjectSidebarDetails.vue
index 2b212c44..05b68d18 100644
--- a/packages/ui/src/components/project/ProjectSidebarDetails.vue
+++ b/packages/ui/src/components/project/ProjectSidebarDetails.vue
@@ -68,8 +68,10 @@ import { BookTextIcon, CalendarIcon, ScaleIcon, VersionIcon, ExternalIcon } from
 import { useVIntl, defineMessages } from '@vintl/vintl'
 import { computed } from 'vue'
 import dayjs from 'dayjs'
+import { useRelativeTime } from '../../composables'
 
 const { formatMessage } = useVIntl()
+const formatRelativeTime = useRelativeTime()
 
 const props = defineProps<{
   project: {
@@ -89,16 +91,16 @@ const props = defineProps<{
 }>()
 
 const createdDate = computed(() =>
-  props.project.published ? dayjs(props.project.published).fromNow() : 'unknown',
+  props.project.published ? formatRelativeTime(props.project.published) : 'unknown',
 )
 const submittedDate = computed(() =>
-  props.project.queued ? dayjs(props.project.queued).fromNow() : 'unknown',
+  props.project.queued ? formatRelativeTime(props.project.queued) : 'unknown',
 )
 const publishedDate = computed(() =>
-  props.project.approved ? dayjs(props.project.approved).fromNow() : 'unknown',
+  props.project.approved ? formatRelativeTime(props.project.approved) : 'unknown',
 )
 const updatedDate = computed(() =>
-  props.project.updated ? dayjs(props.project.updated).fromNow() : 'unknown',
+  props.project.updated ? formatRelativeTime(props.project.updated) : 'unknown',
 )
 
 const licenseIdDisplay = computed(() => {
diff --git a/packages/ui/src/components/settings/ThemeSelector.vue b/packages/ui/src/components/settings/ThemeSelector.vue
index 85bf6466..e5d43276 100644
--- a/packages/ui/src/components/settings/ThemeSelector.vue
+++ b/packages/ui/src/components/settings/ThemeSelector.vue
@@ -1,27 +1,15 @@
-<script setup>
+<script setup lang="ts" generic="T extends string">
 import { MoonIcon, RadioButtonCheckedIcon, RadioButtonIcon, SunIcon } from '@modrinth/assets'
-import { useVIntl, defineMessages } from '@vintl/vintl'
+import { defineMessages, useVIntl } from '@vintl/vintl'
 
 const { formatMessage } = useVIntl()
 
-defineProps({
-  updateColorTheme: {
-    type: Function,
-    required: true,
-  },
-  currentTheme: {
-    type: String,
-    required: true,
-  },
-  themeOptions: {
-    type: Array,
-    required: true,
-  },
-  systemThemeColor: {
-    type: String,
-    required: true,
-  },
-})
+defineProps<{
+  updateColorTheme: (theme: T) => void
+  currentTheme: T
+  themeOptions: readonly T[]
+  systemThemeColor: T
+}>()
 
 const colorTheme = defineMessages({
   title: {
@@ -61,6 +49,10 @@ const colorTheme = defineMessages({
     defaultMessage: 'Preferred dark theme',
   },
 })
+
+function asString(theme: T): string {
+  return theme
+}
 </script>
 
 <template>
@@ -82,7 +74,7 @@ const colorTheme = defineMessages({
       <div class="label">
         <RadioButtonCheckedIcon v-if="currentTheme === option" class="radio" />
         <RadioButtonIcon v-else class="radio" />
-        {{ colorTheme[option] ? formatMessage(colorTheme[option]) : option }}
+        {{ colorTheme[asString(option)] ? formatMessage(colorTheme[asString(option)]) : option }}
         <SunIcon
           v-if="'light' === option"
           v-tooltip="formatMessage(colorTheme.preferredLight)"
diff --git a/packages/ui/src/composables/how-ago.ts b/packages/ui/src/composables/how-ago.ts
new file mode 100644
index 00000000..a9ef7e52
--- /dev/null
+++ b/packages/ui/src/composables/how-ago.ts
@@ -0,0 +1,23 @@
+import { createFormatter, type FormatOptions, type Formatter } from '@vintl/how-ago'
+import type { IntlController } from '@vintl/vintl/controller'
+import { useVIntl } from '@vintl/vintl'
+import { computed } from 'vue'
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const formatters = new WeakMap<IntlController<any>, Formatter>()
+
+export function useRelativeTime(): Formatter {
+  const vintl = useVIntl()
+
+  let formatter = formatters.get(vintl)
+
+  if (formatter == null) {
+    const formatterRef = computed(() => createFormatter(vintl.intl))
+    const defaultOptions: FormatOptions = { roundingMode: 'halfExpand' as const }
+
+    formatter = (value, options) => formatterRef.value(value, { ...options, ...defaultOptions })
+    formatters.set(vintl, formatter)
+  }
+
+  return formatter
+}
diff --git a/packages/ui/src/composables/index.ts b/packages/ui/src/composables/index.ts
new file mode 100644
index 00000000..de29c577
--- /dev/null
+++ b/packages/ui/src/composables/index.ts
@@ -0,0 +1 @@
+export * from './how-ago'
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 1995738d..44ba1c6e 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -8,6 +8,9 @@
   "button.copy-id": {
     "defaultMessage": "Copy ID"
   },
+  "button.copy-permalink": {
+    "defaultMessage": "Copy permanent link"
+  },
   "button.create-a-project": {
     "defaultMessage": "Create a project"
   },
@@ -20,6 +23,21 @@
   "button.edit": {
     "defaultMessage": "Edit"
   },
+  "button.open-folder": {
+    "defaultMessage": "Open folder"
+  },
+  "button.play": {
+    "defaultMessage": "Play"
+  },
+  "button.refresh": {
+    "defaultMessage": "Refresh"
+  },
+  "button.remove": {
+    "defaultMessage": "Remove"
+  },
+  "button.remove-image": {
+    "defaultMessage": "Remove image"
+  },
   "button.report": {
     "defaultMessage": "Report"
   },
@@ -35,6 +53,9 @@
   "button.sign-out": {
     "defaultMessage": "Sign out"
   },
+  "button.stop": {
+    "defaultMessage": "Stop"
+  },
   "button.upload-image": {
     "defaultMessage": "Upload image"
   },
@@ -65,6 +86,21 @@
   "input.view.list": {
     "defaultMessage": "Rows view"
   },
+  "instance.worlds.game_mode.adventure": {
+    "defaultMessage": "Adventure mode"
+  },
+  "instance.worlds.game_mode.creative": {
+    "defaultMessage": "Creative mode"
+  },
+  "instance.worlds.game_mode.spectator": {
+    "defaultMessage": "Spectator mode"
+  },
+  "instance.worlds.game_mode.survival": {
+    "defaultMessage": "Survival mode"
+  },
+  "instance.worlds.game_mode.unknown": {
+    "defaultMessage": "Unknown game mode"
+  },
   "label.changes-saved": {
     "defaultMessage": "Changes saved"
   },
@@ -89,6 +125,9 @@
   "label.followed-projects": {
     "defaultMessage": "Followed projects"
   },
+  "label.loading": {
+    "defaultMessage": "Loading..."
+  },
   "label.moderation": {
     "defaultMessage": "Moderation"
   },
@@ -98,6 +137,9 @@
   "label.password": {
     "defaultMessage": "Password"
   },
+  "label.played": {
+    "defaultMessage": "Played {time}"
+  },
   "label.public": {
     "defaultMessage": "Public"
   },
@@ -107,12 +149,18 @@
   "label.scopes": {
     "defaultMessage": "Scopes"
   },
+  "label.server": {
+    "defaultMessage": "Server"
+  },
   "label.servers": {
     "defaultMessage": "Servers"
   },
   "label.settings": {
     "defaultMessage": "Settings"
   },
+  "label.singleplayer": {
+    "defaultMessage": "Singleplayer"
+  },
   "label.title": {
     "defaultMessage": "Title"
   },
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 997c1a9a..d878f11d 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -21,6 +21,10 @@ export const commonMessages = defineMessages({
     id: 'button.copy-id',
     defaultMessage: 'Copy ID',
   },
+  copyPermalinkButton: {
+    id: 'button.copy-permalink',
+    defaultMessage: 'Copy permanent link',
+  },
   changesSavedLabel: {
     id: 'label.changes-saved',
     defaultMessage: 'Changes saved',
@@ -85,6 +89,10 @@ export const commonMessages = defineMessages({
     id: 'input.view.list',
     defaultMessage: 'Rows view',
   },
+  loadingLabel: {
+    id: 'label.loading',
+    defaultMessage: 'Loading...',
+  },
   moderationLabel: {
     id: 'label.moderation',
     defaultMessage: 'Moderation',
@@ -93,6 +101,14 @@ export const commonMessages = defineMessages({
     id: 'label.notifications',
     defaultMessage: 'Notifications',
   },
+  playButton: {
+    id: 'button.play',
+    defaultMessage: 'Play',
+  },
+  playedLabel: {
+    id: 'label.played',
+    defaultMessage: 'Played {time}',
+  },
   privateLabel: {
     id: 'collection.label.private',
     defaultMessage: 'Private',
@@ -101,14 +117,26 @@ export const commonMessages = defineMessages({
     id: 'label.public',
     defaultMessage: 'Public',
   },
+  refreshButton: {
+    id: 'button.refresh',
+    defaultMessage: 'Refresh',
+  },
   rejectedLabel: {
     id: 'label.rejected',
     defaultMessage: 'Rejected',
   },
+  removeButton: {
+    id: 'button.remove',
+    defaultMessage: 'Remove',
+  },
   reportButton: {
     id: 'button.report',
     defaultMessage: 'Report',
   },
+  openFolderButton: {
+    id: 'button.open-folder',
+    defaultMessage: 'Open folder',
+  },
   passwordLabel: {
     id: 'label.password',
     defaultMessage: 'Password',
@@ -125,6 +153,10 @@ export const commonMessages = defineMessages({
     id: 'label.scopes',
     defaultMessage: 'Scopes',
   },
+  serverLabel: {
+    id: 'label.server',
+    defaultMessage: 'Server',
+  },
   serversLabel: {
     id: 'label.servers',
     defaultMessage: 'Servers',
@@ -141,6 +173,14 @@ export const commonMessages = defineMessages({
     id: 'button.sign-out',
     defaultMessage: 'Sign out',
   },
+  singleplayerLabel: {
+    id: 'label.singleplayer',
+    defaultMessage: 'Singleplayer',
+  },
+  stopButton: {
+    id: 'button.stop',
+    defaultMessage: 'Stop',
+  },
   titleLabel: {
     id: 'label.title',
     defaultMessage: 'Title',
diff --git a/packages/ui/src/utils/game-modes.ts b/packages/ui/src/utils/game-modes.ts
new file mode 100644
index 00000000..b0f2fcfc
--- /dev/null
+++ b/packages/ui/src/utils/game-modes.ts
@@ -0,0 +1,40 @@
+import { BlocksIcon, CompassIcon, EyeIcon, PickaxeIcon, UnknownIcon } from '@modrinth/assets'
+import { defineMessage } from '@vintl/vintl'
+
+export const GAME_MODES = {
+  survival: {
+    icon: PickaxeIcon,
+    message: defineMessage({
+      id: 'instance.worlds.game_mode.survival',
+      defaultMessage: 'Survival mode',
+    }),
+  },
+  creative: {
+    icon: BlocksIcon,
+    message: defineMessage({
+      id: 'instance.worlds.game_mode.creative',
+      defaultMessage: 'Creative mode',
+    }),
+  },
+  adventure: {
+    icon: CompassIcon,
+    message: defineMessage({
+      id: 'instance.worlds.game_mode.adventure',
+      defaultMessage: 'Adventure mode',
+    }),
+  },
+  spectator: {
+    icon: EyeIcon,
+    message: defineMessage({
+      id: 'instance.worlds.game_mode.spectator',
+      defaultMessage: 'Spectator mode',
+    }),
+  },
+  unknown: {
+    icon: UnknownIcon,
+    message: defineMessage({
+      id: 'instance.worlds.game_mode.unknown',
+      defaultMessage: 'Unknown game mode',
+    }),
+  },
+}
diff --git a/packages/ui/src/utils/index.ts b/packages/ui/src/utils/index.ts
new file mode 100644
index 00000000..7c8c645c
--- /dev/null
+++ b/packages/ui/src/utils/index.ts
@@ -0,0 +1,4 @@
+export * from './common-messages'
+export * from './game-modes'
+export * from './notices'
+export * from './search'
diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 4da01f34..edcca4c6 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,108 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-05-08T09:00:00-07:00`,
+    product: 'servers',
+    body: `### Added
+- Added the ability to extract .zip files in the Files page.
+- Added the ability to extract a remote .zip file from a URL, or from a CurseForge modpack version URL.
+- Dependencies will now automatically be installed when installing a mod from Modrinth.`,
+  },
+  {
+    date: `2025-05-08T09:00:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Fixed game version and loader selection when editing a version only showing up to 6 selected items, making it frustrating to remove a specific version.
+- Fixed organization URLs being case sensitive. (Contributed by [IMB11](https://github.com/modrinth/code/pull/3621))
+- Fixed notifications not loading sometimes. (Contributed by [IMB11](https://github.com/modrinth/code/pull/3624))
+- Fixed marking all notifications as read. (Contributed by [IMB11](https://github.com/modrinth/code/pull/3624))
+- Fixed relative time sometimes having poor rounding, and sometimes showing future dates unexpectedly. (Contributed by [IMB11](https://github.com/modrinth/code/pull/3612))
+- Fixed localized pricing not showing in some cases for Modrinth+. (Contributed by [IMB11](https://github.com/modrinth/code/pull/3623))
+- Fixed Modrinth changelog page link back to the full changelog not being clickable sometimes. (Contributed by [ThatGravyBoat](https://github.com/modrinth/code/pull/3593))
+- Fixed analytics 'Views' tab not having the updated display for 'Other' regions.`,
+  },
+  {
+    date: `2025-05-01T18:30:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Added a button to switch Modrinth+ billing between monthly and yearly.
+- Updated Modrinth App marketing page screenshots.`,
+  },
+  {
+    date: `2025-05-01T18:10:00-07:00`,
+    product: 'app',
+    version: `0.9.5`,
+    body: `### Improvements
+- Fixed certain mods with a large number of versions not being able to be installed or load their versions.
+- Fixed server descriptions not being rendered with the Minecraft font.
+- When installing a modpack, the page will now change to the instance once it's created.
+- Last played time for existing servers will now be loaded from log files instead of displaying "Never played".
+- Home page's "Jump back in" section will now display in multiple columns when the screen is very large.
+- Added the ability to launch the instance from a World entry on the Home page.
+- Added the ability to hide a world from the Home page.
+- Added an appearance setting to only show instances instead of worlds on the Home page.
+- Fixed Home page rendering being blocked by server pings.
+- Fixed Home page sometimes not sending the correct protocol version when fetching server data.
+- Fixed server data not being loaded immediately after adding it.
+- Fixed Worlds tab filters showing up in the wrong situations.
+- Fixed new Singleplayer worlds not being added to the Worlds tab without a refresh.
+- Fixed an excessive number of items showing up in "Jump back in" sometimes.
+- Fixed critical error modal cutting off long single-line error messages.`,
+  },
+  {
+    date: `2025-04-29T08:20:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Fixed multiple 'Hidden' countries showing up in analytics, updated flag and changed to 'Other'.`,
+  },
+  {
+    date: `2025-04-28T19:45:00-07:00`,
+    product: 'servers',
+    body: `### Added
+- Added support for installing snapshot versions of Minecraft.
+
+### Improvements
+- Fixed a bug where the loader version wouldn't update after changing Minecraft version if the old loader version did not support the newly selected Minecraft version.
+- Improved wording of unprovisioned servers, to inform people that newly purchased servers may be unprovisioned for a small amount of time.`,
+  },
+  {
+    date: `2025-04-28T19:45:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Combined Apple Silicon and Intel download links for Modrinth App into one link.
+- Added an option to copy a permanent link (using IDs instead of changeable slugs) to projects, users, and organizations.
+- Fixed overflow issue with dev-mode Maven coordinates widget, and changed wording.`,
+  },
+  {
+    date: `2025-04-26T19:15:00-07:00`,
+    product: 'app',
+    version: `0.9.4`,
+    body: `### Added
+- Added a Worlds tab to instances that allow you to manage your worlds and servers directly from the app
+  - Server ping, play count, and descriptions will all show before having to open the game.
+  - Add, edit, and remove servers
+  - Edit and delete singleplayer worlds
+- Added 'Quick Play' functionality, allowing you to jump straight into worlds and servers from the app
+- Added new launcher-log.txt file to log stdout to a file, similar to the Minecraft Launcher which can be helpful for debugging.
+
+### Improvements
+- Overhauled the 'Jump back in' section of the Home page, showing recently played worlds instead of just instances.
+  - This supports the new 'Quick Play' functionality, allowing you to jump back into your recent worlds (on supported Minecraft versions 1.20+)
+- Improved the fatal error dialog to show debug information more prominently, and allow you to copy it to share with support.
+- Fixed the display of critical announcements that has been broken since 0.9.0.
+- Fixed content authors not displaying properly on Content page if the content was owned by an organization.
+- Fixed random errors on the Library page, causing no instances to load.
+- Fixed .mrpack file association on Linux.
+- Fixed occasional failures when moving app directory between disks.`,
+  },
+  {
+    date: `2025-04-25T19:45:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Added feedback survey upon Modrinth Servers cancellation.
+- Added FAQ question about the currency for Modrinth Servers subscription payments.`,
+  },
   {
     date: `2025-04-18T22:30:00-07:00`,
     product: 'web',
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index 1d6ca593..08b7e271 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -67,6 +67,7 @@ export interface Project {
 
   team: ModrinthId
   thread_id: ModrinthId
+  organization: ModrinthId
 
   issues_url?: string
   source_url?: string
@@ -125,6 +126,46 @@ export interface SearchResult {
   license: string
 }
 
+export type Organization = {
+  id: ModrinthId
+  slug: string
+  name: string
+  team_id: ModrinthId
+  description: string
+  icon_url: string
+  color: number
+  members: OrganizationMember[]
+}
+
+export type OrganizationPermissions = number
+
+export type OrganizationMember = {
+  team_id: ModrinthId
+  user: User
+  role: string
+  is_owner: boolean
+  permissions: TeamMemberPermissions
+  organization_permissions: OrganizationPermissions
+  accepted: boolean
+  payouts_split: number
+  ordering: number
+}
+
+export type Collection = {
+  id: ModrinthId
+  user: User
+  name: string
+  description: string
+  icon_url: string
+  color: number
+  status: CollectionStatus
+  created: string
+  updated: string
+  projects: ModrinthId[]
+}
+
+export type CollectionStatus = 'listed' | 'unlisted' | 'private' | 'unknown'
+
 export type DependencyType = 'required' | 'optional' | 'incompatible' | 'embedded'
 
 export interface VersionDependency {
@@ -239,6 +280,7 @@ export interface TeamMember {
   accepted: boolean
   payouts_split: number
   ordering: number
+  is_owner: boolean
 }
 
 export type Report = {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2877f00d..36e74b9f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,11 +36,14 @@ importers:
         version: link:../../packages/daedalus
     devDependencies:
       '@tauri-apps/cli':
-        specifier: 2.1.0
-        version: 2.1.0
+        specifier: 2.5.0
+        version: 2.5.0
 
   apps/app-frontend:
     dependencies:
+      '@geometrically/minecraft-motd-parser':
+        specifier: ^1.1.4
+        version: 1.1.4
       '@modrinth/assets':
         specifier: workspace:*
         version: link:../../packages/assets
@@ -54,23 +57,23 @@ importers:
         specifier: ^8.27.0
         version: 8.27.0(vue@3.5.13(typescript@5.5.4))
       '@tauri-apps/api':
-        specifier: ^2.1.1
-        version: 2.1.1
+        specifier: ^2.5.0
+        version: 2.5.0
       '@tauri-apps/plugin-dialog':
-        specifier: ^2.2.0
-        version: 2.2.0
+        specifier: ^2.2.1
+        version: 2.2.2
       '@tauri-apps/plugin-opener':
+        specifier: ^2.2.6
+        version: 2.2.7
+      '@tauri-apps/plugin-os':
         specifier: ^2.2.1
         version: 2.2.1
-      '@tauri-apps/plugin-os':
-        specifier: ^2.2.0
-        version: 2.2.0
       '@tauri-apps/plugin-updater':
-        specifier: ^2.3.0
-        version: 2.3.0
+        specifier: ^2.7.1
+        version: 2.7.1
       '@tauri-apps/plugin-window-state':
-        specifier: ^2.2.0
-        version: 2.2.0
+        specifier: ^2.2.2
+        version: 2.2.2
       '@vintl/vintl':
         specifier: ^4.4.1
         version: 4.4.1(typescript@5.5.4)(vue@3.5.13(typescript@5.5.4))
@@ -114,6 +117,9 @@ importers:
       '@nuxt/eslint-config':
         specifier: ^0.5.6
         version: 0.5.7(eslint@9.13.0(jiti@2.4.1))(typescript@5.5.4)
+      '@taijased/vue-render-tracker':
+        specifier: ^1.0.7
+        version: 1.0.7(vue@3.5.13(typescript@5.5.4))
       '@vitejs/plugin-vue':
         specifier: ^5.0.4
         version: 5.2.1(vite@5.4.11(@types/node@22.13.1)(sass@1.77.6)(terser@5.38.1))(vue@3.5.13(typescript@5.5.4))
@@ -414,6 +420,9 @@ importers:
       '@types/markdown-it':
         specifier: ^14.1.1
         version: 14.1.1
+      '@vintl/how-ago':
+        specifier: ^3.0.1
+        version: 3.0.1(@formatjs/intl@2.10.4(typescript@5.5.4))
       apexcharts:
         specifier: ^3.44.0
         version: 3.49.2
@@ -1554,6 +1563,9 @@ packages:
       ts-jest:
         optional: true
 
+  '@geometrically/minecraft-motd-parser@1.1.4':
+    resolution: {integrity: sha512-iW4mddbyLu2j2CUB8ODAuAEVpyf0ryzkDNmHQl3YbUL9s6jzKCBYWkfTqr61Yhse+nfA98JARc2Cw2R/rZebog==}
+
   '@humanfs/core@0.19.0':
     resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==}
     engines: {node: '>=18.18.0'}
@@ -2332,88 +2344,99 @@ packages:
     peerDependencies:
       eslint: '>=8.40.0'
 
-  '@tauri-apps/api@2.1.1':
-    resolution: {integrity: sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==}
+  '@taijased/vue-render-tracker@1.0.7':
+    resolution: {integrity: sha512-nW3eYHdqRiA1AhhOm2rHxHAQCTww9W3CDHd4DYFniqwy29X1W5HXeNjr/yt+8kysTqJsb5PUv0tN6nghKmPq5w==}
+    peerDependencies:
+      vue: ^3.0.0
 
-  '@tauri-apps/cli-darwin-arm64@2.1.0':
-    resolution: {integrity: sha512-ESc6J6CE8hl1yKH2vJ+ALF+thq4Be+DM1mvmTyUCQObvezNCNhzfS6abIUd3ou4x5RGH51ouiANeT3wekU6dCw==}
+  '@tauri-apps/api@2.5.0':
+    resolution: {integrity: sha512-Ldux4ip+HGAcPUmuLT8EIkk6yafl5vK0P0c0byzAKzxJh7vxelVtdPONjfgTm96PbN24yjZNESY8CKo8qniluA==}
+
+  '@tauri-apps/cli-darwin-arm64@2.5.0':
+    resolution: {integrity: sha512-VuVAeTFq86dfpoBDNYAdtQVLbP0+2EKCHIIhkaxjeoPARR0sLpFHz2zs0PcFU76e+KAaxtEtAJAXGNUc8E1PzQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@2.1.0':
-    resolution: {integrity: sha512-TasHS442DFs8cSH2eUQzuDBXUST4ECjCd0yyP+zZzvAruiB0Bg+c8A+I/EnqCvBQ2G2yvWLYG8q/LI7c87A5UA==}
+  '@tauri-apps/cli-darwin-x64@2.5.0':
+    resolution: {integrity: sha512-hUF01sC06cZVa8+I0/VtsHOk9BbO75rd+YdtHJ48xTdcYaQ5QIwL4yZz9OR1AKBTaUYhBam8UX9Pvd5V2/4Dpw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.1.0':
-    resolution: {integrity: sha512-aP7ZBGNL4ny07Cbb6kKpUOSrmhcIK2KhjviTzYlh+pPhAptxnC78xQGD3zKQkTi2WliJLPmBYbOHWWQa57lQ9w==}
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.5.0':
+    resolution: {integrity: sha512-LQKqttsK252LlqYyX8R02MinUsfFcy3+NZiJwHFgi5Y3+ZUIAED9cSxJkyNtuY5KMnR4RlpgWyLv4P6akN1xhg==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.1.0':
-    resolution: {integrity: sha512-ZTdgD5gLeMCzndMT2f358EkoYkZ5T+Qy6zPzU+l5vv5M7dHVN9ZmblNAYYXmoOuw7y+BY4X/rZvHV9pcGrcanQ==}
+  '@tauri-apps/cli-linux-arm64-gnu@2.5.0':
+    resolution: {integrity: sha512-mTQufsPcpdHg5RW0zypazMo4L55EfeE5snTzrPqbLX4yCK2qalN7+rnP8O8GT06xhp6ElSP/Ku1M2MR297SByQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-musl@2.1.0':
-    resolution: {integrity: sha512-NzwqjUCilhnhJzusz3d/0i0F1GFrwCQbkwR6yAHUxItESbsGYkZRJk0yMEWkg3PzFnyK4cWTlQJMEU52TjhEzA==}
+  '@tauri-apps/cli-linux-arm64-musl@2.5.0':
+    resolution: {integrity: sha512-rQO1HhRUQqyEaal5dUVOQruTRda/TD36s9kv1hTxZiFuSq3558lsTjAcUEnMAtBcBkps20sbyTJNMT0AwYIk8Q==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-x64-gnu@2.1.0':
-    resolution: {integrity: sha512-TyiIpMEtZxNOQmuFyfJwaaYbg3movSthpBJLIdPlKxSAB2BW0VWLY3/ZfIxm/G2YGHyREkjJvimzYE0i37PnMA==}
+  '@tauri-apps/cli-linux-riscv64-gnu@2.5.0':
+    resolution: {integrity: sha512-7oS18FN46yDxyw1zX/AxhLAd7T3GrLj3Ai6s8hZKd9qFVzrAn36ESL7d3G05s8wEtsJf26qjXnVF4qleS3dYsA==}
+    engines: {node: '>= 10'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@tauri-apps/cli-linux-x64-gnu@2.5.0':
+    resolution: {integrity: sha512-SG5sFNL7VMmDBdIg3nO3EzNRT306HsiEQ0N90ILe3ZABYAVoPDO/ttpCO37ApLInTzrq/DLN+gOlC/mgZvLw1w==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-x64-musl@2.1.0':
-    resolution: {integrity: sha512-/dQd0TlaxBdJACrR72DhynWftzHDaX32eBtS5WBrNJ+nnNb+znM3gON6nJ9tSE9jgDa6n1v2BkI/oIDtypfUXw==}
+  '@tauri-apps/cli-linux-x64-musl@2.5.0':
+    resolution: {integrity: sha512-QXDM8zp/6v05PNWju5ELsVwF0VH1n6b5pk2E6W/jFbbiwz80Vs1lACl9pv5kEHkrxBj+aWU/03JzGuIj2g3SkQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.1.0':
-    resolution: {integrity: sha512-NdQJO7SmdYqOcE+JPU7bwg7+odfZMWO6g8xF9SXYCMdUzvM2Gv/AQfikNXz5yS7ralRhNFuW32i5dcHlxh4pDg==}
+  '@tauri-apps/cli-win32-arm64-msvc@2.5.0':
+    resolution: {integrity: sha512-pFSHFK6b+o9y4Un8w0gGLwVyFTZaC3P0kQ7umRt/BLDkzD5RnQ4vBM7CF8BCU5nkwmEBUCZd7Wt3TWZxe41o6Q==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.1.0':
-    resolution: {integrity: sha512-f5h8gKT/cB8s1ticFRUpNmHqkmaLutT62oFDB7N//2YTXnxst7EpMIn1w+QimxTvTk2gcx6EcW6bEk/y2hZGzg==}
+  '@tauri-apps/cli-win32-ia32-msvc@2.5.0':
+    resolution: {integrity: sha512-EArv1IaRlogdLAQyGlKmEqZqm5RfHCUMhJoedWu7GtdbOMUfSAz6FMX2boE1PtEmNO4An+g188flLeVErrxEKg==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@2.1.0':
-    resolution: {integrity: sha512-P/+LrdSSb5Xbho1LRP4haBjFHdyPdjWvGgeopL96OVtrFpYnfC+RctB45z2V2XxqFk3HweDDxk266btjttfjGw==}
+  '@tauri-apps/cli-win32-x64-msvc@2.5.0':
+    resolution: {integrity: sha512-lj43EFYbnAta8pd9JnUq87o+xRUR0odz+4rixBtTUwUgdRdwQ2V9CzFtsMu6FQKpFQ6mujRK6P1IEwhL6ADRsQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@2.1.0':
-    resolution: {integrity: sha512-K2VhcKqBhAeS5pNOVdnR/xQRU6jwpgmkSL2ejHXcl0m+kaTggT0WRDQnFtPq6NljA7aE03cvwsbCAoFG7vtkJw==}
+  '@tauri-apps/cli@2.5.0':
+    resolution: {integrity: sha512-rAtHqG0Gh/IWLjN2zTf3nZqYqbo81oMbqop56rGTjrlWk9pTTAjkqOjSL9XQLIMZ3RbeVjveCqqCA0s8RnLdMg==}
     engines: {node: '>= 10'}
     hasBin: true
 
-  '@tauri-apps/plugin-dialog@2.2.0':
-    resolution: {integrity: sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==}
+  '@tauri-apps/plugin-dialog@2.2.2':
+    resolution: {integrity: sha512-Pm9qnXQq8ZVhAMFSEPwxvh+nWb2mk7LASVlNEHYaksHvcz8P6+ElR5U5dNL9Ofrm+uwhh1/gYKWswK8JJJAh6A==}
 
-  '@tauri-apps/plugin-opener@2.2.1':
-    resolution: {integrity: sha512-zloo4xzBqeh363xNA+xYt+7+/cu/lPYuG5PRtxjWAaSyfMqFo6IINdizkDBYylUewLiplXb5+S65GLVkeXTHPg==}
+  '@tauri-apps/plugin-opener@2.2.7':
+    resolution: {integrity: sha512-uduEyvOdjpPOEeDRrhwlCspG/f9EQalHumWBtLBnp3fRp++fKGLqDOyUhSIn7PzX45b/rKep//ZQSAQoIxobLA==}
 
-  '@tauri-apps/plugin-os@2.2.0':
-    resolution: {integrity: sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==}
+  '@tauri-apps/plugin-os@2.2.1':
+    resolution: {integrity: sha512-cNYpNri2CCc6BaNeB6G/mOtLvg8dFyFQyCUdf2y0K8PIAKGEWdEcu8DECkydU2B+oj4OJihDPD2de5K6cbVl9A==}
 
-  '@tauri-apps/plugin-updater@2.3.0':
-    resolution: {integrity: sha512-qdzyZEUN69FZQ/nRx51fBub10tT6wffJl3DLVo9q922Gvw8Wk++rZhoD9eethPlZYbog/7RGgT8JkrfLh5BKAg==}
+  '@tauri-apps/plugin-updater@2.7.1':
+    resolution: {integrity: sha512-1OPqEY/z7NDVSeTEMIhD2ss/vXWdpfZ5Th2Mk0KtPR/RA6FKuOTDGZQhxoyYBk0pcZJ+nNZUbl/IujDCLBApjA==}
 
-  '@tauri-apps/plugin-window-state@2.2.0':
-    resolution: {integrity: sha512-PFZ/vkZ6UPaRyuggEn8jWc/xwpiEw3Id8i6bin54zUR3vHY0MOK+ovvpvp6SEHKryCJbZMigYJz0OUT2eZ4YmQ==}
+  '@tauri-apps/plugin-window-state@2.2.2':
+    resolution: {integrity: sha512-7pFwmMtGhhhE/WgmM7PUrj0BSSWVAQMfDdYbRalphIqqF1tWBvxtlxclx8bTutpXHLJTQoCpIeWtBEIXsoAlGw==}
 
   '@trysound/sax@0.2.0':
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
@@ -8825,6 +8848,8 @@ snapshots:
       tslib: 2.6.3
       typescript: 5.8.2
 
+  '@geometrically/minecraft-motd-parser@1.1.4': {}
+
   '@humanfs/core@0.19.0': {}
 
   '@humanfs/node@0.16.5':
@@ -9889,70 +9914,78 @@ snapshots:
       - supports-color
       - typescript
 
-  '@tauri-apps/api@2.1.1': {}
+  '@taijased/vue-render-tracker@1.0.7(vue@3.5.13(typescript@5.5.4))':
+    dependencies:
+      vue: 3.5.13(typescript@5.5.4)
 
-  '@tauri-apps/cli-darwin-arm64@2.1.0':
+  '@tauri-apps/api@2.5.0': {}
+
+  '@tauri-apps/cli-darwin-arm64@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@2.1.0':
+  '@tauri-apps/cli-darwin-x64@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.1.0':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.1.0':
+  '@tauri-apps/cli-linux-arm64-gnu@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@2.1.0':
+  '@tauri-apps/cli-linux-arm64-musl@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@2.1.0':
+  '@tauri-apps/cli-linux-riscv64-gnu@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@2.1.0':
+  '@tauri-apps/cli-linux-x64-gnu@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.1.0':
+  '@tauri-apps/cli-linux-x64-musl@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.1.0':
+  '@tauri-apps/cli-win32-arm64-msvc@2.5.0':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@2.1.0':
+  '@tauri-apps/cli-win32-ia32-msvc@2.5.0':
     optional: true
 
-  '@tauri-apps/cli@2.1.0':
+  '@tauri-apps/cli-win32-x64-msvc@2.5.0':
+    optional: true
+
+  '@tauri-apps/cli@2.5.0':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 2.1.0
-      '@tauri-apps/cli-darwin-x64': 2.1.0
-      '@tauri-apps/cli-linux-arm-gnueabihf': 2.1.0
-      '@tauri-apps/cli-linux-arm64-gnu': 2.1.0
-      '@tauri-apps/cli-linux-arm64-musl': 2.1.0
-      '@tauri-apps/cli-linux-x64-gnu': 2.1.0
-      '@tauri-apps/cli-linux-x64-musl': 2.1.0
-      '@tauri-apps/cli-win32-arm64-msvc': 2.1.0
-      '@tauri-apps/cli-win32-ia32-msvc': 2.1.0
-      '@tauri-apps/cli-win32-x64-msvc': 2.1.0
+      '@tauri-apps/cli-darwin-arm64': 2.5.0
+      '@tauri-apps/cli-darwin-x64': 2.5.0
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.5.0
+      '@tauri-apps/cli-linux-arm64-gnu': 2.5.0
+      '@tauri-apps/cli-linux-arm64-musl': 2.5.0
+      '@tauri-apps/cli-linux-riscv64-gnu': 2.5.0
+      '@tauri-apps/cli-linux-x64-gnu': 2.5.0
+      '@tauri-apps/cli-linux-x64-musl': 2.5.0
+      '@tauri-apps/cli-win32-arm64-msvc': 2.5.0
+      '@tauri-apps/cli-win32-ia32-msvc': 2.5.0
+      '@tauri-apps/cli-win32-x64-msvc': 2.5.0
 
-  '@tauri-apps/plugin-dialog@2.2.0':
+  '@tauri-apps/plugin-dialog@2.2.2':
     dependencies:
-      '@tauri-apps/api': 2.1.1
+      '@tauri-apps/api': 2.5.0
 
-  '@tauri-apps/plugin-opener@2.2.1':
+  '@tauri-apps/plugin-opener@2.2.7':
     dependencies:
-      '@tauri-apps/api': 2.1.1
+      '@tauri-apps/api': 2.5.0
 
-  '@tauri-apps/plugin-os@2.2.0':
+  '@tauri-apps/plugin-os@2.2.1':
     dependencies:
-      '@tauri-apps/api': 2.1.1
+      '@tauri-apps/api': 2.5.0
 
-  '@tauri-apps/plugin-updater@2.3.0':
+  '@tauri-apps/plugin-updater@2.7.1':
     dependencies:
-      '@tauri-apps/api': 2.1.1
+      '@tauri-apps/api': 2.5.0
 
-  '@tauri-apps/plugin-window-state@2.2.0':
+  '@tauri-apps/plugin-window-state@2.2.2':
     dependencies:
-      '@tauri-apps/api': 2.1.1
+      '@tauri-apps/api': 2.5.0
 
   '@trysound/sax@0.2.0': {}
 
diff --git a/rustfmt.toml b/rustfmt.toml
index 0c2ca5c3..9630782e 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,2 +1,2 @@
-edition = "2018"
+edition = "2024"
 max_width = 80