diff --git a/.gitignore b/.gitignore
index 4bdad0a..406eb78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 # SPDX-FileCopyrightText: 2024-2025 Simon Repp
 # SPDX-License-Identifier: CC0-1.0
 
-/docs/target/
 /target/
diff --git a/BUILD.md b/BUILD.md
index 82414b2..b712798 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -36,7 +36,7 @@ cd hyper8
 Now run this command:
 
 ```bash
-cargo install --locked --path .
+cargo install --locked --path cli
 ```
 
 ## Uninstalling
diff --git a/Cargo.lock b/Cargo.lock
index 28ec1b9..cb2c6cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "actix-codec"
@@ -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.4",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -21,17 +21,17 @@ dependencies = [
 
 [[package]]
 name = "actix-files"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be"
+checksum = "22c8b5536deb14cd9c3e505bd0e3366e1a12383b659c92f2b4fa4d323d583599"
 dependencies = [
  "actix-http",
  "actix-service",
  "actix-utils",
  "actix-web",
- "bitflags 2.9.0",
+ "bitflags 2.9.4",
  "bytes",
- "derive_more 0.99.19",
+ "derive_more 2.0.1",
  "futures-core",
  "http-range",
  "log",
@@ -44,16 +44,16 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.11.0"
+version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
+checksum = "44cceded2fb55f3c4b67068fa64962e2ca59614edc5b03167de9ff82ae803da0"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
- "base64",
- "bitflags 2.9.0",
+ "base64 0.22.1",
+ "bitflags 2.9.4",
  "brotli",
  "bytes",
  "bytestring",
@@ -72,7 +72,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rand 0.9.1",
+ "rand 0.9.2",
  "sha1",
  "smallvec",
  "tokio",
@@ -100,7 +100,7 @@ dependencies = [
  "actix-multipart-derive",
  "actix-utils",
  "actix-web",
- "derive_more 0.99.19",
+ "derive_more 0.99.20",
  "futures-core",
  "futures-util",
  "httparse",
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "actix-rt"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
 dependencies = [
  "futures-core",
  "tokio",
@@ -166,7 +166,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "mio",
- "socket2",
+ "socket2 0.5.10",
  "tokio",
  "tracing",
 ]
@@ -181,6 +181,23 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "actix-session"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "400c27fd4cdbe0082b7bbd29ac44a3070cbda1b2114138dc106ba39fe2f90dff"
+dependencies = [
+ "actix-service",
+ "actix-utils",
+ "actix-web",
+ "anyhow",
+ "derive_more 2.0.1",
+ "rand 0.9.2",
+ "serde",
+ "serde_json",
+ "tracing",
+]
+
 [[package]]
 name = "actix-utils"
 version = "3.0.1"
@@ -228,7 +245,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2",
+ "socket2 0.5.10",
  "time",
  "tracing",
  "url",
@@ -257,9 +274,44 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[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 = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
 
 [[package]]
 name = "aho-corasick"
@@ -272,9 +324,12 @@ dependencies = [
 
 [[package]]
 name = "aligned-vec"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
 
 [[package]]
 name = "alloc-no-stdlib"
@@ -308,9 +363,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -323,50 +378,50 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
 dependencies = [
  "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
 [[package]]
 name = "arbitrary"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
 [[package]]
 name = "arg_enum_proc_macro"
@@ -387,15 +442,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "av1-grain"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
+checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8"
 dependencies = [
  "anyhow",
  "arrayvec",
@@ -407,18 +462,18 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e"
+checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f"
 dependencies = [
  "arrayvec",
 ]
 
 [[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",
@@ -429,6 +484,12 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "base64"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -446,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "bit_field"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6"
 
 [[package]]
 name = "bitflags"
@@ -458,9 +519,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 
 [[package]]
 name = "bitstream-io"
@@ -479,9 +540,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "8.0.1"
+version = "8.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -506,15 +567,15 @@ checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.22.0"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
 
 [[package]]
 name = "byteorder-lite"
@@ -539,10 +600,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -566,9 +628,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "chrono"
@@ -586,20 +648,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "clap"
-version = "4.5.40"
+name = "cipher"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
 dependencies = [
  "clap_builder",
- "clap_derive",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
 dependencies = [
  "anstream",
  "anstyle",
@@ -607,23 +678,11 @@ dependencies = [
  "strsim",
 ]
 
-[[package]]
-name = "clap_derive"
-version = "4.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "color_quant"
@@ -633,9 +692,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "combine"
@@ -659,7 +718,14 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
 dependencies = [
+ "aes-gcm",
+ "base64 0.20.0",
+ "hkdf",
+ "hmac",
  "percent-encoding",
+ "rand 0.8.5",
+ "sha2",
+ "subtle",
  "time",
  "version_check",
 ]
@@ -676,9 +742,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",
@@ -701,9 +767,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -735,9 +801,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
@@ -746,14 +812,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
 [[package]]
-name = "darling"
-version = "0.20.10"
+name = "ctr"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -761,9 +837,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
@@ -775,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
@@ -786,9 +862,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
 dependencies = [
  "powerfmt",
  "serde",
@@ -796,9 +872,9 @@ dependencies = [
 
 [[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",
  "proc-macro2",
@@ -830,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "deunicode"
-version = "1.6.0"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
 
 [[package]]
 name = "digest"
@@ -842,27 +918,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
-]
-
-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.59.0",
+ "subtle",
 ]
 
 [[package]]
@@ -925,6 +981,26 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -933,12 +1009,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -972,22 +1048,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "filetime"
-version = "0.2.25"
+name = "find-msvc-tools"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
- "windows-sys 0.59.0",
-]
+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
 
 [[package]]
 name = "flate2"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1001,9 +1071,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "foreign-types"
@@ -1022,9 +1092,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -1052,9 +1122,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1112,32 +1182,42 @@ 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",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.3+wasi-0.2.4",
+]
+
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
 ]
 
 [[package]]
 name = "gif"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
 dependencies = [
  "color_quant",
  "weezl",
@@ -1151,9 +1231,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
 dependencies = [
  "bytes",
  "fnv",
@@ -1170,9 +1250,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -1180,9 +1260,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 
 [[package]]
 name = "heck"
@@ -1190,6 +1270,24 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -1220,22 +1318,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
-name = "hyper8"
+name = "hyper8-cli"
 version = "0.23.0"
 dependencies = [
- "actix-files",
- "actix-multipart",
- "actix-web",
- "base64",
- "bincode",
- "chrono",
+ "base64 0.22.1",
  "clap",
- "dirs",
  "dunce",
  "enolib",
  "env_logger",
+ "hyper8-core",
+ "hyper8-translations",
+ "hyper8-version",
+ "hyper8-web",
+ "indoc",
+ "slug",
+ "sys-locale",
+ "webbrowser",
+]
+
+[[package]]
+name = "hyper8-core"
+version = "0.23.0"
+dependencies = [
+ "actix-files",
+ "actix-web",
+ "base64 0.22.1",
+ "bincode",
+ "chrono",
+ "enolib",
  "form_urlencoded",
- "futures-util",
+ "hyper8-icons",
+ "hyper8-translations",
+ "hyper8-version",
  "icu_collator",
  "icu_locale",
  "image",
@@ -1245,14 +1359,13 @@ dependencies = [
  "minreq",
  "nanoid",
  "notify",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rsubs-lib",
  "serde",
  "serde_derive",
  "serde_json",
  "slug",
  "suppaftp",
- "sys-locale",
  "tokio",
  "url",
  "urlencoding",
@@ -1260,16 +1373,75 @@ dependencies = [
  "webbrowser",
 ]
 
+[[package]]
+name = "hyper8-docs"
+version = "0.23.0"
+dependencies = [
+ "base64 0.22.1",
+ "enolib",
+ "hyper8-version",
+ "indoc",
+ "pulldown-cmark",
+ "slug",
+]
+
+[[package]]
+name = "hyper8-icons"
+version = "0.23.0"
+dependencies = [
+ "indoc",
+]
+
+[[package]]
+name = "hyper8-translations"
+version = "0.23.0"
+dependencies = [
+ "indoc",
+]
+
+[[package]]
+name = "hyper8-version"
+version = "0.23.0"
+
+[[package]]
+name = "hyper8-web"
+version = "0.23.0"
+dependencies = [
+ "actix-files",
+ "actix-multipart",
+ "actix-session",
+ "actix-web",
+ "base64 0.22.1",
+ "bincode",
+ "chrono",
+ "futures-util",
+ "hyper8-core",
+ "hyper8-icons",
+ "hyper8-translations",
+ "hyper8-version",
+ "indoc",
+ "language-tags",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "slug",
+ "tokio",
+ "url",
+ "urlencoding",
+ "webbrowser",
+]
+
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -1291,16 +1463,16 @@ checksum = "42ad4c6a556938dfd31f75a8c54141079e8821dc697ffb799cfe0f0fa11f2edc"
 dependencies = [
  "displaydoc",
  "icu_collator_data",
- "icu_collections 2.0.0",
+ "icu_collections",
  "icu_locale",
  "icu_locale_core",
- "icu_normalizer 2.0.0",
- "icu_properties 2.0.1",
- "icu_provider 2.0.0",
+ "icu_normalizer",
+ "icu_properties",
+ "icu_provider",
  "smallvec",
  "utf16_iter",
  "utf8_iter",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -1309,18 +1481,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d880b8e680799eabd90c054e1b95526cd48db16c95269f3c89fb3117e1ac92c5"
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke 0.7.5",
- "zerofrom",
- "zerovec 0.10.4",
-]
-
 [[package]]
 name = "icu_collections"
 version = "2.0.0"
@@ -1329,9 +1489,9 @@ checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
  "potential_utf",
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -1341,13 +1501,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ae5921528335e91da1b6c695dbf1ec37df5ac13faa3f91e5640be93aa2fbefd"
 dependencies = [
  "displaydoc",
- "icu_collections 2.0.0",
+ "icu_collections",
  "icu_locale_core",
  "icu_locale_data",
- "icu_provider 2.0.0",
+ "icu_provider",
  "potential_utf",
- "tinystr 0.8.1",
- "zerovec 0.11.4",
+ "tinystr",
+ "zerovec",
 ]
 
 [[package]]
@@ -1357,10 +1517,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
- "litemap 0.8.0",
- "tinystr 0.8.1",
- "writeable 0.6.1",
- "zerovec 0.11.4",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]
 
 [[package]]
@@ -1369,57 +1529,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fdef0c124749d06a743c69e938350816554eb63ac979166590e2b4ee4252765"
 
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap 0.7.4",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "zerovec 0.10.4",
-]
-
-[[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 1.5.0",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections 1.5.0",
- "icu_normalizer_data 1.5.0",
- "icu_properties 1.5.1",
- "icu_provider 1.5.0",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec 0.10.4",
-]
-
 [[package]]
 name = "icu_normalizer"
 version = "2.0.0"
@@ -1427,41 +1536,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
- "icu_collections 2.0.0",
- "icu_normalizer_data 2.0.0",
- "icu_properties 2.0.1",
- "icu_provider 2.0.0",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
  "smallvec",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
 [[package]]
 name = "icu_normalizer_data"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections 1.5.0",
- "icu_locid_transform",
- "icu_properties_data 1.5.0",
- "icu_provider 1.5.0",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
-]
-
 [[package]]
 name = "icu_properties"
 version = "2.0.1"
@@ -1469,44 +1557,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
- "icu_collections 2.0.0",
+ "icu_collections",
  "icu_locale_core",
- "icu_properties_data 2.0.1",
- "icu_provider 2.0.0",
+ "icu_properties_data",
+ "icu_provider",
  "potential_utf",
  "zerotrie",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
 [[package]]
 name = "icu_properties_data"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "yoke 0.7.5",
- "zerofrom",
- "zerovec 0.10.4",
-]
-
 [[package]]
 name = "icu_provider"
 version = "2.0.0"
@@ -1516,23 +1581,12 @@ dependencies = [
  "displaydoc",
  "icu_locale_core",
  "stable_deref_trait",
- "tinystr 0.8.1",
- "writeable 0.6.1",
- "yoke 0.8.0",
+ "tinystr",
+ "writeable",
+ "yoke",
  "zerofrom",
  "zerotrie",
- "zerovec 0.11.4",
-]
-
-[[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",
+ "zerovec",
 ]
 
 [[package]]
@@ -1543,9 +1597,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1554,12 +1608,12 @@ 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 1.5.0",
- "icu_properties 1.5.1",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1587,9 +1641,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
+checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -1609,9 +1663,9 @@ checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1629,7 +1683,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.4",
  "inotify-sys",
  "libc",
 ]
@@ -1643,6 +1697,15 @@ 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 = "interpolate_name"
 version = "0.2.4"
@@ -1654,6 +1717,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
+dependencies = [
+ "bitflags 2.9.4",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1677,9 +1751,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
 dependencies = [
  "jiff-static",
  "log",
@@ -1690,9 +1764,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1723,18 +1797,19 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
+ "getrandom 0.3.3",
  "libc",
 ]
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
 
 [[package]]
 name = "js-sys"
@@ -1748,9 +1823,9 @@ dependencies = [
 
 [[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",
@@ -1803,42 +1878,25 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
 dependencies = [
  "arbitrary",
  "cc",
 ]
 
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.9.0",
- "libc",
- "redox_syscall",
-]
-
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
-
-[[package]]
-name = "litemap"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
@@ -1865,9 +1923,9 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1900,9 +1958,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "mime"
@@ -1928,9 +1986,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -1938,9 +1996,9 @@ dependencies = [
 
 [[package]]
 name = "minreq"
-version = "2.13.4"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d2aaba477837b46ec1289588180fabfccf0c3b1d1a0c6b1866240cd6cd5ce9"
+checksum = "84885312a86831bff4a3cb04a1e54a3f698407e3274c83249313f194d3e0b678"
 dependencies = [
  "log",
  "rustls",
@@ -1950,14 +2008,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2016,12 +2074,11 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
 [[package]]
 name = "notify"
-version = "8.0.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.0",
- "filetime",
+ "bitflags 2.9.4",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -2030,7 +2087,7 @@ dependencies = [
  "mio",
  "notify-types",
  "walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2097,9 +2154,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
+checksum = "561f357ba7f3a2a61563a186a163d0a3a5247e1089524a3981d49adb775078bc"
 dependencies = [
  "objc2-encode",
 ]
@@ -2112,11 +2169,11 @@ checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
 
 [[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.0",
+ "bitflags 2.9.4",
  "objc2",
 ]
 
@@ -2131,17 +2188,29 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.4",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2169,9 +2238,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -2179,12 +2248,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2193,9 +2256,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2203,9 +2266,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2216,9 +2279,9 @@ dependencies = [
 
 [[package]]
 name = "parse-size"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae"
+checksum = "487f2ccd1e17ce8c1bfab3a65c89525af41cfad4c8659021a1e9a2aacd73b89b"
 
 [[package]]
 name = "paste"
@@ -2228,9 +2291,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project-lite"
@@ -2263,6 +2326,18 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.1"
@@ -2280,12 +2355,12 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "serde",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -2305,32 +2380,50 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
+checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
 dependencies = [
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
+dependencies = [
+ "bitflags 2.9.4",
+ "memchr",
+ "pulldown-cmark-escape",
+ "unicase",
+]
+
+[[package]]
+name = "pulldown-cmark-escape"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
+
 [[package]]
 name = "pure-rust-locales"
 version = "0.8.1"
@@ -2354,13 +2447,19 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.39"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2374,9 +2473,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -2408,7 +2507,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]]
@@ -2417,7 +2516,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
 ]
 
 [[package]]
@@ -2457,9 +2556,9 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.11"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
+checksum = "5825c26fddd16ab9f515930d49028a630efec172e903483c94796cfe31893e6b"
 dependencies = [
  "avif-serialize",
  "imgref",
@@ -2472,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -2482,9 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2492,29 +2591,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror 2.0.12",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2524,9 +2612,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2535,31 +2623,31 @@ dependencies = [
 
 [[package]]
 name = "regex-lite"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "rgb"
-version = "0.8.50"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
+checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
 
 [[package]]
 name = "ring"
-version = "0.17.13"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -2578,9 +2666,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustc_version"
@@ -2593,15 +2681,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.2"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2628,9 +2716,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -2678,7 +2766,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.4",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -2723,9 +2811,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "itoa",
  "memchr",
@@ -2744,9 +2832,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -2780,6 +2868,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -2788,9 +2887,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
 dependencies = [
  "libc",
 ]
@@ -2812,12 +2911,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slug"
@@ -2831,20 +2927,30 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -2857,6 +2963,12 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "suppaftp"
 version = "6.3.0"
@@ -2868,14 +2980,14 @@ dependencies = [
  "lazy-regex",
  "log",
  "native-tls",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2884,9 +2996,9 @@ 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",
@@ -2923,16 +3035,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.18.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
 dependencies = [
- "cfg-if",
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2946,11 +3057,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.16",
 ]
 
 [[package]]
@@ -2966,9 +3077,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2988,12 +3099,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "8ca967379f9d8eb8058d86ed467d81d03e81acd45757e4ca341c24affbe8e8e3"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -3003,30 +3113,20 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "a9108bb380861b07264b950ded55a44a14a4adc68b9f5efd85aafc3aa4d40a68"
 
 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "7182799245a7264ce590b349d90338f1c1affad93d2639aed5f8f69c090b334c"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec 0.10.4",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -3034,25 +3134,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "slab",
+ "socket2 0.6.0",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3068,9 +3170,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3081,9 +3183,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.20"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3093,18 +3195,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
  "serde",
@@ -3127,9 +3229,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3138,9 +3240,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
 ]
@@ -3169,6 +3271,16 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -3177,13 +3289,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -3212,9 +3325,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.17.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
  "js-sys",
  "sha1_smol",
@@ -3223,9 +3336,9 @@ dependencies = [
 
 [[package]]
 name = "v_frame"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2"
 dependencies = [
  "aligned-vec",
  "num-traits",
@@ -3268,17 +3381,17 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.3+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -3355,7 +3468,7 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aaf4f3c0ba838e82b4e5ccc4157003fb8c324ee24c058470ffb82820becbde98"
 dependencies = [
- "core-foundation 0.10.0",
+ "core-foundation 0.10.1",
  "jni",
  "log",
  "ndk-context",
@@ -3373,33 +3486,77 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[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 = "winapi-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[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",
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link",
+]
 
 [[package]]
 name = "windows-sys"
@@ -3428,6 +3585,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -3452,13 +3618,30 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -3471,6 +3654,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -3483,6 +3672,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -3495,12 +3690,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -3513,6 +3720,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -3525,6 +3738,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -3537,6 +3756,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -3550,34 +3775,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.7.3"
+name = "windows_x86_64_msvc"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.33.0"
+name = "wit-bindgen"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
-dependencies = [
- "bitflags 2.9.0",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
 
 [[package]]
 name = "writeable"
@@ -3585,18 +3801,6 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive 0.7.5",
- "zerofrom",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.0"
@@ -3605,22 +3809,10 @@ checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
- "yoke-derive 0.8.0",
+ "yoke-derive",
  "zerofrom",
 ]
 
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
 [[package]]
 name = "yoke-derive"
 version = "0.8.0"
@@ -3635,18 +3827,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.23"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.23"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3655,9 +3847,9 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
@@ -3681,41 +3873,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
 dependencies = [
  "displaydoc",
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
 ]
 
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke 0.7.5",
- "zerofrom",
- "zerovec-derive 0.10.3",
-]
-
 [[package]]
 name = "zerovec"
 version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
 dependencies = [
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
- "zerovec-derive 0.11.1",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "zerovec-derive",
 ]
 
 [[package]]
@@ -3740,18 +3910,18 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.3"
+version = "7.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.14+zstd.1.5.7"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3774,9 +3944,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.14"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
+checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089"
 dependencies = [
  "zune-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 53beae5..f792f9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,23 @@
 # SPDX-FileCopyrightText: 2024-2025 Simon Repp
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-[package]
-edition = "2021"
-name = "hyper8"
-rust-version = "1.82"
-version = "0.23.0"
+[workspace]
+members = [
+	"cli",
+	"core",
+	"docs",
+	"icons",
+	"translations",
+	"version",
+	"web"
+]
+resolver = "2"
 
-[build-dependencies]
-base64 = "0.22.1"
-
-[dependencies]
+[workspace.dependencies]
 actix-files = "0.6.6"
 actix-multipart = "0.7.2"
-actix-web = "4.11.0"
+actix-session = { features = ["cookie-session"], version = "0.11.0" }
+actix-web = { version = "4.11.0" }
 base64 = "0.22.1"
 # bincode 2.x is available but it includes breaking changes (on the API level,
 # encoded data is "completely compatible if the same configuration is used")
@@ -21,7 +25,7 @@ base64 = "0.22.1"
 # update.
 bincode = "1.3.3"
 chrono = { features = ["unstable-locales"], version = "0.4.41" }
-clap = { features = ["derive"], version = "4.5.40" }
+clap = "4.5.40"
 dirs = "6.0.0"
 dunce = "1.0.5"
 enolib = { git = "https://codeberg.org/simonrepp/enolib-rs", tag = "0.5.0" }
@@ -37,6 +41,7 @@ log = "0.4.27"
 minreq = { features = ["https-rustls"], version = "2.13.4" }
 nanoid = "0.4.0"
 notify = "8.0.0"
+pulldown-cmark = { default-features = false, features = ["html", "simd"], version = "0.13.0" }
 rand = "0.9.1"
 rsubs-lib = "0.3.3"
 serde = "1.0.219"
@@ -46,7 +51,12 @@ slug = "0.1.6"
 suppaftp = { features = ["native-tls"], version = "6.3.0" }
 sys-locale = "0.3.2"
 tokio = { features = ["macros", "rt-multi-thread"], version = "1.45.1" }
-uuid = { features = ["v5"], version = "1.17.0" }
 url = "2.5.4"
 urlencoding = "2.1.3"
+uuid = { features = ["v5"], version = "1.17.0" }
 webbrowser = "1.0.5"
+
+[workspace.package]
+edition = "2021"
+rust-version = "1.82"
+version = "0.23.0"
diff --git a/build.rs b/build.rs
deleted file mode 100644
index 7defcbe..0000000
--- a/build.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-//! Build hyper8 with (e.g.) HYPER8_VERSION=2.0.0~pre1 to override
-//! the version that is displayed and reported in resulting builds.
-
-use std::env;
-use std::hash::{DefaultHasher, Hash, Hasher};
-use std::process::Command;
-
-use base64::Engine;
-use base64::engine::general_purpose::URL_SAFE_NO_PAD;
-
-/// Provides four variables to the consecutive build step:
-/// - HYPER8_REVISION (If git is available the short commit hash, otherwise "unknown revision")
-/// - HYPER8_VERSION_ADAPTIVE (The version down to patch level only if it is a patch release, e.g. "1.2.1")
-/// - HYPER8_VERSION_DETAILED (The version down to patch level, e.g. "1.2.0")
-/// - HYPER8_VERSION_DISPLAY (The version for pretty display, without patch level, e.g. "1.2")
-///
-/// If HYPER8_VERSION is used to override the version, both HYPER8_VERSION_DETAILED and
-/// HYPER8_VERSION_DISPLAY will contain its value, e.g. "2.0.0~pre1".
-fn main() {
-    let version_adaptive;
-    let version_detailed;
-    let version_display;
-    if let Ok(override_version) = env::var("HYPER8_VERSION") {
-        version_adaptive = override_version.clone();
-        version_detailed = override_version.clone();
-        version_display = override_version;
-    } else {
-        version_adaptive = match env!("CARGO_PKG_VERSION_PATCH") {
-            "0" => concat!(env!("CARGO_PKG_VERSION_MAJOR"), '.', env!("CARGO_PKG_VERSION_MINOR")).to_string(),
-            _ => env!("CARGO_PKG_VERSION").to_string()
-        };
-        version_detailed = env!("CARGO_PKG_VERSION").to_string();
-        version_display = concat!(env!("CARGO_PKG_VERSION_MAJOR"), '.', env!("CARGO_PKG_VERSION_MINOR")).to_string();
-    }
-
-    let mut git = Command::new("git");
-    git.args(["rev-parse", "--short", "HEAD"]);
-    let revision = match git.output() {
-        Ok(output) => String::from_utf8(output.stdout).unwrap(),
-        Err(_) => String::from("unknown revision")
-    };
-
-    println!("cargo:rerun-if-env-changed=HYPER8_VERSION");
-    println!("cargo:rustc-env=HYPER8_REVISION={revision}");
-    println!("cargo:rustc-env=HYPER8_VERSION_ADAPTIVE={version_adaptive}");
-    println!("cargo:rustc-env=HYPER8_VERSION_DETAILED={version_detailed}");
-    println!("cargo:rustc-env=HYPER8_VERSION_DISPLAY={version_display}");
-
-    let static_asset_hash_adaptive_theme_js = url_safe_hash_base64(include_bytes!("src/build/assets/adaptive_theme.js"));
-    let static_asset_hash_clipboard_js = url_safe_hash_base64(include_bytes!("src/build/assets/clipboard.js"));
-    let static_asset_hash_embed_js = url_safe_hash_base64(include_bytes!("src/build/assets/embed.js"));
-    let static_asset_hash_favicon_png = url_safe_hash_base64(include_bytes!("src/build/assets/favicon.png"));
-    let static_asset_hash_video_js = url_safe_hash_base64(include_bytes!("src/build/assets/video.js"));
-
-    println!("cargo:rustc-env=HYPER8_STATIC_ASSET_HASH_ADAPTIVE_THEME_JS={static_asset_hash_adaptive_theme_js}");
-    println!("cargo:rustc-env=HYPER8_STATIC_ASSET_HASH_CLIPBOARD_JS={static_asset_hash_clipboard_js}");
-    println!("cargo:rustc-env=HYPER8_STATIC_ASSET_HASH_EMBED_JS={static_asset_hash_embed_js}");
-    println!("cargo:rustc-env=HYPER8_STATIC_ASSET_HASH_FAVICON_PNG={static_asset_hash_favicon_png}");
-    println!("cargo:rustc-env=HYPER8_STATIC_ASSET_HASH_VIDEO_JS={static_asset_hash_video_js}");
-}
-
-pub fn url_safe_hash_base64(hashable: &impl Hash) -> String {
-    let mut hasher = DefaultHasher::new();
-    hashable.hash(&mut hasher);
-    let hash = hasher.finish();
-    URL_SAFE_NO_PAD.encode(hash.to_le_bytes())
-}
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
new file mode 100644
index 0000000..1d874c5
--- /dev/null
+++ b/cli/Cargo.toml
@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2024-2025 Simon Repp
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+[package]
+edition.workspace = true
+name = "hyper8-cli"
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+base64.workspace = true
+clap.workspace = true
+dunce.workspace = true
+enolib.workspace = true
+env_logger.workspace = true
+hyper8-core.path = "../core"
+hyper8-translations.path = "../translations"
+hyper8-version.path = "../version"
+hyper8-web.path = "../web"
+indoc.workspace = true
+slug.workspace = true
+sys-locale.workspace = true
+webbrowser.workspace = true
diff --git a/cli/src/args.rs b/cli/src/args.rs
new file mode 100644
index 0000000..feeee6f
--- /dev/null
+++ b/cli/src/args.rs
@@ -0,0 +1,86 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::net::IpAddr;
+use std::path::PathBuf;
+
+use clap::{Arg, ArgAction, ArgMatches, Command};
+use clap::value_parser;
+
+use hyper8_version::VERSION_WITH_PATCH_AND_REVISION;
+
+pub fn parse() -> ArgMatches {
+    let build = Arg::new("build")
+        .action(ArgAction::SetTrue)
+        .help("Directly builds the site without starting the editor")
+        .long("build")
+        .short('b');
+
+    let build_dir = Arg::new("build-dir")
+        .help("The path to which the deployable, built site is written")
+        .long("build-dir")
+        .value_parser(value_parser!(PathBuf));
+
+    let cache_dir = Arg::new("cache-dir")
+        .help("The path at which all computational results are stored (computed metadata, images and videos)")
+        .long("cache-dir")
+        .value_parser(value_parser!(PathBuf));
+
+    let deploy = Arg::new("deploy")
+        .action(ArgAction::SetTrue)
+        .help("Directly deploys the site - only applicable in combination with --build")
+        .long("deploy")
+        .short('d');
+
+    let ip = Arg::new("ip")
+        .help("Manually sets the ip address used by the web editor (otherwise defaults to localhost)")
+        .long("ip")
+        .value_parser(value_parser!(IpAddr));
+
+    let port = Arg::new("port")
+        .help("Manually sets the port used by the web editor (otherwise hyper8 chooses an available port on its own)")
+        .long("port")
+        .value_parser(value_parser!(u16));
+
+    let preview = Arg::new("preview")
+        .action(ArgAction::SetTrue)
+        .help("Use in conjunction with --build to immediately open the site in the browser after the build is complete")
+        .long("preview")
+        .short('p');
+
+    let site_dir = Arg::new("site-dir")
+        .help("The path at which the site resides (user videos and metadata)")
+        .required(true)
+        .value_parser(value_parser!(PathBuf));
+
+    let workers = Arg::new("workers")
+        .default_value("2")
+        .help("The number of threads to run for background processing (metadata computation, image processing, video/audio transcoding, etc.)")
+        .long("workers")
+        .value_parser(worker_count);
+
+    let command = Command::new("Hyper 8 Video System")
+        .version(VERSION_WITH_PATCH_AND_REVISION)
+        .about("A static site generator for video publishing")
+        .arg(build)
+        .arg(build_dir)
+        .arg(cache_dir)
+        .arg(deploy)
+        .arg(ip)
+        .arg(port)
+        .arg(preview)
+        .arg(site_dir)
+        .arg(workers);
+
+    command.get_matches()
+}
+
+fn worker_count(string: &str) -> Result<usize, String> {
+    match string.parse::<usize>() {
+        Ok(number) => match number >= 2 {
+            true => Ok(number),
+            false => Err(String::from("At least 2 workers required"))
+        }
+        Err(err) => Err(err.to_string())
+    }
+}
diff --git a/cli/src/deploy.rs b/cli/src/deploy.rs
new file mode 100644
index 0000000..67c59b7
--- /dev/null
+++ b/cli/src/deploy.rs
@@ -0,0 +1,75 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::io;
+use std::sync::Arc;
+use std::thread;
+use std::time::Duration;
+
+use hyper8_core::{Context, Site};
+use hyper8_core::{config_probe, start_deploy};
+use hyper8_translations::Translations;
+
+/// Performs deployment in a synchronous fashion, reporting back all messages
+/// and errors to the terminal. Also asks for explicit ("opt-in") confirmation
+/// before performing the actual deployment.
+pub fn perform_deploy_blocking_cli(
+    context_ref: &Arc<Context>,
+    site: &Site,
+    translations: &Translations
+) -> Result<(), String> {
+    if site.base_url.is_none() {
+        let site_manifest_path = context_ref.site_dir.join("site.eno");
+        let message = translations.public_address_must_be_configured_for_deployment_text_cli(&site_manifest_path);
+        return Err(message);
+    }
+
+    if !site.complete_deployment_config() {
+        let message = translations.deployment_configuration_is_incomplete_can_not_deploy.to_string();
+        return Err(message);
+    }
+
+    let t_really_deploy = translations.really_deploy;
+    let base_url = &site.base_url.as_ref().unwrap().representation;
+    println!("{t_really_deploy} ({base_url})");
+    println!("{}", translations.type_y_and_press_enter_to_confirm_anything_else_will_abort);
+
+    let mut input = String::new();
+    match io::stdin().read_line(&mut input) {
+        Ok(_) => {
+            if input.trim() != "y" {
+                return Ok(());
+            }
+        }
+        Err(err) => return Err(err.to_string())
+    }
+
+    if let Err(err) = config_probe(context_ref, site, translations) {
+        let t_deployment_configuration_could_not_be_verified = translations.deployment_configuration_could_not_be_verified;
+        let message = format!("{t_deployment_configuration_could_not_be_verified} ({err})");
+        return Err(message);
+    }
+
+    start_deploy(context_ref, site, translations)?;
+
+    let mut seen_feedback = 0;
+
+    loop {
+        thread::sleep(Duration::from_secs(1));
+
+        if let Ok(deployment) = context_ref.deploying.lock() {
+            let feedback = &deployment.feedback;
+
+            if feedback.len() > seen_feedback {
+                eprintln!("{}", &feedback[seen_feedback..]);
+                seen_feedback = feedback.len();
+            }
+
+            if !deployment.active() {
+                break;
+            }
+        }
+    }
+
+    Ok(())
+}
diff --git a/cli/src/main.rs b/cli/src/main.rs
new file mode 100644
index 0000000..f5d620f
--- /dev/null
+++ b/cli/src/main.rs
@@ -0,0 +1,145 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::net::IpAddr;
+use std::path::PathBuf;
+use std::process::ExitCode;
+use std::sync::{Arc, Mutex};
+
+use sys_locale::get_locale;
+
+use hyper8_core::{
+    Cache,
+    Context,
+    Language,
+    Site
+};
+use hyper8_core::{perform_build, start_preview_server, start_workers};
+use hyper8_core::watcher::watch_site_dir;
+
+mod args;
+mod deploy;
+
+use deploy::perform_deploy_blocking_cli;
+
+fn main() -> ExitCode {
+    env_logger::init();
+
+    let language = get_locale()
+        .map(|locale| Language::from_code(&locale))
+        .unwrap_or_else(|| Language::default());
+
+    let translations = &language.translations;
+
+    let args = args::parse();
+
+    let site_dir = args.get_one::<PathBuf>("site-dir").unwrap();
+
+    if !site_dir.exists() {
+        eprintln!(
+            "Site directory {site_dir:?} does not exist, please create it manually (just an empty folder).",
+        );
+        return ExitCode::FAILURE;
+    }
+
+    // This compiles to fs::canonicalize(...) on all platforms but windows,
+    // on windows it instead tries to supply a canonicalized path that uses
+    // the regular form (e.g. "C:\\Foo") instead of the UNC form ("\\?C:\\Foo")
+    // when possible (for background see https://crates.io/crates/dunce).
+    let site_dir = dunce::canonicalize(site_dir).unwrap();
+
+    let build_dir = args.get_one::<PathBuf>("build-dir")
+        .as_ref()
+        .map(|path| path.to_path_buf())
+        .unwrap_or_else(|| site_dir.join(".hyper8_build"));
+
+    let cache_dir = args.get_one::<PathBuf>("cache-dir")
+        .as_ref()
+        .map(|path| path.to_path_buf())
+        .unwrap_or_else(|| site_dir.join(".hyper8_cache"));
+
+    let cache = Mutex::new(Cache::retrieve(&cache_dir));
+
+    let context = Context::new(
+        build_dir,
+        cache,
+        cache_dir,
+        Arc::new(Site::new()),
+        site_dir.clone()
+    );
+
+    // TODO: Would be great if we could somehow resolve the conundrum that
+    //       context depends on site and site depends on context, which
+    //       forces us to initialize context with a dummy site and replace it here.
+    context.replace_site(Site::read_dir(&context, &site_dir));
+
+    let context = Arc::new(context);
+
+    let workers = args.get_one::<usize>("workers").unwrap();
+
+    context.compute_job_queue();
+    start_workers(&context, *workers, &translations);
+
+    let ip = args.get_one::<IpAddr>("ip");
+    let port = args.get_one::<u16>("port");
+
+    if args.get_flag("build") {
+        if let Err(err) = context.await_job_queue() {
+            eprintln!("{err}");
+            return ExitCode::FAILURE;
+        }
+
+        perform_build(&context);
+
+        if args.get_flag("preview") {
+            let site = context.get_site();
+
+            if site.clean_urls {
+                // Here we serve the preview through an actual http server so
+                // that /foo/ gets resolved to /foo/index.html.
+                let result = start_preview_server(&context.build_dir, ip, port);
+
+                if result.is_ok() { ExitCode::SUCCESS } else { ExitCode::FAILURE }
+            } else {
+                // We don't need an actively running server to preview a build
+                // without clean urls, we can just open everything directly in
+                // a browser.
+                let local_file_url = context.build_dir.join("index.html");
+                if webbrowser::open(&local_file_url.to_string_lossy()).is_err() {
+                    eprintln!("Could not open browser for previewing the site");
+                    ExitCode::FAILURE
+                } else {
+                    ExitCode::SUCCESS
+                }
+            }
+        } else if args.get_flag("deploy") {
+            let site = context.get_site();
+
+            match perform_deploy_blocking_cli(&context, &site, &translations) {
+                Ok(()) => ExitCode::SUCCESS,
+                Err(err) => {
+                    eprintln!("{err}");
+                    ExitCode::FAILURE
+                }
+            }
+        } else {
+            ExitCode::SUCCESS
+        }
+    } else {
+        println!("Using site directory: {}", context.site_dir.display());
+
+        watch_site_dir(Arc::clone(&context));
+
+        let result = hyper8_web::start_server(
+            context,
+            ip,
+            port
+        );
+
+        if result.is_ok() {
+            ExitCode::SUCCESS
+        } else {
+            ExitCode::FAILURE
+        }
+    }
+}
diff --git a/core/Cargo.toml b/core/Cargo.toml
new file mode 100644
index 0000000..4c36664
--- /dev/null
+++ b/core/Cargo.toml
@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: 2024-2025 Simon Repp
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+[package]
+edition.workspace = true
+name = "hyper8-core"
+rust-version.workspace = true
+version.workspace = true
+
+[build-dependencies]
+base64.workspace = true
+
+[dependencies]
+actix-files.workspace = true
+actix-web.workspace = true
+base64.workspace = true
+bincode.workspace = true
+chrono.workspace = true
+enolib.workspace = true
+form_urlencoded.workspace = true
+hyper8-icons.path = "../icons"
+hyper8-translations.path = "../translations"
+hyper8-version.path = "../version"
+icu_collator.workspace = true
+icu_locale.workspace = true
+image.workspace = true
+indoc.workspace = true
+language-tags.workspace = true
+log.workspace = true
+minreq.workspace = true
+nanoid.workspace = true
+notify.workspace = true
+rand.workspace = true
+rsubs-lib.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+slug.workspace = true
+suppaftp.workspace = true
+tokio.workspace = true
+uuid.workspace = true
+url.workspace = true
+urlencoding.workspace = true
+webbrowser.workspace = true
diff --git a/core/build.rs b/core/build.rs
new file mode 100644
index 0000000..125a626
--- /dev/null
+++ b/core/build.rs
@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::hash::{DefaultHasher, Hash, Hasher};
+
+use base64::Engine;
+use base64::engine::general_purpose::URL_SAFE_NO_PAD;
+
+fn main() {
+    provide_asset_hash(
+        include_bytes!("src/build/assets/adaptive_theme.js"),
+        "ADAPTIVE_THEME_JS"
+    );
+
+    provide_asset_hash(
+        include_bytes!("src/build/assets/clipboard.js"),
+        "CLIPBOARD_JS"
+    );
+
+    provide_asset_hash(
+        include_bytes!("src/build/assets/embed.js"),
+        "EMBED_JS"
+    );
+
+    provide_asset_hash(
+        include_bytes!("src/build/assets/favicon.png"),
+        "FAVICON_PNG"
+    );
+
+    provide_asset_hash(
+        include_bytes!("src/build/assets/video.js"),
+        "VIDEO_JS"
+    );
+}
+
+fn provide_asset_hash(bytes: &[u8], key: &str) {
+    let hash = url_safe_hash_base64(bytes);
+    println!("cargo:rustc-env=HYPER8_STATIC_ASSET_HASH_{key}={hash}");
+}
+
+pub fn url_safe_hash_base64(content: &[u8]) -> String {
+    let mut hasher = DefaultHasher::new();
+    content.hash(&mut hasher);
+    let hash = hasher.finish();
+    URL_SAFE_NO_PAD.encode(hash.to_le_bytes())
+}
diff --git a/src/aspect_ratio.rs b/core/src/aspect_ratio.rs
similarity index 100%
rename from src/aspect_ratio.rs
rename to core/src/aspect_ratio.rs
diff --git a/src/audio_file.rs b/core/src/audio_file.rs
similarity index 100%
rename from src/audio_file.rs
rename to core/src/audio_file.rs
diff --git a/src/audio_format.rs b/core/src/audio_format.rs
similarity index 100%
rename from src/audio_format.rs
rename to core/src/audio_format.rs
diff --git a/src/audio_meta.rs b/core/src/audio_meta.rs
similarity index 100%
rename from src/audio_meta.rs
rename to core/src/audio_meta.rs
diff --git a/src/banner.rs b/core/src/banner.rs
similarity index 100%
rename from src/banner.rs
rename to core/src/banner.rs
diff --git a/src/browser_support.rs b/core/src/browser_support.rs
similarity index 99%
rename from src/browser_support.rs
rename to core/src/browser_support.rs
index ad10995..e441079 100644
--- a/src/browser_support.rs
+++ b/core/src/browser_support.rs
@@ -95,4 +95,4 @@ pub fn video_analysis(
     } else {
         None
     }
-}
\ No newline at end of file
+}
diff --git a/src/build.rs b/core/src/build.rs
similarity index 90%
rename from src/build.rs
rename to core/src/build.rs
index a33c6df..2e096fd 100644
--- a/src/build.rs
+++ b/core/src/build.rs
@@ -6,6 +6,7 @@ use std::path::Path;
 use std::thread;
 use std::time::Duration;
 
+use hyper8_version::{VERSION_WITH_PATCH_AND_REVISION};
 use rsubs_lib::SRT;
 
 use crate::{
@@ -20,6 +21,7 @@ use crate::{
 use crate::build::widgets::thumbnail;
 use crate::util::{ensure_empty_dir, hard_link_or_copy};
 
+mod asset_hashes;
 mod collection;
 mod download;
 mod embed;
@@ -45,38 +47,12 @@ use playlist::playlist_html;
 use subscribe::subscribe_html;
 use video::video_html;
 
-pub const GENERATOR_INFO: &str = concat!("Hyper 8 Video System ", env!("HYPER8_VERSION_DETAILED"), " (", env!("HYPER8_REVISION"), ")");
-
-/// Placed in the head of each page to identify the Hyper 8 build that generated it.
-const META_GENERATOR: &str = concat!(r#"<meta name="generator" content="Hyper 8 Video System "#, env!("HYPER8_VERSION_DETAILED"), " (", env!("HYPER8_REVISION"), r#")">"#);
+use asset_hashes::AssetHashes;
 
 const META_ROBOTS_NOINDEX_NOFOLLOW: &str = r#"<meta name="robots" content="noindex, nofollow">"#;
 
-/// When we link to assets on the rendered pages, we append a unique asset
-/// hash to each path (e.g. "site.js?g1VVfPoEjUw"), which is derived from
-/// the file content of the asset. We do this in order to prompt browsers to
-/// fetch new, uncached assets when their content has changed. This struct
-/// groups together those hashes for all assets we use.
-pub struct AssetHashes {
-    pub embed_css: Option<String>,
-    pub navigation_js: Option<String>,
-    pub site_css: Option<String>
-}
-
-impl AssetHashes {
-    pub const ADAPTIVE_THEME_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_ADAPTIVE_THEME_JS");
-    pub const CLIPBOARD_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_CLIPBOARD_JS");
-    pub const EMBED_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_EMBED_JS");
-    pub const FAVICON_PNG: &str = env!("HYPER8_STATIC_ASSET_HASH_FAVICON_PNG");
-    pub const VIDEO_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_VIDEO_JS");
-
-    pub fn new() -> AssetHashes {
-        AssetHashes {
-            embed_css: None,
-            navigation_js: None,
-            site_css: None
-        }
-    }
+pub fn meta_generator() -> String {
+    format!(r#"<meta name="generator" content="Hyper 8 Video System {VERSION_WITH_PATCH_AND_REVISION}">"#)
 }
 
 pub fn perform_build(context: &Context) {
@@ -87,7 +63,7 @@ pub fn perform_build(context: &Context) {
         thread::sleep(Duration::from_secs(1));
         site = context.get_site();
     }
-    
+
     ensure_empty_dir(&context.build_dir);
 
     let mut asset_hashes = AssetHashes::new();
diff --git a/core/src/build/asset_hashes.rs b/core/src/build/asset_hashes.rs
new file mode 100644
index 0000000..ecafc4c
--- /dev/null
+++ b/core/src/build/asset_hashes.rs
@@ -0,0 +1,29 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+/// When we link to assets on the rendered pages, we append a unique asset
+/// hash to each path (e.g. "site.js?g1VVfPoEjUw"), which is derived from
+/// the file content of the asset. We do this in order to prompt browsers to
+/// fetch new, uncached assets when their content has changed. This struct
+/// groups together those hashes for all assets we use.
+pub struct AssetHashes {
+    pub embed_css: Option<String>,
+    pub navigation_js: Option<String>,
+    pub site_css: Option<String>
+}
+
+impl AssetHashes {
+    pub const ADAPTIVE_THEME_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_ADAPTIVE_THEME_JS");
+    pub const CLIPBOARD_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_CLIPBOARD_JS");
+    pub const EMBED_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_EMBED_JS");
+    pub const FAVICON_PNG: &str = env!("HYPER8_STATIC_ASSET_HASH_FAVICON_PNG");
+    pub const VIDEO_JS: &str = env!("HYPER8_STATIC_ASSET_HASH_VIDEO_JS");
+
+    pub fn new() -> AssetHashes {
+        AssetHashes {
+            embed_css: None,
+            navigation_js: None,
+            site_css: None
+        }
+    }
+}
diff --git a/src/build/assets/adaptive_theme.css b/core/src/build/assets/adaptive_theme.css
similarity index 100%
rename from src/build/assets/adaptive_theme.css
rename to core/src/build/assets/adaptive_theme.css
diff --git a/src/build/assets/adaptive_theme.css.license b/core/src/build/assets/adaptive_theme.css.license
similarity index 100%
rename from src/build/assets/adaptive_theme.css.license
rename to core/src/build/assets/adaptive_theme.css.license
diff --git a/src/build/assets/adaptive_theme.js b/core/src/build/assets/adaptive_theme.js
similarity index 100%
rename from src/build/assets/adaptive_theme.js
rename to core/src/build/assets/adaptive_theme.js
diff --git a/src/build/assets/adaptive_theme.js.license b/core/src/build/assets/adaptive_theme.js.license
similarity index 100%
rename from src/build/assets/adaptive_theme.js.license
rename to core/src/build/assets/adaptive_theme.js.license
diff --git a/src/build/assets/clipboard.js b/core/src/build/assets/clipboard.js
similarity index 100%
rename from src/build/assets/clipboard.js
rename to core/src/build/assets/clipboard.js
diff --git a/src/build/assets/clipboard.js.license b/core/src/build/assets/clipboard.js.license
similarity index 100%
rename from src/build/assets/clipboard.js.license
rename to core/src/build/assets/clipboard.js.license
diff --git a/src/build/assets/embed.css b/core/src/build/assets/embed.css
similarity index 100%
rename from src/build/assets/embed.css
rename to core/src/build/assets/embed.css
diff --git a/src/build/assets/embed.css.license b/core/src/build/assets/embed.css.license
similarity index 100%
rename from src/build/assets/embed.css.license
rename to core/src/build/assets/embed.css.license
diff --git a/src/build/assets/embed.js b/core/src/build/assets/embed.js
similarity index 100%
rename from src/build/assets/embed.js
rename to core/src/build/assets/embed.js
diff --git a/src/build/assets/embed.js.license b/core/src/build/assets/embed.js.license
similarity index 100%
rename from src/build/assets/embed.js.license
rename to core/src/build/assets/embed.js.license
diff --git a/src/build/assets/favicon.png b/core/src/build/assets/favicon.png
similarity index 100%
rename from src/build/assets/favicon.png
rename to core/src/build/assets/favicon.png
diff --git a/src/build/assets/favicon.png.license b/core/src/build/assets/favicon.png.license
similarity index 100%
rename from src/build/assets/favicon.png.license
rename to core/src/build/assets/favicon.png.license
diff --git a/src/build/assets/navigation.js b/core/src/build/assets/navigation.js
similarity index 100%
rename from src/build/assets/navigation.js
rename to core/src/build/assets/navigation.js
diff --git a/src/build/assets/navigation.js.license b/core/src/build/assets/navigation.js.license
similarity index 100%
rename from src/build/assets/navigation.js.license
rename to core/src/build/assets/navigation.js.license
diff --git a/src/build/assets/site.css b/core/src/build/assets/site.css
similarity index 100%
rename from src/build/assets/site.css
rename to core/src/build/assets/site.css
diff --git a/src/build/assets/site.css.license b/core/src/build/assets/site.css.license
similarity index 100%
rename from src/build/assets/site.css.license
rename to core/src/build/assets/site.css.license
diff --git a/src/build/assets/video.js b/core/src/build/assets/video.js
similarity index 100%
rename from src/build/assets/video.js
rename to core/src/build/assets/video.js
diff --git a/src/build/assets/video.js.license b/core/src/build/assets/video.js.license
similarity index 100%
rename from src/build/assets/video.js.license
rename to core/src/build/assets/video.js.license
diff --git a/src/build/collection.rs b/core/src/build/collection.rs
similarity index 100%
rename from src/build/collection.rs
rename to core/src/build/collection.rs
diff --git a/src/build/download.rs b/core/src/build/download.rs
similarity index 100%
rename from src/build/download.rs
rename to core/src/build/download.rs
diff --git a/src/build/embed.rs b/core/src/build/embed.rs
similarity index 95%
rename from src/build/embed.rs
rename to core/src/build/embed.rs
index 955cd7c..4e90bb7 100644
--- a/src/build/embed.rs
+++ b/core/src/build/embed.rs
@@ -6,11 +6,13 @@ use std::fs;
 use indoc::formatdoc;
 
 use crate::{Context, Playlist, Site, Video};
-use crate::build::{META_GENERATOR, META_ROBOTS_NOINDEX_NOFOLLOW};
+use crate::build::{META_ROBOTS_NOINDEX_NOFOLLOW};
 use crate::build::AssetHashes;
 use crate::build::outline::Traversal;
 use crate::build::player::{player, player_icon_templates};
 
+use super::meta_generator;
+
 /// Writes html for the embed itself, i.e. what is pulled in from external
 /// site B through an iframe when they embed a video from site A.
 pub fn embed_html(
@@ -51,7 +53,7 @@ pub fn embed_layout(
     site: &Site,
     traversal: &Traversal
 ) -> String {
-    let meta_generator = META_GENERATOR;
+    let meta_generator = meta_generator();
     let meta_robots_noindex_nofollow = META_ROBOTS_NOINDEX_NOFOLLOW;
 
     let embed_css_asset_hash = asset_hashes.embed_css.as_ref().unwrap();
diff --git a/src/build/embed_codes.rs b/core/src/build/embed_codes.rs
similarity index 100%
rename from src/build/embed_codes.rs
rename to core/src/build/embed_codes.rs
diff --git a/src/build/feeds.rs b/core/src/build/feeds.rs
similarity index 98%
rename from src/build/feeds.rs
rename to core/src/build/feeds.rs
index 8a693f2..700d377 100644
--- a/src/build/feeds.rs
+++ b/core/src/build/feeds.rs
@@ -4,13 +4,13 @@
 use std::sync::Arc;
 
 use chrono::Utc;
+use hyper8_translations::Translations;
 use indoc::formatdoc;
 
 use crate::{
     Context,
     Site,
     SitePath,
-    Translations,
     Video
 };
 
diff --git a/src/build/feeds/atom.rs b/core/src/build/feeds/atom.rs
similarity index 97%
rename from src/build/feeds/atom.rs
rename to core/src/build/feeds/atom.rs
index 5f5966f..7724e86 100644
--- a/src/build/feeds/atom.rs
+++ b/core/src/build/feeds/atom.rs
@@ -11,6 +11,8 @@ use std::sync::Arc;
 use chrono::{DateTime, Utc};
 use indoc::formatdoc;
 
+use hyper8_version::{VERSION_WITH_PATCH, VERSION_WITH_PATCH_AND_REVISION};
+
 use crate::{
     Context,
     MarkdownSubset,
@@ -18,7 +20,6 @@ use crate::{
     SitePath,
     Video
 };
-use crate::build::GENERATOR_INFO;
 use crate::util::html_escape_outside_attribute;
 
 use super::ATOM_FILENAME;
@@ -82,15 +83,14 @@ pub fn atom(
 
     let title_escaped = html_escape_outside_attribute(title);
 
-    let version_detailed = env!("HYPER8_VERSION_DETAILED");
     let xml = formatdoc!(r#"
         <?xml version="1.0" encoding="utf-8"?>
         <feed xmlns="http://www.w3.org/2005/Atom">
             <author>
                 <name>{author_name}</name>
             </author>
-            <generator uri="https://simonrepp.com/hyper8" version="{version_detailed}">
-                {GENERATOR_INFO}
+            <generator uri="https://simonrepp.com/hyper8" version="{VERSION_WITH_PATCH}">
+                Hyper 8 Video System {VERSION_WITH_PATCH_AND_REVISION}
             </generator>
             <id>{site_url}</id>
             <link href="{atom_feed_url}" rel="self"/>
diff --git a/src/build/feeds/media_rss.rs b/core/src/build/feeds/media_rss.rs
similarity index 100%
rename from src/build/feeds/media_rss.rs
rename to core/src/build/feeds/media_rss.rs
diff --git a/src/build/feeds/plain_rss.rs b/core/src/build/feeds/plain_rss.rs
similarity index 100%
rename from src/build/feeds/plain_rss.rs
rename to core/src/build/feeds/plain_rss.rs
diff --git a/src/build/feeds/podcast_rss.rs b/core/src/build/feeds/podcast_rss.rs
similarity index 100%
rename from src/build/feeds/podcast_rss.rs
rename to core/src/build/feeds/podcast_rss.rs
diff --git a/src/build/feeds/rss.rs b/core/src/build/feeds/rss.rs
similarity index 95%
rename from src/build/feeds/rss.rs
rename to core/src/build/feeds/rss.rs
index 04d6109..e7c0a17 100644
--- a/src/build/feeds/rss.rs
+++ b/core/src/build/feeds/rss.rs
@@ -15,8 +15,9 @@ use std::sync::Arc;
 use chrono::{DateTime, Utc};
 use indoc::formatdoc;
 
+use hyper8_version::{VERSION_WITH_PATCH_AND_REVISION, VERSION_WITHOUT_PATCH};
+
 use crate::{MarkdownSubset, Site, Video};
-use crate::build::GENERATOR_INFO;
 use crate::util::html_escape_outside_attribute;
 
 pub fn rss(
@@ -54,7 +55,7 @@ pub fn rss(
     } else {
         // TODO: Eventually find something better to fallback to.
         // Note that this is a mandatory field in RSS (https://www.rssboard.org/rss-specification#requiredChannelElements)
-        format!("Hyper 8 Video System {}", env!("HYPER8_VERSION_DISPLAY"))
+        format!("Hyper 8 Video System {VERSION_WITHOUT_PATCH}")
     };
 
     let title_escaped = html_escape_outside_attribute(title);
@@ -99,7 +100,7 @@ pub fn rss(
             <channel>
                 <atom:link href="{feed_url}" rel="self" type="application/rss+xml"/>
                 <description>{description}</description>
-                <generator>{GENERATOR_INFO}</generator>
+                <generator>Hyper 8 Video System {VERSION_WITH_PATCH_AND_REVISION}</generator>
                 <language>{language}</language>
                 <lastBuildDate>{build_time_rfc2822}</lastBuildDate>
                 <link>{link}</link>
diff --git a/src/build/layout.rs b/core/src/build/layout.rs
similarity index 92%
rename from src/build/layout.rs
rename to core/src/build/layout.rs
index dde2015..7de2301 100644
--- a/src/build/layout.rs
+++ b/core/src/build/layout.rs
@@ -3,15 +3,17 @@
 
 use indoc::formatdoc;
 
+use hyper8_version::VERSION_WITHOUT_PATCH;
+
 use crate::{PlatformIntegrationMeta, Site, ThemeKind};
 use crate::build::{AssetHashes, Traversal};
 use crate::build::feeds::meta_link_tags;
 use crate::build::player::player_icon_templates;
 use crate::build::widgets::copy_button_icon_templates;
-use crate::icons;
 use crate::util::html_escape_outside_attribute;
 
-use super::{META_GENERATOR, META_ROBOTS_NOINDEX_NOFOLLOW};
+use super::{META_ROBOTS_NOINDEX_NOFOLLOW};
+use super::meta_generator;
 
 pub struct Layout {
     clipboard_script: bool,
@@ -106,9 +108,9 @@ impl Layout {
         let navigation;
         let navigation_script;
         if let Some(navigation_js_asset_hash) = &asset_hashes.navigation_js {
-            let browse_icon = icons::BROWSE;
-            let close_icon = icons::failure(translations.close);
-            let search_icon = icons::search(translations.search);
+            let browse_icon = hyper8_icons::BROWSE;
+            let close_icon = hyper8_icons::failure(translations.close);
+            let search_icon = hyper8_icons::search(translations.search);
             let t_browse = translations.browse;
             let t_search = translations.search;
 
@@ -135,7 +137,7 @@ impl Layout {
 
             navigation_script = format!(r#"<script defer src="{root_prefix}navigation.js?{navigation_js_asset_hash}"></script>"#);
 
-            let chevron_right_icon = icons::CHEVRON_RIGHT;
+            let chevron_right_icon = hyper8_icons::CHEVRON_RIGHT;
             let navigation_templates = formatdoc!(r#"
                 <template id="chevron_right_icon">
                     {chevron_right_icon}
@@ -151,12 +153,14 @@ impl Layout {
         let favicon_png_asset_hash = AssetHashes::FAVICON_PNG;
         let site_css_asset_hash = asset_hashes.site_css.as_ref().unwrap();
 
+        let meta_generator = meta_generator();
+
         let head = formatdoc!(r#"
             <head>
                 <title>{title}</title>
                 <meta charset="utf-8">
                 <meta name="viewport" content="width=device-width, initial-scale=1">
-                {META_GENERATOR}
+                {meta_generator}
                 {extra_meta}
                 <link href="{root_prefix}favicon.png?{favicon_png_asset_hash}" rel="icon" type="image/png">
                 <link rel="stylesheet" href="{root_prefix}site.css?{site_css_asset_hash}">
@@ -167,8 +171,8 @@ impl Layout {
             </head>
         "#);
 
-        let dark_icon = icons::dark(translations.dark_color_scheme);
-        let light_icon = icons::light(translations.light_color_scheme);
+        let dark_icon = hyper8_icons::dark(translations.dark_color_scheme);
+        let light_icon = hyper8_icons::light(translations.light_color_scheme);
         let theme_toggle = match &site.theme.kind {
             ThemeKind::Adaptive { .. } => formatdoc!(r#"
                 <div id="theme-toggles">
@@ -179,8 +183,6 @@ impl Layout {
             ThemeKind::Static(_) => String::new()
         };
 
-        let version_display = env!("HYPER8_VERSION_DISPLAY");
-
         if self.clipboard_script {
             templates.push_str(&copy_button_icon_templates(translations));
         }
@@ -192,9 +194,9 @@ impl Layout {
         let root_url = traversal.index_asc(site);
         let site_path = traversal.site_path().normalized();
 
-        let key_icon = icons::KEY;
-        let logo_monochrome_icon = icons::logo_monochrome(None);
-        let logo_polychrome_icon = icons::logo_polychrome(Some("Hyper 8"));
+        let key_icon = hyper8_icons::KEY;
+        let logo_monochrome_icon = hyper8_icons::logo_monochrome(None);
+        let logo_polychrome_icon = hyper8_icons::logo_polychrome(Some("Hyper 8"));
         let t_adjust_playback_speed_cursor_above_playback_speed_indicator = translations.adjust_playback_speed_cursor_above_playback_speed_indicator;
         let t_arrow_left_right = translations.arrow_left_right;
         let t_clear_search_or_close_browse_panel = translations.clear_search_or_close_browse_panel;
@@ -234,7 +236,7 @@ impl Layout {
                             {e_site_title}
                         </a>
                         <a href="https://simonrepp.com/hyper8" target="_blank">
-                            {logo_monochrome_icon} Hyper 8 Video System {version_display}
+                            {logo_monochrome_icon} Hyper 8 Video System {VERSION_WITHOUT_PATCH}
                         </a>
                         <button class="shortcuts">
                             {key_icon} {t_shortcuts}
diff --git a/src/build/outline.rs b/core/src/build/outline.rs
similarity index 100%
rename from src/build/outline.rs
rename to core/src/build/outline.rs
diff --git a/src/build/player.rs b/core/src/build/player.rs
similarity index 94%
rename from src/build/player.rs
rename to core/src/build/player.rs
index 53d6e3a..c4b19c5 100644
--- a/src/build/player.rs
+++ b/core/src/build/player.rs
@@ -6,18 +6,18 @@ use std::path::Path;
 
 use indoc::formatdoc;
 
+use hyper8_translations::Translations;
+
 use crate::{
     Asc,
     AudioFile,
     Desc,
     Playlist,
     Site,
-    Translations,
     Video,
     VideoFile
 };
 use crate::build::widgets::thumbnail;
-use crate::icons;
 use crate::util::{
     casual_duration,
     html_escape_inside_attribute,
@@ -83,7 +83,7 @@ pub fn player(
         None => String::new()
     };
 
-    let active_marker_icon = icons::active_marker(translations.active);
+    let active_marker_icon = hyper8_icons::active_marker(translations.active);
 
     let subtitle_controls;
     let subtitle_tracks;
@@ -126,7 +126,7 @@ pub fn player(
             .collect::<Vec<String>>()
             .join("\n");
 
-        let subtitles_icon = icons::subtitles(Some(translations.subtitles));
+        let subtitles_icon = hyper8_icons::subtitles(Some(translations.subtitles));
         let t_no_subtitles = translations.no_subtitles;
         subtitle_controls = formatdoc!(r#"
             <div class="selector_control subtitles">
@@ -242,7 +242,7 @@ pub fn player(
                     );
 
                     number_context = format!(r#"<span class="number_context">{t_current_video_xxx_of_xxx_in_xxx}</span>"#);
-                    replay_indicator = icons::replay(translations.replay);
+                    replay_indicator = hyper8_icons::replay(translations.replay);
                     video_iterated_prefix = video_prefix.to_string();
                 } else {
                     current = "";
@@ -297,7 +297,7 @@ pub fn player(
             </div>
         "#)
     } else {
-        let replay_icon = icons::replay(translations.replay);
+        let replay_icon = hyper8_icons::replay(translations.replay);
         let t_replay = translations.replay;
         formatdoc!(r#"
             <div class="outro_video_context">
@@ -308,14 +308,14 @@ pub fn player(
         "#)
     };
 
-    let maximize_icon = icons::maximize(translations.maximize);
-    let volume_loud_icon = icons::volume_loud(translations.loud_volume);
+    let maximize_icon = hyper8_icons::maximize(translations.maximize);
+    let volume_loud_icon = hyper8_icons::volume_loud(translations.loud_volume);
 
     let video_title = video.title_or_slug_or_generic_label(translations);
     let video_title_escaped = html_escape_outside_attribute(video_title);
 
     let embed_intro_extensions = if embed {
-        let link_icon = icons::link(Some(translations.external_link));
+        let link_icon = hyper8_icons::link(Some(translations.external_link));
         let site_url = site.absolute_url_unchecked();
         let video_url = match site.clean_urls {
             true => video_prefix.to_string(),
@@ -339,7 +339,7 @@ pub fn player(
                 .collect::<Vec<String>>()
                 .join("\n");
 
-            let subtitles_icon = icons::subtitles(Some(translations.subtitles));
+            let subtitles_icon = hyper8_icons::subtitles(Some(translations.subtitles));
             let t_no_subtitles = translations.no_subtitles;
 
             formatdoc!(r#"
@@ -391,7 +391,7 @@ pub fn player(
 
     let duration_formatted = precise_duration(duration);
 
-    let play_icon = icons::play(translations.play);
+    let play_icon = hyper8_icons::play(translations.play);
     formatdoc!(r#"
         <style>
             :root {{ --video-aspect: {aspect_ratio}; }}
@@ -438,15 +438,15 @@ pub fn player(
 /// these are injected to the end of the body in the regular page and embed
 /// layouts.
 pub fn player_icon_templates(translations: &Translations) -> String {
-    let maximize_icon = icons::maximize(translations.maximize);
-    let minimize_icon = icons::minimize(translations.minimize);
-    let pause_icon = icons::pause(translations.pause);
-    let play_icon = icons::play(translations.play);
-    let replay_icon = icons::replay(translations.replay);
-    let subtitles_icon = icons::subtitles(Some(translations.subtitles));
-    let volume_loud_icon = icons::volume_loud(translations.loud_volume);
-    let volume_medium_icon = icons::volume_medium(translations.medium_volume);
-    let volume_muted_icon = icons::volume_muted(translations.sound_muted);
+    let maximize_icon = hyper8_icons::maximize(translations.maximize);
+    let minimize_icon = hyper8_icons::minimize(translations.minimize);
+    let pause_icon = hyper8_icons::pause(translations.pause);
+    let play_icon = hyper8_icons::play(translations.play);
+    let replay_icon = hyper8_icons::replay(translations.replay);
+    let subtitles_icon = hyper8_icons::subtitles(Some(translations.subtitles));
+    let volume_loud_icon = hyper8_icons::volume_loud(translations.loud_volume);
+    let volume_medium_icon = hyper8_icons::volume_medium(translations.medium_volume);
+    let volume_muted_icon = hyper8_icons::volume_muted(translations.sound_muted);
 
     formatdoc!(r#"
         <template id="maximize_icon">
diff --git a/src/build/playlist.rs b/core/src/build/playlist.rs
similarity index 100%
rename from src/build/playlist.rs
rename to core/src/build/playlist.rs
diff --git a/src/build/scripts.rs b/core/src/build/scripts.rs
similarity index 100%
rename from src/build/scripts.rs
rename to core/src/build/scripts.rs
diff --git a/src/build/styles.rs b/core/src/build/styles.rs
similarity index 100%
rename from src/build/styles.rs
rename to core/src/build/styles.rs
diff --git a/src/build/subscribe.rs b/core/src/build/subscribe.rs
similarity index 94%
rename from src/build/subscribe.rs
rename to core/src/build/subscribe.rs
index bb8db09..4b6a355 100644
--- a/src/build/subscribe.rs
+++ b/core/src/build/subscribe.rs
@@ -5,16 +5,16 @@ use std::fs;
 
 use indoc::formatdoc;
 
+use hyper8_translations::Translations;
+
 use crate::{
     Context,
     Site,
-    SitePath,
-    Translations
+    SitePath
 };
 use crate::build::{AssetHashes, Layout};
 use crate::build::outline::Traversal;
 use crate::build::widgets::{copy_button, unlisted_badge};
-use crate::icons;
 use crate::util::html_escape_outside_attribute;
 
 use super::feeds::{
@@ -84,7 +84,7 @@ pub fn subscribe_html(
     let atom_feed_choice = feed_choice(
         translations.atom_description,
         ATOM_FILENAME,
-        icons::ATOM,
+        hyper8_icons::ATOM,
         "Atom",
         site,
         site_path,
@@ -94,7 +94,7 @@ pub fn subscribe_html(
     let media_rss_choice = feed_choice(
         translations.media_rss_description,
         MEDIA_RSS_FILENAME,
-        &icons::rss(None),
+        &hyper8_icons::rss(None),
         "Media RSS",
         site,
         site_path,
@@ -104,7 +104,7 @@ pub fn subscribe_html(
     let plain_rss_feed_choice = feed_choice(
         translations.plain_rss_description,
         PLAIN_RSS_FILENAME,
-        &icons::rss(None),
+        &hyper8_icons::rss(None),
         translations.plain_rss,
         site,
         site_path,
@@ -114,7 +114,7 @@ pub fn subscribe_html(
     let podcast_rss_choice = feed_choice(
         translations.podcast_rss_description,
         PODCAST_RSS_FILENAME,
-        &icons::rss(None),
+        &hyper8_icons::rss(None),
         "Podcast RSS",
         site,
         site_path,
diff --git a/src/build/video.rs b/core/src/build/video.rs
similarity index 98%
rename from src/build/video.rs
rename to core/src/build/video.rs
index 3dcddce..50a8b1a 100644
--- a/src/build/video.rs
+++ b/core/src/build/video.rs
@@ -17,7 +17,6 @@ use crate::build::{AssetHashes, Layout};
 use crate::build::outline::{Traversal, TraversalStep};
 use crate::build::player::player;
 use crate::build::widgets::{copy_button, links, unlisted_badge};
-use crate::icons;
 use crate::util::{
     html_escape_outside_attribute,
     localized_date_d_mmmm_yyyy
@@ -83,7 +82,7 @@ pub fn video_html(
     }
 
     if video.embedding() && site.base_url.is_some() && !video.video_files.is_empty() {
-        let embed_icon = icons::EMBED;
+        let embed_icon = hyper8_icons::EMBED;
 
         let t_embed = &translations.embed;
         let t_embed_codes_permalink = &translations.embed_codes_permalink;
@@ -100,7 +99,7 @@ pub fn video_html(
     if video.download() && !video.video_files.is_empty() {
         let t_download = translations.download;
         let t_download_permalink = translations.download_permalink;
-        let download_icon = icons::DOWNLOAD;
+        let download_icon = hyper8_icons::DOWNLOAD;
 
         let download = formatdoc!(r#"
             <a href="{t_download_permalink}{index_suffix}">
@@ -113,7 +112,7 @@ pub fn video_html(
 
     if let Some(playlist) = playlist {
         let t_playlist = translations.playlist;
-        let playlist_icon = icons::playlist(None);
+        let playlist_icon = hyper8_icons::playlist(None);
         let playlist_site_path = playlist.site_path.normalized();
         let toggle_playlist = formatdoc!(r#"
             <button data-site-path="{playlist_site_path}" id="toggle_playlist">
@@ -126,7 +125,7 @@ pub fn video_html(
 
     if !video.subtitles.is_empty() {
         let t_transcript = translations.transcript;
-        let subtitles_icon = icons::subtitles(None);
+        let subtitles_icon = hyper8_icons::subtitles(None);
         let toggle_transcript = formatdoc!(r#"
             <button id="toggle_transcript">
                 {subtitles_icon} {t_transcript}
diff --git a/src/build/widgets.rs b/core/src/build/widgets.rs
similarity index 93%
rename from src/build/widgets.rs
rename to core/src/build/widgets.rs
index 50876cf..9162747 100644
--- a/src/build/widgets.rs
+++ b/core/src/build/widgets.rs
@@ -6,15 +6,15 @@ use std::sync::Arc;
 
 use indoc::formatdoc;
 
+use hyper8_translations::Translations;
+
 use crate::{
     Banner,
     Language,
     Link,
     Site,
-    Translations,
     Video
 };
-use crate::icons;
 use crate::util::{
     casual_duration,
     html_escape_outside_attribute
@@ -67,7 +67,7 @@ pub fn copy_button(
     content_value: &str,
     label: &str
 ) -> String {
-    let copy_icon = icons::COPY;
+    let copy_icon = hyper8_icons::COPY;
     format!(r#"
         <button data-{content_key}="{content_value}" data-copy>
             <span class="icon">{copy_icon}</span>
@@ -80,9 +80,9 @@ pub fn copy_button(
 /// these are injected to the end of the body in the regular page and embed
 /// layouts.
 pub fn copy_button_icon_templates(translations: &Translations) -> String {
-    let copy_icon = icons::COPY;
-    let failure_icon = icons::failure(translations.failed);
-    let success_icon = icons::success(translations.copied);
+    let copy_icon = hyper8_icons::COPY;
+    let failure_icon = hyper8_icons::failure(translations.failed);
+    let success_icon = hyper8_icons::success(translations.copied);
 
     formatdoc!(r#"
         <template id="copy_icon">
@@ -102,7 +102,7 @@ pub fn links(language: &Language, links: &[Link]) -> String {
         return String::new();
     }
 
-    let link_icon = icons::link(Some(language.translations.external_link));
+    let link_icon = hyper8_icons::link(Some(language.translations.external_link));
 
     let items = links
         .iter()
@@ -134,7 +134,7 @@ pub fn subscribe_button(
     site: &Site
 ) -> String {
     let index_suffix = site.index_suffix();
-    let feed_icon = icons::rss(Some(site.language.translations.feed));
+    let feed_icon = hyper8_icons::rss(Some(site.language.translations.feed));
     let t_subscribe = site.language.translations.subscribe;
 
     formatdoc!(r#"
diff --git a/src/cache.rs b/core/src/cache.rs
similarity index 100%
rename from src/cache.rs
rename to core/src/cache.rs
diff --git a/src/collection.rs b/core/src/collection.rs
similarity index 97%
rename from src/collection.rs
rename to core/src/collection.rs
index 6b1fd21..7b81310 100644
--- a/src/collection.rs
+++ b/core/src/collection.rs
@@ -9,15 +9,14 @@ use std::sync::Arc;
 use chrono::NaiveDate;
 use url::Url;
 
+use hyper8_translations::Translations;
+
 use crate::{
-    Asc,
     Banner,
     CollectionUpdate,
-    Comparison,
     Container,
     ContainerOrder,
     Context,
-    Desc,
     FileMeta,
     GetAnyResult,
     HyperDir,
@@ -29,8 +28,6 @@ use crate::{
     PlaylistUpdate,
     Site,
     SitePath,
-    Translations,
-    TreeViewOrder,
     Video,
     VideoOrder,
     VideoUpdate
@@ -515,36 +512,6 @@ impl Collection {
         }
     }
 
-    pub fn containers_in_tree_view_order(
-        &self,
-        language: &Language,
-        tree_view_order: &TreeViewOrder
-    ) -> Vec<Container> {
-        let mut containers = Vec::new();
-
-        for playlist in &self.playlists {
-            containers.push(Container::Playlist(playlist.clone()));
-        }
-
-        for subcollection in &self.subcollections {
-            containers.push(Container::Collection(subcollection.clone()));
-        }
-
-        let (comparison, direction) = match tree_view_order {
-            TreeViewOrder::Default |
-            TreeViewOrder::SiteOrder =>
-                Container::container_order_comparison_and_direction(&self.container_order),
-            TreeViewOrder::TitleAsc =>
-                (Container::cmp_slug_then_title as Comparison<Container>, Asc),
-            TreeViewOrder::TitleDesc =>
-                (Container::cmp_slug_then_title as Comparison<Container>, Desc)
-        };
-
-        containers.sort_unstable_by(|a, b| comparison(a, b, &language.icu_collator, direction));
-
-        containers
-    }
-
     /// When we convert between types (collection, playlist, video) we pass
     /// over existing inherited options using this method.
     pub fn copy_inherited_options(&self) -> InheritedOptions {
@@ -1571,28 +1538,6 @@ impl Collection {
         }
     }
 
-    pub fn videos_in_tree_view_order(
-        &self,
-        language: &Language,
-        tree_view_order: &TreeViewOrder
-    ) -> Vec<Arc<Video>> {
-        let mut videos: Vec<Arc<Video>> = self.videos.clone();
-
-        let (comparison, direction) = match tree_view_order {
-            TreeViewOrder::Default |
-            TreeViewOrder::SiteOrder =>
-                Video::video_order_comparison_and_direction(&self.video_order),
-            TreeViewOrder::TitleAsc =>
-                (Video::cmp_slug_then_title as Comparison<Video>, Asc),
-            TreeViewOrder::TitleDesc =>
-                (Video::cmp_slug_then_title as Comparison<Video>, Desc)
-        };
-
-        videos.sort_unstable_by(|a, b| comparison(a, b, &language.icu_collator, direction));
-
-        videos
-    }
-
     pub fn write_manifest(&self, context: &Context) {
         let mut eno = String::new();
 
diff --git a/src/container.rs b/core/src/container.rs
similarity index 100%
rename from src/container.rs
rename to core/src/container.rs
diff --git a/src/container_order.rs b/core/src/container_order.rs
similarity index 100%
rename from src/container_order.rs
rename to core/src/container_order.rs
diff --git a/src/context.rs b/core/src/context.rs
similarity index 97%
rename from src/context.rs
rename to core/src/context.rs
index 979e224..4d72b25 100644
--- a/src/context.rs
+++ b/core/src/context.rs
@@ -26,8 +26,6 @@ use crate::{
     Site,
     SiteContent,
     SitePath,
-    Theme,
-    TreeViewOrder,
     Video,
     Worker
 };
@@ -43,9 +41,6 @@ pub struct Context {
     pub cache_dir: PathBuf,
     pub completed_jobs: Mutex<Vec<CompletedJob>>,
     pub deploying: Mutex<DeploymentState>,
-    pub editor_language: Mutex<Language>,
-    pub editor_theme: Mutex<Theme>,
-    pub editor_tree_view_order: Mutex<TreeViewOrder>,
     pub job_queue: Mutex<Vec<QueuedJob>>,
     pub site: Mutex<Arc<Site>>,
     pub site_dir: PathBuf,
@@ -253,7 +248,11 @@ impl Context {
     /// empty, the empty site itself) and convert it to a collection. This
     /// may fail if we're converting from a video that is inside a playlist,
     /// as a playlist can not contain a collection.
-    pub fn convert_to_collection(&self, site_path: &SitePath) -> Result<Arc<Collection>, String> {
+    pub fn convert_to_collection(
+        &self,
+        language: &Language,
+        site_path: &SitePath
+    ) -> Result<Arc<Collection>, String> {
         let mut site_mut = self.get_site_mut();
 
         if site_path.is_root_path() {
@@ -369,7 +368,6 @@ impl Context {
             match self.get_any(site_path) {
                 GetAnyResult::Collection(collection) => Ok(collection),
                 GetAnyResult::None => {
-                    let language = self.get_editor_language();
                     Err(language.translations.the_resource_xxx_was_not_found_message(site_path.normalized()))
                 }
                 GetAnyResult::Playlist(playlist) => {
@@ -469,7 +467,11 @@ impl Context {
     /// playlist can not contain), or if we're converting from a video that
     /// is contained inside a playlist (as a playlist can not contain another
     /// playlist).
-    pub fn convert_to_playlist(&self, site_path: &SitePath) -> Result<Arc<Playlist>, String> {
+    pub fn convert_to_playlist(
+        &self,
+        language: &Language,
+        site_path: &SitePath
+    ) -> Result<Arc<Playlist>, String> {
         let mut site_mut = self.get_site_mut();
 
         if site_path.is_root_path() {
@@ -631,7 +633,6 @@ impl Context {
                     Ok(playlist)
                 }
                 GetAnyResult::None => {
-                    let language = self.get_editor_language();
                     Err(language.translations.the_resource_xxx_was_not_found_message(site_path.normalized()))
                 }
                 GetAnyResult::Playlist(playlist) => Ok(playlist),
@@ -693,7 +694,11 @@ impl Context {
     /// Take the collection or playlist at the given path (or if the site is still empty,
     /// the empty site itself) and convert it to a video. This only succeeds if we're
     /// converting from a collection or playlist that contains exactly one video (or none).
-    pub fn convert_to_video(&self, site_path: &SitePath) -> Result<Arc<Video>, String> {
+    pub fn convert_to_video(
+        &self,
+        language: &Language,
+        site_path: &SitePath
+    ) -> Result<Arc<Video>, String> {
         let mut site_mut = self.get_site_mut();
 
         if site_path.is_root_path() {
@@ -990,7 +995,6 @@ impl Context {
                     Ok(video)
                 }
                 GetAnyResult::None => {
-                    let language = self.get_editor_language();
                     Err(language.translations.the_resource_xxx_was_not_found_message(site_path.normalized()))
                 }
                 GetAnyResult::Playlist(playlist) => {
@@ -1212,24 +1216,6 @@ impl Context {
         self.site.lock().unwrap().get_collection(site_path)
     }
 
-    /// Returns cloned `Language`, allowing subsequent read-only usage
-    /// of the language without keeping a lock on it.
-    pub fn get_editor_language(&self) -> Language {
-        self.editor_language.lock().unwrap().clone()
-    }
-
-    /// Returns cloned `TreeViewOrder`, allowing subsequent read-only usage
-    /// of the tree view order without keeping a lock on it.
-    pub fn get_editor_tree_view_order(&self) -> TreeViewOrder {
-        self.editor_tree_view_order.lock().unwrap().clone()
-    }
-
-    /// Returns cloned `Theme`, allowing subsequent read-only usage
-    /// of the theme without keeping a lock on it.
-    pub fn get_editor_theme(&self) -> Theme {
-        self.editor_theme.lock().unwrap().clone()
-    }
-
     /// Returns the playlist at the given path.
     pub fn get_playlist(&self, site_path: &SitePath) -> Option<Arc<Playlist>> {
         self.site.lock().unwrap().get_playlist(site_path)
@@ -1258,9 +1244,6 @@ impl Context {
         build_dir: PathBuf,
         cache: Mutex<Cache>,
         cache_dir: PathBuf,
-        editor_language: &str,
-        editor_theme: &str,
-        editor_tree_view_order: TreeViewOrder,
         site: Arc<Site>,
         site_dir: PathBuf
     ) -> Context {
@@ -1270,9 +1253,6 @@ impl Context {
             cache_dir,
             completed_jobs: Mutex::new(Vec::new()),
             deploying: Mutex::new(DeploymentState::new()),
-            editor_language: Mutex::new(Language::from_code(editor_language)),
-            editor_theme: Mutex::new(Theme::from_key(editor_theme).unwrap_or_else(|_| Theme::default())),
-            editor_tree_view_order: Mutex::new(editor_tree_view_order),
             job_queue: Mutex::new(Vec::new()),
             site: Mutex::new(site),
             site_dir
diff --git a/src/deploy.rs b/core/src/deploy.rs
similarity index 57%
rename from src/deploy.rs
rename to core/src/deploy.rs
index 7ccc5a0..5b585a9 100644
--- a/src/deploy.rs
+++ b/core/src/deploy.rs
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2024-2025 Simon Repp
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use std::io;
 use std::sync::Arc;
-use std::thread;
-use std::time::{Duration, SystemTime};
+use std::time::SystemTime;
 
-use crate::{Context, Site, Translations};
+use hyper8_translations::Translations;
+
+use crate::{Context, Site};
 
 mod ftp;
 mod ftp_config;
@@ -86,70 +86,6 @@ pub fn config_probe(
     panic!("Caller must ensure that a complete FTP or rsync config is available")
 }
 
-/// Performs deployment in a synchronous fashion, reporting back all messages
-/// and errors to the terminal. Also asks for explicit ("opt-in") confirmation
-/// before performing the actual deployment.
-pub fn perform_deploy_blocking_cli(
-    context_ref: &Arc<Context>,
-    site: &Site,
-    translations: &Translations
-) -> Result<(), String> {
-    if site.base_url.is_none() {
-        let site_manifest_path = context_ref.site_dir.join("site.eno");
-        let message = translations.public_address_must_be_configured_for_deployment_text_cli(&site_manifest_path);
-        return Err(message);
-    }
-
-    if !site.complete_deployment_config() {
-        let message = translations.deployment_configuration_is_incomplete_can_not_deploy.to_string();
-        return Err(message);
-    }
-
-    let t_really_deploy = translations.really_deploy;
-    let base_url = &site.base_url.as_ref().unwrap().representation;
-    println!("{t_really_deploy} ({base_url})");
-    println!("{}", translations.type_y_and_press_enter_to_confirm_anything_else_will_abort);
-
-    let mut input = String::new();
-    match io::stdin().read_line(&mut input) {
-        Ok(_) => {
-            if input.trim() != "y" {
-                return Ok(());
-            }
-        }
-        Err(err) => return Err(err.to_string())
-    }
-
-    if let Err(err) = config_probe(context_ref, site, translations) {
-        let t_deployment_configuration_could_not_be_verified = translations.deployment_configuration_could_not_be_verified;
-        let message = format!("{t_deployment_configuration_could_not_be_verified} ({err})");
-        return Err(message);
-    }
-
-    start_deploy(context_ref, site, translations)?;
-
-    let mut seen_feedback = 0;
-
-    loop {
-        thread::sleep(Duration::from_secs(1));
-
-        if let Ok(deployment) = context_ref.deploying.lock() {
-            let feedback = &deployment.feedback;
-
-            if feedback.len() > seen_feedback {
-                eprintln!("{}", &feedback[seen_feedback..]);
-                seen_feedback = feedback.len();
-            }
-
-            if !deployment.active() {
-                break;
-            }
-        }
-    }
-
-    Ok(())
-}
-
 /// Caller needs to ensure that there is either a complete FTP or rsync
 /// configuration available, otherwise will panic.
 pub fn start_deploy(
diff --git a/src/deploy/ftp.rs b/core/src/deploy/ftp.rs
similarity index 99%
rename from src/deploy/ftp.rs
rename to core/src/deploy/ftp.rs
index 311dcd9..4d28580 100644
--- a/src/deploy/ftp.rs
+++ b/core/src/deploy/ftp.rs
@@ -12,7 +12,9 @@ use std::thread;
 use chrono::{DateTime, Utc};
 use indoc::indoc;
 
-use crate::{Context, Site, SitePath, Translations};
+use hyper8_translations::Translations;
+
+use crate::{Context, Site, SitePath};
 use crate::util::{
     nanoid,
     string_from_os_string
diff --git a/src/deploy/ftp_config.rs b/core/src/deploy/ftp_config.rs
similarity index 100%
rename from src/deploy/ftp_config.rs
rename to core/src/deploy/ftp_config.rs
diff --git a/src/deploy/ftp_stream_wrapper.rs b/core/src/deploy/ftp_stream_wrapper.rs
similarity index 100%
rename from src/deploy/ftp_stream_wrapper.rs
rename to core/src/deploy/ftp_stream_wrapper.rs
diff --git a/src/deploy/ftp_sync_error.rs b/core/src/deploy/ftp_sync_error.rs
similarity index 100%
rename from src/deploy/ftp_sync_error.rs
rename to core/src/deploy/ftp_sync_error.rs
diff --git a/src/deploy/rsync.rs b/core/src/deploy/rsync.rs
similarity index 98%
rename from src/deploy/rsync.rs
rename to core/src/deploy/rsync.rs
index f900cf4..912390f 100644
--- a/src/deploy/rsync.rs
+++ b/core/src/deploy/rsync.rs
@@ -10,7 +10,9 @@ use std::thread;
 
 use indoc::indoc;
 
-use crate::{Context, Site, SitePath, Translations};
+use hyper8_translations::Translations;
+
+use crate::{Context, Site, SitePath};
 use crate::util::nanoid;
 
 const RSYNC_CONFIG_PROBE_FILE_NAME: &str = ".hyper8_rsync_config_probe.txt";
@@ -179,8 +181,6 @@ pub fn start_deploy(
         }
     }
 
-    let context = Arc::clone(context_ref);
-
     let remote_deploy_path = format!(
         "{user}@{server}:{path}",
         path = Path::new(site.ssh_config.path_unchecked()).join("./").to_string_lossy(),
@@ -192,11 +192,13 @@ pub fn start_deploy(
 
     command.arg("-avP");
     command.arg("--delete");
-    command.arg(context.build_dir.join("./"));
+    command.arg(context_ref.build_dir.join("./"));
     command.arg(remote_deploy_path);
 
     command.stdout(Stdio::piped());
 
+    let context = Arc::clone(context_ref);
+
     thread::spawn(move || {
         match command.spawn() {
             Ok(mut child) => {
diff --git a/src/deploy/ssh_config.rs b/core/src/deploy/ssh_config.rs
similarity index 100%
rename from src/deploy/ssh_config.rs
rename to core/src/deploy/ssh_config.rs
diff --git a/src/file_meta.rs b/core/src/file_meta.rs
similarity index 92%
rename from src/file_meta.rs
rename to core/src/file_meta.rs
index 9e3cbec..0940e6b 100644
--- a/src/file_meta.rs
+++ b/core/src/file_meta.rs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Simon Repp
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use std::fs;
diff --git a/src/font.rs b/core/src/font.rs
similarity index 100%
rename from src/font.rs
rename to core/src/font.rs
diff --git a/src/hyper_dir.rs b/core/src/hyper_dir.rs
similarity index 100%
rename from src/hyper_dir.rs
rename to core/src/hyper_dir.rs
diff --git a/src/image_processor.rs b/core/src/image_processor.rs
similarity index 100%
rename from src/image_processor.rs
rename to core/src/image_processor.rs
diff --git a/src/inherited_options.rs b/core/src/inherited_options.rs
similarity index 100%
rename from src/inherited_options.rs
rename to core/src/inherited_options.rs
diff --git a/src/jobs.rs b/core/src/jobs.rs
similarity index 72%
rename from src/jobs.rs
rename to core/src/jobs.rs
index ec2dbd6..925a737 100644
--- a/src/jobs.rs
+++ b/core/src/jobs.rs
@@ -5,6 +5,8 @@ use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 
+use hyper8_translations::Translations;
+
 use crate::Context;
 
 mod encode;
@@ -21,18 +23,31 @@ pub use worker::Worker;
 
 use encode::FFmpegEncodingStats;
 
-pub fn start_workers(count: usize, context_ref: &Arc<Context>) {
+// TODO: This currently "bakes" the language into the worker, i.e. whatever the
+//       passed language when the worker is started, remains the language in which
+//       it produces messages throughout the session (no matter if the language has
+//       then changed). I.e. we need to move the passing of language closer to the
+//       invocation (e.g. passing it in the Job/JobDesc as a next step, or giving
+//       a ref-counted language handle to the worker that it shares with context
+//       itself). (In an ideal scenario the language would only be brought into
+//       the equation at display time (i.e. all errors are just semantic markers
+//       that are then rendered into the given language when they are displayed),
+//       but this can be done someday (TM) because it's so complex and has little
+//       reward in 99% of real life cases).
+pub fn start_workers(
+    context_ref: &Arc<Context>,
+    count: usize,
+    translations: &Translations
+) {
     for worker_number in 1..=count {
         let context = Arc::clone(context_ref);
+        let translations = translations.clone();
 
         thread::spawn(move || {
             let high_priority_only = worker_number == 1;
 
             let worker = Worker::new(high_priority_only, worker_number);
 
-            let language = context.get_editor_language();
-            let translations = &language.translations;
-
             loop {
                 let job = match context.take_next_job(&worker) {
                     Some(job) => job,
@@ -48,14 +63,14 @@ pub fn start_workers(count: usize, context_ref: &Arc<Context>) {
                             format,
                             &context,
                             job.id.clone(),
-                            translations,
+                            &translations,
                             video
                         ).err()
                     }
                     JobDesc::AudioMeta { video } => {
                         Worker::compute_audio_metadata(
                             &context,
-                            translations,
+                            &translations,
                             video
                         ).err()
                     }
@@ -63,21 +78,21 @@ pub fn start_workers(count: usize, context_ref: &Arc<Context>) {
                         Worker::compute_collection_fast_tasks(
                             collection,
                             &context,
-                            translations
+                            &translations
                         ).err()
                     }
                     JobDesc::PlaylistFastTasks { playlist } => {
                         Worker::compute_playlist_fast_tasks(
                             &context,
                             playlist,
-                            translations
+                            &translations
                         ).err()
                     }
                     JobDesc::VideoFastTasks { poster_aspect, video } => {
                         Worker::compute_video_fast_tasks(
                             &context,
                             poster_aspect,
-                            translations,
+                            &translations,
                             video
                         ).err()
                     }
@@ -85,7 +100,7 @@ pub fn start_workers(count: usize, context_ref: &Arc<Context>) {
                         Worker::render_video_format(
                             &context,
                             job.id.clone(),
-                            translations,
+                            &translations,
                             video,
                             format
                         ).err()
@@ -95,7 +110,7 @@ pub fn start_workers(count: usize, context_ref: &Arc<Context>) {
                             &context,
                             poster_aspect,
                             timecode,
-                            translations,
+                            &translations,
                             video
                         ).err()
                     }
diff --git a/src/jobs/encode.rs b/core/src/jobs/encode.rs
similarity index 99%
rename from src/jobs/encode.rs
rename to core/src/jobs/encode.rs
index fa781d7..df6255a 100644
--- a/src/jobs/encode.rs
+++ b/core/src/jobs/encode.rs
@@ -8,6 +8,8 @@ use std::sync::Arc;
 use std::thread;
 use std::time::Instant;
 
+use hyper8_translations::Translations;
+
 use crate::{
     AudioFile,
     AudioFormat,
@@ -16,7 +18,6 @@ use crate::{
     EncodingApproach,
     FileMeta,
     JobProgress,
-    Translations,
     Video,
     VideoFile,
     VideoFormat
diff --git a/src/jobs/job.rs b/core/src/jobs/job.rs
similarity index 100%
rename from src/jobs/job.rs
rename to core/src/jobs/job.rs
diff --git a/src/jobs/job_desc.rs b/core/src/jobs/job_desc.rs
similarity index 86%
rename from src/jobs/job_desc.rs
rename to core/src/jobs/job_desc.rs
index 03725a5..888a1f0 100644
--- a/src/jobs/job_desc.rs
+++ b/core/src/jobs/job_desc.rs
@@ -3,15 +3,15 @@
 
 use std::sync::Arc;
 
+use hyper8_translations::Translations;
+
 use crate::{
     AudioFormat,
     Collection,
     Playlist,
-    Translations,
     Video,
     VideoFormat
 };
-use crate::editor::routes;
 
 /// The job description specifies what needs to be done in a processing job,
 /// and to which resource (collection, playlist or video) it applies.
@@ -105,26 +105,6 @@ impl JobDesc {
             }
         }
     }
-
-    /// The url for editing the collection, playlist or video which is part of
-    /// this job description in the editor.
-    pub fn target_edit_url(&self) -> String {
-        match self {
-            JobDesc::CollectionFastTasks { collection } => {
-                routes::collection_edit(collection)
-            }
-            JobDesc::PlaylistFastTasks { playlist } => {
-                routes::playlist_edit(playlist)
-            }
-            JobDesc::AudioFormat { video, .. } |
-            JobDesc::AudioMeta { video } |
-            JobDesc::VideoFastTasks { video, .. } |
-            JobDesc::VideoFormat { video, .. } |
-            JobDesc::VideoPickPoster { video, .. } => {
-                routes::video_edit(video)
-            }
-        }
-    }
 }
 
 impl PartialEq for JobDesc {
diff --git a/src/jobs/job_progress.rs b/core/src/jobs/job_progress.rs
similarity index 100%
rename from src/jobs/job_progress.rs
rename to core/src/jobs/job_progress.rs
diff --git a/src/jobs/probe.rs b/core/src/jobs/probe.rs
similarity index 99%
rename from src/jobs/probe.rs
rename to core/src/jobs/probe.rs
index 1c1eb84..d2a7f6a 100644
--- a/src/jobs/probe.rs
+++ b/core/src/jobs/probe.rs
@@ -7,11 +7,9 @@ use std::process::{Command};
 
 use serde_derive::Deserialize;
 
-use crate::{
-    AudioMeta,
-    Translations,
-    VideoMeta
-};
+use hyper8_translations::Translations;
+
+use crate::{AudioMeta, VideoMeta};
 
 pub const FFPROBE: &str = if cfg!(windows) { "ffprobe.exe" } else { "ffprobe" };
 
diff --git a/src/jobs/worker.rs b/core/src/jobs/worker.rs
similarity index 99%
rename from src/jobs/worker.rs
rename to core/src/jobs/worker.rs
index 7b98139..57805a2 100644
--- a/src/jobs/worker.rs
+++ b/core/src/jobs/worker.rs
@@ -4,6 +4,8 @@
 use std::fs;
 use std::sync::Arc;
 
+use hyper8_translations::Translations;
+
 use crate::{
     AudioFormat,
     AudioMetaCached,
@@ -21,7 +23,6 @@ use crate::{
     PosterFile,
     PosterSourceCached,
     ResizeMode,
-    Translations,
     Video,
     VideoFormat,
     VideoMetaCached,
diff --git a/src/language.rs b/core/src/language.rs
similarity index 99%
rename from src/language.rs
rename to core/src/language.rs
index f5ac5bf..df035f3 100644
--- a/src/language.rs
+++ b/core/src/language.rs
@@ -8,7 +8,7 @@ use icu_locale::Locale as IcuLocale;
 use icu_locale::locale as icu_locale;
 use log::warn;
 
-use crate::Translations;
+use hyper8_translations::Translations;
 
 #[derive(Debug)]
 pub struct Language {
diff --git a/core/src/lib.rs b/core/src/lib.rs
new file mode 100644
index 0000000..e81075a
--- /dev/null
+++ b/core/src/lib.rs
@@ -0,0 +1,106 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+mod aspect_ratio;
+mod audio_file;
+mod audio_format;
+mod audio_meta;
+mod banner;
+mod build;
+mod cache;
+mod collection;
+mod container;
+mod container_order;
+mod context;
+mod deploy;
+mod file_meta;
+mod font;
+mod hyper_dir;
+mod image_processor;
+mod inherited_options;
+mod jobs;
+mod language;
+mod link;
+mod lqip;
+mod manifest;
+mod markdown_subset;
+mod platform_integration;
+mod playlist;
+mod poster_assets;
+mod poster_file;
+mod poster_meta;
+mod preview_server;
+mod site;
+mod site_path;
+mod site_url;
+mod sort;
+mod subtitles;
+mod theme;
+mod video;
+mod video_file;
+mod video_format;
+mod video_meta;
+mod video_order;
+
+pub mod browser_support;
+pub mod util;
+pub mod watcher;
+
+use audio_meta::AudioMeta;
+use cache::{AudioMetaCached, PosterAssetsCached, PosterSourceCached, VideoMetaCached};
+use deploy::{FtpConfig, SshConfig};
+use image_processor::{ImageProcessor, ResizeMode};
+use inherited_options::InheritedOptions;
+use jobs::{CompletedJob, QueuedJob, Worker};
+use lqip::Lqip;
+use markdown_subset::MarkdownSubset;
+use platform_integration::{PlatformIntegrationImage, PlatformIntegrationMeta};
+use poster_assets::{PosterAsset, PosterAssets};
+use poster_meta::PosterMeta;
+use sort::SortDirection;
+use video_format::{Codec, EncodingApproach};
+use video_meta::VideoMeta;
+
+pub use aspect_ratio::AspectRatio;
+pub use audio_file::AudioFile;
+pub use audio_format::AudioFormat;
+pub use banner::Banner;
+pub use build::perform_build;
+pub use cache::Cache;
+pub use collection::Collection;
+pub use container::Container;
+pub use container_order::ContainerOrder;
+pub use context::{
+	CollectionUpdate,
+	Context,
+	GetAnyResult,
+	PlaylistUpdate,
+	SiteUpdate,
+	VideoParent,
+	VideoUpdate
+};
+pub use deploy::DeploymentState;
+// TODO: Rename "config_probe" to something clearer? (e.g. test_deployment_config or such)
+pub use deploy::{config_probe, start_deploy};
+pub use file_meta::FileMeta;
+pub use font::Font;
+pub use hyper_dir::HyperDir;
+pub use jobs::{JobDesc, JobProgress};
+pub use jobs::start_workers;
+pub use language::Language;
+pub use link::Link;
+pub use manifest::MAX_SYNOPSIS_CHARS;
+pub use platform_integration::PlatformIntegration;
+pub use playlist::Playlist;
+pub use poster_file::PosterFile;
+pub use preview_server::start as start_preview_server;
+pub use site::{Site, SiteContent};
+pub use site_path::SitePath;
+pub use site_url::SiteUrl;
+pub use sort::{Asc, Comparison, Desc};
+pub use subtitles::SubtitleFile;
+pub use theme::{Theme, ThemeKind};
+pub use video::Video;
+pub use video_file::VideoFile;
+pub use video_format::VideoFormat;
+pub use video_order::VideoOrder;
diff --git a/src/link.rs b/core/src/link.rs
similarity index 100%
rename from src/link.rs
rename to core/src/link.rs
diff --git a/src/lqip.rs b/core/src/lqip.rs
similarity index 100%
rename from src/lqip.rs
rename to core/src/lqip.rs
diff --git a/src/manifest.rs b/core/src/manifest.rs
similarity index 100%
rename from src/manifest.rs
rename to core/src/manifest.rs
diff --git a/src/markdown_subset.rs b/core/src/markdown_subset.rs
similarity index 100%
rename from src/markdown_subset.rs
rename to core/src/markdown_subset.rs
diff --git a/src/platform_integration.rs b/core/src/platform_integration.rs
similarity index 98%
rename from src/platform_integration.rs
rename to core/src/platform_integration.rs
index b44b938..fabe4d3 100644
--- a/src/platform_integration.rs
+++ b/core/src/platform_integration.rs
@@ -9,7 +9,9 @@
 //! - https://ogp.me/
 //! - https://developers.facebook.com/docs/sharing/webmasters/#video
 
-use crate::{Site, Translations};
+use hyper8_translations::Translations;
+
+use crate::Site;
 use crate::util::html_escape_inside_attribute;
 
 pub struct Embed {
@@ -137,7 +139,7 @@ impl PlatformIntegrationMeta {
 
         // Open Graph metadata (for link previews and content embeds)
 
-        // TODO: Sketched out for usage when we have audio(-only) content too
+        // TODO: Uncomment and put the new audio(-only) content to use here
         // if let Some(audio) = &self.audio {
         //     tags.push(format!(r#"<meta property="og:audio" content="{audio}"/>"#));
         // }
diff --git a/src/playlist.rs b/core/src/playlist.rs
similarity index 97%
rename from src/playlist.rs
rename to core/src/playlist.rs
index c7161f8..1284c80 100644
--- a/src/playlist.rs
+++ b/core/src/playlist.rs
@@ -9,12 +9,11 @@ use std::sync::Arc;
 use chrono::NaiveDate;
 use url::Url;
 
+use hyper8_translations::Translations;
+
 use crate::{
-    Asc,
     Banner,
-    Comparison,
     Context,
-    Desc,
     FileMeta,
     GetAnyResult,
     HyperDir,
@@ -24,8 +23,6 @@ use crate::{
     PlatformIntegration,
     Site,
     SitePath,
-    Translations,
-    TreeViewOrder,
     Video,
     VideoOrder,
     VideoUpdate
@@ -91,14 +88,6 @@ impl Playlist {
     fn apply_manifest(&mut self, context: &Context, manifest_path: &Path) {
         let content = fs::read_to_string(manifest_path).unwrap();
 
-        // TODO: Tricky manifest problem/question in general: If there is anything wrong
-        //       with the manifest (especially: syntax error rendering the entire manifest useless),
-        //       we can potentially erase everything contained in it by doing an update via the browser
-        //       editor (it persists what has been read - nothing!). Consequently we should e.g. disable
-        //       the edit form/updates via browser editor while there are issues with the manifest, or
-        //       try to read in some things in a "broken state", e.g. registering a poster although the
-        //       image referenced was not found.
-
         let document = match enolib::parse(&content) {
             Ok(document) => document,
             Err(err) => {
@@ -1070,25 +1059,6 @@ impl Playlist {
         }
     }
 
-    pub fn videos_in_tree_view_order(
-        &self,
-        language: &Language,
-        tree_view_order: &TreeViewOrder
-    ) -> Vec<Arc<Video>> {
-        let mut videos: Vec<Arc<Video>> = self.videos.clone();
-
-        let (comparison, direction) = match tree_view_order {
-            TreeViewOrder::Default |
-            TreeViewOrder::SiteOrder => Video::video_order_comparison_and_direction(&self.order),
-            TreeViewOrder::TitleAsc => (Video::cmp_slug_then_title as Comparison<Video>, Asc),
-            TreeViewOrder::TitleDesc => (Video::cmp_slug_then_title as Comparison<Video>, Desc)
-        };
-
-        videos.sort_unstable_by(|a, b| comparison(a, b, &language.icu_collator, direction));
-
-        videos
-    }
-
     pub fn write_manifest(&self, context: &Context) {
         let mut eno = String::new();
 
diff --git a/src/poster_assets.rs b/core/src/poster_assets.rs
similarity index 100%
rename from src/poster_assets.rs
rename to core/src/poster_assets.rs
diff --git a/src/poster_file.rs b/core/src/poster_file.rs
similarity index 100%
rename from src/poster_file.rs
rename to core/src/poster_file.rs
diff --git a/src/poster_meta.rs b/core/src/poster_meta.rs
similarity index 100%
rename from src/poster_meta.rs
rename to core/src/poster_meta.rs
diff --git a/src/preview_server.rs b/core/src/preview_server.rs
similarity index 90%
rename from src/preview_server.rs
rename to core/src/preview_server.rs
index 82ed7ee..a032580 100644
--- a/src/preview_server.rs
+++ b/core/src/preview_server.rs
@@ -19,8 +19,8 @@ const MAX_PORT_ATTEMPTS: u16 = 10;
 #[actix_web::main]
 pub async fn start(
     build_dir: &Path,
-    ip_requested: &Option<IpAddr>,
-    port_requested: &Option<u16>
+    ip_requested: Option<&IpAddr>,
+    port_requested: Option<&u16>
 ) -> Result<(), ()> {
     let bind_server = |build_dir_moving: PathBuf, ip: IpAddr, port: u16| {
         HttpServer::new(move || {
@@ -35,10 +35,10 @@ pub async fn start(
         .bind((ip, port))
     };
 
-    let ip = ip_requested.unwrap_or(DEFAULT_PREVIEW_IP);
+    let ip = ip_requested.unwrap_or(&DEFAULT_PREVIEW_IP);
 
     let (server, port_bound) = if let Some(port) = port_requested {
-        match bind_server(build_dir.to_path_buf(), ip, *port) {
+        match bind_server(build_dir.to_path_buf(), *ip, *port) {
             Ok(server) => (server, *port),
             Err(err) => {
                 eprintln!("Could not bind preview server to {ip}:{port} ({err})");
@@ -49,7 +49,7 @@ pub async fn start(
         let mut port = DEFAULT_PREVIEW_PORT;
 
         loop {
-            match bind_server(build_dir.to_path_buf(), ip, port) {
+            match bind_server(build_dir.to_path_buf(), *ip, port) {
                 Ok(server) => break (server, port),
                 Err(err) => {
                     if port > DEFAULT_PREVIEW_PORT + MAX_PORT_ATTEMPTS {
diff --git a/src/site.rs b/core/src/site.rs
similarity index 100%
rename from src/site.rs
rename to core/src/site.rs
diff --git a/src/site_path.rs b/core/src/site_path.rs
similarity index 100%
rename from src/site_path.rs
rename to core/src/site_path.rs
diff --git a/src/site_url.rs b/core/src/site_url.rs
similarity index 100%
rename from src/site_url.rs
rename to core/src/site_url.rs
diff --git a/src/sort.rs b/core/src/sort.rs
similarity index 100%
rename from src/sort.rs
rename to core/src/sort.rs
diff --git a/src/subtitles.rs b/core/src/subtitles.rs
similarity index 100%
rename from src/subtitles.rs
rename to core/src/subtitles.rs
diff --git a/src/theme.rs b/core/src/theme.rs
similarity index 98%
rename from src/theme.rs
rename to core/src/theme.rs
index 1c48ed7..c494bfa 100644
--- a/src/theme.rs
+++ b/core/src/theme.rs
@@ -1,9 +1,9 @@
-// SPDX-FileCopyrightText: 2024 Simon Repp
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use indoc::formatdoc;
 
-use crate::Translations;
+use hyper8_translations::Translations;
 
 mod color;
 mod dark_cool;
diff --git a/src/theme/color.rs b/core/src/theme/color.rs
similarity index 100%
rename from src/theme/color.rs
rename to core/src/theme/color.rs
diff --git a/src/theme/dark_cool.rs b/core/src/theme/dark_cool.rs
similarity index 100%
rename from src/theme/dark_cool.rs
rename to core/src/theme/dark_cool.rs
diff --git a/src/theme/dark_deep.rs b/core/src/theme/dark_deep.rs
similarity index 100%
rename from src/theme/dark_deep.rs
rename to core/src/theme/dark_deep.rs
diff --git a/src/theme/dark_neutral.rs b/core/src/theme/dark_neutral.rs
similarity index 100%
rename from src/theme/dark_neutral.rs
rename to core/src/theme/dark_neutral.rs
diff --git a/src/theme/dark_warm.rs b/core/src/theme/dark_warm.rs
similarity index 100%
rename from src/theme/dark_warm.rs
rename to core/src/theme/dark_warm.rs
diff --git a/src/theme/light_cool.rs b/core/src/theme/light_cool.rs
similarity index 100%
rename from src/theme/light_cool.rs
rename to core/src/theme/light_cool.rs
diff --git a/src/theme/light_deep.rs b/core/src/theme/light_deep.rs
similarity index 100%
rename from src/theme/light_deep.rs
rename to core/src/theme/light_deep.rs
diff --git a/src/theme/light_neutral.rs b/core/src/theme/light_neutral.rs
similarity index 100%
rename from src/theme/light_neutral.rs
rename to core/src/theme/light_neutral.rs
diff --git a/src/theme/light_warm.rs b/core/src/theme/light_warm.rs
similarity index 100%
rename from src/theme/light_warm.rs
rename to core/src/theme/light_warm.rs
diff --git a/src/theme/theme_vars.rs b/core/src/theme/theme_vars.rs
similarity index 100%
rename from src/theme/theme_vars.rs
rename to core/src/theme/theme_vars.rs
diff --git a/src/util.rs b/core/src/util.rs
similarity index 95%
rename from src/util.rs
rename to core/src/util.rs
index 3debcef..806dd19 100644
--- a/src/util.rs
+++ b/core/src/util.rs
@@ -13,7 +13,9 @@ use chrono::{Locale as ChronoLocale, NaiveDate};
 use nanoid::nanoid;
 use slug::slugify;
 
-use crate::{Context, Translations};
+use hyper8_translations::Translations;
+
+use crate::Context;
 
 /// When we perform updates on collections, playlists and videos in the site
 /// tree, the underlying mutation is often infallible, therefore the error
@@ -24,30 +26,6 @@ macro_rules! infallible_mutation {
     () => { unreachable!("Infallible mutation") };
 }
 
-pub struct Field {
-    pub error: Option<String>,
-    pub value: String
-}
-
-impl Field {
-    pub fn valid(value: impl Into<String>) -> Field {
-        Field {
-            error: None,
-            value: value.into()
-        }
-    }
-
-    pub fn validated(
-        value: impl Into<String>,
-        error: Option<impl Into<String>>
-    ) -> Field {
-        Field {
-            error: error.map(|message| message.into()),
-            value: value.into()
-        }
-    }
-}
-
 /// Takes seconds, formats it like "25 min", "33 sec", "158 min", "3.6 hrs", "11 hrs"
 pub fn casual_duration(seconds: f32, translations: &Translations) -> String {
     if seconds < 60.0 {
diff --git a/src/video.rs b/core/src/video.rs
similarity index 99%
rename from src/video.rs
rename to core/src/video.rs
index 2323173..22ace2a 100644
--- a/src/video.rs
+++ b/core/src/video.rs
@@ -8,8 +8,11 @@ use std::sync::Arc;
 
 use chrono::NaiveDate;
 use icu_collator::CollatorBorrowed;
+use language_tags::LanguageTag;
 use url::Url;
 
+use hyper8_translations::Translations;
+
 use crate::{
     Asc,
     AudioFile,
@@ -26,11 +29,9 @@ use crate::{
     SitePath,
     SortDirection,
     SubtitleFile,
-    Translations,
     VideoFile,
     VideoOrder
 };
-use language_tags::LanguageTag;
 use crate::manifest::MAX_SYNOPSIS_CHARS;
 use crate::manifest::{attribute_error, element_error, not_supported_error};
 use crate::util::{
diff --git a/src/video_file.rs b/core/src/video_file.rs
similarity index 100%
rename from src/video_file.rs
rename to core/src/video_file.rs
diff --git a/src/video_format.rs b/core/src/video_format.rs
similarity index 100%
rename from src/video_format.rs
rename to core/src/video_format.rs
diff --git a/src/video_meta.rs b/core/src/video_meta.rs
similarity index 100%
rename from src/video_meta.rs
rename to core/src/video_meta.rs
diff --git a/src/video_order.rs b/core/src/video_order.rs
similarity index 100%
rename from src/video_order.rs
rename to core/src/video_order.rs
diff --git a/src/watcher.rs b/core/src/watcher.rs
similarity index 93%
rename from src/watcher.rs
rename to core/src/watcher.rs
index 0e1dacf..e44dd84 100644
--- a/src/watcher.rs
+++ b/core/src/watcher.rs
@@ -19,7 +19,10 @@ use crate::Context;
 
 const DEBOUNCE_PERIOD_MILLIS: u64 = 500;
 
-pub fn watch (context: Arc<Context>) {
+/// Watches the site directory on disk for changes (e.g. such that were
+/// externally done in a file manager by the user) and triggers updates to
+/// the internal site tree.
+pub fn watch_site_dir(context: Arc<Context>) {
     thread::spawn(move || {
         let (sender, receiver) = mpsc::channel();
 
diff --git a/docs/Cargo.lock b/docs/Cargo.lock
deleted file mode 100644
index bd9e773..0000000
--- a/docs/Cargo.lock
+++ /dev/null
@@ -1,206 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bitflags"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
-
-[[package]]
-name = "bumpalo"
-version = "3.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "deunicode"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
-
-[[package]]
-name = "docs"
-version = "0.23.0"
-dependencies = [
- "base64",
- "enolib",
- "indoc",
- "pulldown-cmark",
- "slug",
-]
-
-[[package]]
-name = "enolib"
-version = "0.5.0"
-source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.5.0#011a93092e5127c9354d643e9ac51ff592cf59f2"
-
-[[package]]
-name = "indoc"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
-
-[[package]]
-name = "log"
-version = "0.4.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "once_cell"
-version = "1.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "pulldown-cmark"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
-dependencies = [
- "bitflags",
- "memchr",
- "pulldown-cmark-escape",
- "unicase",
-]
-
-[[package]]
-name = "pulldown-cmark-escape"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
-
-[[package]]
-name = "quote"
-version = "1.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
-
-[[package]]
-name = "slug"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724"
-dependencies = [
- "deunicode",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicase"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
diff --git a/docs/Cargo.lock.license b/docs/Cargo.lock.license
deleted file mode 100644
index f9e2eae..0000000
--- a/docs/Cargo.lock.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2025 Simon Repp
-SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/docs/Cargo.toml b/docs/Cargo.toml
index b85ed7a..b64f141 100644
--- a/docs/Cargo.toml
+++ b/docs/Cargo.toml
@@ -2,15 +2,15 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 [package]
-authors = ["Simon Repp"]
-edition = "2021"
-name = "docs"
-rust-version = "1.78.0"
-version = "0.23.0"
+edition.workspace = true
+name = "hyper8-docs"
+rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
-base64 = "0.22.1"
-enolib = { git = "https://codeberg.org/simonrepp/enolib-rs", tag = "0.5.0" }
-indoc = "2.0.6"
-pulldown-cmark = { default-features = false, features = ["html", "simd"], version = "0.13.0" }
-slug = "0.1.6"
+base64.workspace = true
+enolib.workspace = true
+hyper8-version = { path = "../version" }
+indoc.workspace = true
+pulldown-cmark.workspace = true
+slug.workspace = true
diff --git a/docs/README.md b/docs/README.md
index a566b15..d5ca859 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -11,7 +11,11 @@ specifying the folder to which the docs should be written.
 **Take extra care specifying the target directory path, this directory gets
 wiped and rewritten in the process.**
 
-`cargo run -- /path/to/docs`
+From the root of the hyper8 workspace run this command:
+
+```bash
+cargo run --package hyper8-docs -- /path/to/docs
+```
 
 ## Check internal links/references
 
diff --git a/docs/build.rs b/docs/build.rs
deleted file mode 100644
index f3c231f..0000000
--- a/docs/build.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-/// Build the docs with (e.g.) HYPER8_VERSION=2.0.0~pre1 to override
-/// the version that is displayed in the built docs.
-
-use std::env;
-
-fn main() {
-    let version_display = match env::var("HYPER8_VERSION") {
-        Ok(override_version) => override_version,
-        Err(_) => concat!(env!("CARGO_PKG_VERSION_MAJOR"), '.', env!("CARGO_PKG_VERSION_MINOR")).to_string()
-    };
-
-    println!("cargo:rerun-if-env-changed=HYPER8_VERSION");
-    println!("cargo:rustc-env=HYPER8_VERSION_DISPLAY={version_display}");
-}
diff --git a/docs/src/main.rs b/docs/src/main.rs
index 26d58e3..fbcb56e 100644
--- a/docs/src/main.rs
+++ b/docs/src/main.rs
@@ -11,6 +11,7 @@ use std::path::{Path, PathBuf};
 use base64::Engine;
 use base64::engine::general_purpose::URL_SAFE_NO_PAD;
 use enolib::HtmlPrinter;
+use hyper8_version::VERSION_WITHOUT_PATCH;
 use indoc::formatdoc;
 use pulldown_cmark::{CodeBlockKind, Event, Parser, Tag, TagEnd};
 use pulldown_cmark::html;
@@ -20,8 +21,7 @@ struct Docs {
     examples: Vec<Page>,
     index: Page,
     reference: Vec<Page>,
-    topics: Vec<Page>,
-    version: &'static str
+    topics: Vec<Page>
 }
 
 #[derive(PartialEq)]
@@ -122,22 +122,22 @@ pub fn main() {
     }
 
     fs::copy(
-        "assets/fira-mono-v14-latin_latin-ext-regular.woff2",
+        "docs/assets/fira-mono-v14-latin_latin-ext-regular.woff2",
         docs_out_dir.join("fira-mono-v14-latin_latin-ext-regular.woff2")
     ).unwrap();
 
     fs::copy(
-        "assets/titillium-web-v15-latin_latin-ext-regular.woff2",
+        "docs/assets/titillium-web-v15-latin_latin-ext-regular.woff2",
         docs_out_dir.join("titillium-web-v15-latin_latin-ext-regular.woff2")
     ).unwrap();
 
     fs::copy(
-        "assets/titillium-web-v15-latin_latin-ext-italic.woff2",
+        "docs/assets/titillium-web-v15-latin_latin-ext-italic.woff2",
         docs_out_dir.join("titillium-web-v15-latin_latin-ext-italic.woff2")
     ).unwrap();
 
     fs::copy(
-        "assets/docs.css",
+        "docs/assets/docs.css",
         docs_out_dir.join("docs.css")
     ).unwrap();
 }
@@ -165,7 +165,6 @@ fn layout(body: &str, docs: &Docs, active_page: &Page) -> String {
     let docs_css_hash = url_safe_hash_base64(include_bytes!("../assets/docs.css"));
 
     let title = &active_page.title;
-    let version = docs.version;
 
     formatdoc!(r##"
         <!doctype html>
@@ -180,7 +179,7 @@ fn layout(body: &str, docs: &Docs, active_page: &Page) -> String {
             <body>
                 <header>
                     <a class="title" href="index.html">
-                        <span{index_active}>Hyper 8 Video System {version}</span>
+                        <span{index_active}>Hyper 8 Video System {VERSION_WITHOUT_PATCH}</span>
                     </a>
                     <a class="open_nav" href="#nav">☰</a>
                 </header>
@@ -216,24 +215,21 @@ fn layout(body: &str, docs: &Docs, active_page: &Page) -> String {
 fn read_docs() -> Docs {
     let index_content = markdown_to_html(include_str!("../index.md"));
 
-    let version_display = env!("HYPER8_VERSION_DISPLAY");
-
     let index = Page {
         content: index_content,
         slug: String::from("index"),
-        title: format!("Hyper 8 Video System {version_display}")
+        title: format!("Hyper 8 Video System {VERSION_WITHOUT_PATCH}")
     };
 
-    let examples = read_pages(&Path::new("examples"));
-    let reference = read_pages(&Path::new("reference"));
-    let topics = read_pages(&Path::new("topics"));
+    let examples = read_pages(&Path::new("docs/examples"));
+    let reference = read_pages(&Path::new("docs/reference"));
+    let topics = read_pages(&Path::new("docs/topics"));
 
     Docs {
         examples,
         index,
         reference,
-        topics,
-        version: version_display
+        topics
     }
 }
 
diff --git a/docs/topics/04 Supported Formats.md b/docs/topics/04 Supported Formats.md
index 565bfb3..c73fa97 100644
--- a/docs/topics/04 Supported Formats.md	
+++ b/docs/topics/04 Supported Formats.md	
@@ -20,14 +20,8 @@ The video container formats Hyper 8 currently recognizes are:
 - mkv
 - mov
 
-<!--
 ## Audio
 
-TODO: Implement
-**Heads up**: Although Hyper 8 already recognizes the listed audio formats and
-registers your audio files, implementation and transcoding of audio-file only playback is
-not yet implemented, i.e. this particular section still only describes the intent.
-
 Each video can also be accompanied by audio files, so that people
 can play back only the audio if they would rather do that to save
 bandwidth. If the audio you provide is not playable in every
@@ -36,6 +30,7 @@ to transcode to ubiquitously supported formats for you.
 
 The audio formats Hyper 8 currently recognizes are:
 
+- aac
 - aiff
 - alac
 - flac
@@ -43,7 +38,6 @@ The audio formats Hyper 8 currently recognizes are:
 - ogg
 - opus
 - wav
--->
 
 ## Images
 
diff --git a/icons/Cargo.toml b/icons/Cargo.toml
new file mode 100644
index 0000000..24b0355
--- /dev/null
+++ b/icons/Cargo.toml
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2024-2025 Simon Repp
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+[package]
+edition.workspace = true
+name = "hyper8-icons"
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+indoc.workspace = true
diff --git a/src/icons.rs b/icons/src/lib.rs
similarity index 100%
rename from src/icons.rs
rename to icons/src/lib.rs
diff --git a/src/args.rs b/src/args.rs
deleted file mode 100644
index c0f33f7..0000000
--- a/src/args.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-use std::net::IpAddr;
-use std::path::PathBuf;
-
-use clap::Parser;
-
-fn worker_count(string: &str) -> Result<usize, String> {
-    match string.parse::<usize>() {
-        Ok(number) => match number >= 2 {
-            true => Ok(number),
-            false => Err(String::from("At least 2 workers required"))
-        }
-        Err(err) => Err(err.to_string())
-    }
-}
-
-#[derive(Debug, Parser)]
-#[clap(display_name = "Hyper 8 Video System", version = concat!(env!("HYPER8_VERSION_DETAILED"), " (", env!("HYPER8_REVISION"), ")"))]
-pub struct Args {
-    /// Directly builds the site without starting the editor
-    #[clap(long = "build", short = 'b')]
-    pub build: bool,
-
-    /// The path to which the deployable, built site is written
-    #[clap(long = "build-dir")]
-    pub build_dir: Option<PathBuf>,
-
-    /// The path at which all computational results are stored (computed metadata, images and videos)
-    #[clap(long = "cache-dir")]
-    pub cache_dir: Option<PathBuf>,
-
-    /// Directly deploys the site - only applicable in combination with --build
-    #[clap(long = "deploy", short = 'd')]
-    pub deploy: bool,
-
-    /// Override the language displayed in the editor (e.g. 'en', 'de')
-    #[clap(long = "editor-language")]
-    pub editor_language: Option<String>,
-
-    /// Manually sets the ip address used by the web editor (otherwise defaults to localhost)
-    #[clap(long = "ip")]
-    pub ip: Option<IpAddr>,
-
-    /// Manually sets the port used by the web editor (otherwise hyper8 chooses an available port on its own)
-    #[clap(long = "port")]
-    pub port: Option<u16>,
-
-    /// Use in conjunction with --build to immediately open the site in the browser after the build is complete
-    #[clap(long = "preview", short = 'p')]
-    pub preview: bool,
-
-    /// The path at which the site resides (user videos and metadata)
-    pub site_dir: PathBuf,
-
-    /// The number of threads to run for background processing (metadata computation, image processing, video/audio transcoding, etc.)
-    #[clap(default_value_t = 2, long, value_parser=worker_count)]
-    pub workers: usize
-}
diff --git a/src/editor/config.rs b/src/editor/config.rs
deleted file mode 100644
index c2c1172..0000000
--- a/src/editor/config.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-use std::fs;
-
-use serde_derive::{Deserialize, Serialize};
-
-use super::TreeViewOrder;
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct EditorConfig {
-    pub language_code: String,
-    pub theme_key: String,
-    pub tree_view_order: TreeViewOrder
-}
-
-impl EditorConfig {
-    pub fn new(
-        language_code: &str,
-        theme_key: &str,
-        tree_view_order: TreeViewOrder
-    ) -> EditorConfig {
-        EditorConfig {
-            language_code: language_code.into(),
-            theme_key: theme_key.into(),
-            tree_view_order
-        }
-    }
-
-    /// Persists editor configuration to a hyper8/ directory in the user
-    /// system's config directory.
-    pub fn persist(&self) {
-        if let Some(config_dir) = dirs::config_dir() {
-            let app_dir = config_dir.join("hyper8");
-            let config_file = app_dir.join("editor.bincode");
-
-            let config_serialized = bincode::serialize(&self).unwrap();
-
-            let _ = fs::create_dir(&app_dir);
-            let _ = fs::write(&config_file, config_serialized);
-        }
-    }
-
-    /// Retrieves editor configuration from a hyper8/ directory in the user
-    /// system's config directory.
-    pub fn retrieve() -> Option<EditorConfig> {
-        if let Some(config_dir) = dirs::config_dir() {
-            let config_file = config_dir.join("hyper8").join("editor.bincode");
-
-            if let Ok(serialized) = fs::read(&config_file) {
-                if let Ok(editor_config) = bincode::deserialize(&serialized) {
-                    return Some(editor_config);
-                }
-            }
-        }
-
-        None
-    }
-}
diff --git a/src/editor/endpoints.rs b/src/editor/endpoints.rs
deleted file mode 100644
index f7518a6..0000000
--- a/src/editor/endpoints.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-use std::sync::Arc;
-
-use actix_web::HttpResponse;
-use actix_web::web::{Data, Form, Redirect};
-use serde_derive::Deserialize;
-
-pub mod collection;
-pub mod convert;
-mod build;
-pub mod deploy;
-mod deployment;
-pub mod index;
-mod jobs;
-pub mod playlist;
-mod processing;
-pub mod site;
-mod scripts;
-mod styles;
-pub mod video;
-
-pub use build::build;
-pub use deployment::deployment;
-pub use jobs::jobs;
-pub use processing::processing;
-pub use scripts::scripts;
-pub use styles::styles;
-
-use crate::{
-    Context,
-    EditorConfig,
-    Language,
-    Theme,
-    TreeViewOrder
-};
-
-#[derive(Deserialize)]
-pub struct EditorConfigForm {
-    language_code: String,
-    redirect: String,
-    theme_key: String
-}
-
-#[derive(Deserialize)]
-pub struct TreeViewOrderForm {
-    redirect: String
-}
-
-pub async fn change_editor_config(
-    context: Data<Arc<Context>>,
-    form: Form<EditorConfigForm>,
-) -> Redirect {
-    *context.editor_language.lock().unwrap() = Language::from_code(&form.language_code);
-    *context.editor_theme.lock().unwrap() = Theme::from_key(&form.theme_key).unwrap_or_else(|_| Theme::default());
-
-    let tree_view_order = context.editor_tree_view_order.lock().unwrap().clone();
-
-    let editor_config = EditorConfig::new(&form.language_code, &form.theme_key, tree_view_order);
-
-    editor_config.persist();
-
-    Redirect::to(form.redirect.clone()).see_other()
-}
-
-pub async fn change_tree_view_order(
-    context: Data<Arc<Context>>,
-    form: Form<TreeViewOrderForm>,
-) -> Redirect {
-    let tree_view_order = match context.get_editor_tree_view_order() {
-        TreeViewOrder::Default |
-        TreeViewOrder::SiteOrder => TreeViewOrder::TitleAsc,
-        TreeViewOrder::TitleAsc => TreeViewOrder::TitleDesc,
-        TreeViewOrder::TitleDesc => TreeViewOrder::SiteOrder,
-    };
-
-    *context.editor_tree_view_order.lock().unwrap() = tree_view_order;
-
-    let language_code = &context.editor_language.lock().unwrap().code;
-    let theme_key = context.editor_theme.lock().unwrap().key;
-
-    let editor_config = EditorConfig::new(language_code, theme_key, tree_view_order);
-
-    editor_config.persist();
-
-    Redirect::to(form.redirect.clone()).see_other()
-}
-
-pub async fn favicon() -> HttpResponse {
-    HttpResponse::Ok()
-        .content_type("image/png")
-        .body(include_bytes!("assets/favicon.png").as_slice())
-}
-
-pub async fn splash_logo() -> HttpResponse {
-    HttpResponse::Ok()
-        .content_type("image/svg+xml")
-        .body(include_bytes!("assets/splash_logo.svg").as_slice())
-}
diff --git a/src/editor/endpoints/deploy.rs b/src/editor/endpoints/deploy.rs
deleted file mode 100644
index a03c908..0000000
--- a/src/editor/endpoints/deploy.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-use std::sync::Arc;
-
-use actix_web::HttpResponse;
-use actix_web::web::{Data, Either, Redirect};
-
-use crate::Context;
-use crate::build::perform_build;
-use crate::deploy::{config_probe, start_deploy};
-use crate::editor::routes;
-use crate::editor::widgets::error_page;
-
-pub async fn deploy(context: Data<Arc<Context>>) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
-    let translations = &language.translations;
-    let site = context.get_site();
-
-    if site.base_url.is_none() {
-        let site_edit_url = routes::SITE_EDIT;
-        let message = translations.public_address_must_be_configured_for_deployment_text(site_edit_url);
-        return Either::Right(error_page(&context, &language, &message));
-    }
-
-    if !site.complete_deployment_config() {
-        let message = translations.deployment_configuration_is_incomplete_can_not_deploy;
-        return Either::Right(error_page(&context, &language, message));
-    }
-
-    if let Err(err) = config_probe(&context, &site, translations) {
-        let t_deployment_configuration_could_not_be_verified = language.translations.deployment_configuration_could_not_be_verified;
-        let message = format!("{t_deployment_configuration_could_not_be_verified} {err}");
-        return Either::Right(error_page(&context, &language, &message));
-    }
-
-    perform_build(&context);
-
-    match start_deploy(&context, &site, translations) {
-        Ok(()) => Either::Left(Redirect::to("/deployment").see_other()),
-        Err(err) => Either::Right(error_page(&context, &language, &err))
-    }
-}
diff --git a/src/main.rs b/src/main.rs
deleted file mode 100644
index 1d9560d..0000000
--- a/src/main.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025 Simon Repp
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-use std::process::ExitCode;
-use std::sync::{Arc, Mutex};
-
-use clap::Parser;
-use sys_locale::get_locale;
-
-mod args;
-mod aspect_ratio;
-mod audio_file;
-mod audio_format;
-mod audio_meta;
-mod banner;
-mod browser_support;
-mod build;
-mod cache;
-mod collection;
-mod container;
-mod container_order;
-mod context;
-mod deploy;
-mod editor;
-mod file_meta;
-mod font;
-mod hyper_dir;
-mod icons;
-mod image_processor;
-mod inherited_options;
-mod jobs;
-mod language;
-mod link;
-mod lqip;
-mod manifest;
-mod markdown_subset;
-mod platform_integration;
-mod playlist;
-mod poster_assets;
-mod poster_file;
-mod poster_meta;
-mod preview_server;
-mod site;
-mod site_path;
-mod site_url;
-mod sort;
-mod subtitles;
-mod theme;
-mod translations;
-mod util;
-mod video;
-mod video_file;
-mod video_format;
-mod video_meta;
-mod video_order;
-mod watcher;
-
-use args::Args;
-use aspect_ratio::AspectRatio;
-use audio_file::AudioFile;
-use audio_format::AudioFormat;
-use audio_meta::AudioMeta;
-use banner::Banner;
-use cache::{AudioMetaCached, Cache, PosterAssetsCached, PosterSourceCached, VideoMetaCached};
-use collection::Collection;
-use container::Container;
-use container_order::ContainerOrder;
-use context::{CollectionUpdate, Context, GetAnyResult, PlaylistUpdate, SiteUpdate, VideoUpdate};
-use deploy::{DeploymentState, FtpConfig, SshConfig};
-use editor::{EditorConfig, TreeViewOrder};
-use file_meta::FileMeta;
-use font::Font;
-use hyper_dir::HyperDir;
-use image_processor::{ImageProcessor, ResizeMode};
-use inherited_options::InheritedOptions;
-use jobs::{CompletedJob, JobDesc, JobProgress, QueuedJob, Worker};
-use language::Language;
-use link::Link;
-use lqip::Lqip;
-use markdown_subset::MarkdownSubset;
-use platform_integration::{PlatformIntegration, PlatformIntegrationImage, PlatformIntegrationMeta};
-use playlist::Playlist;
-use poster_assets::{PosterAsset, PosterAssets};
-use poster_file::PosterFile;
-use poster_meta::PosterMeta;
-use site::{Site, SiteContent};
-use site_path::SitePath;
-use site_url::SiteUrl;
-use sort::{Asc, Comparison, Desc, SortDirection};
-use subtitles::SubtitleFile;
-use theme::{Theme, ThemeKind};
-use translations::Translations;
-use util::Field;
-use video::Video;
-use video_file::VideoFile;
-use video_format::{Codec, EncodingApproach, VideoFormat};
-use video_meta::VideoMeta;
-use video_order::VideoOrder;
-
-fn main() -> ExitCode {
-    env_logger::init();
-
-    let args: Args = Args::parse();
-    let editor_config = EditorConfig::retrieve();
-
-    if !args.site_dir.exists() {
-        eprintln!(
-            "Site directory {:?} does not exist, please create it manually (just an empty folder).",
-            args.site_dir
-        );
-        return ExitCode::FAILURE;
-    }
-
-    // This compiles to fs::canonicalize(...) on all platforms but windows,
-    // on windows it instead tries to supply a canonicalized path that uses
-    // the regular form (e.g. "C:\\Foo") instead of the UNC form ("\\?C:\\Foo")
-    // when possible (for background see https://crates.io/crates/dunce).
-    let site_dir = dunce::canonicalize(args.site_dir).unwrap();
-
-    let build_dir = args.build_dir
-        .as_ref()
-        .map(|path| path.to_path_buf())
-        .unwrap_or_else(|| site_dir.join(".hyper8_build"));
-
-    // We would/could theoretically create this later (on build), but
-    // as actix-files does not successfully register the /preview/
-    // static file hosting route if the directory does not exist on
-    // startup, we create it here already.
-    util::ensure_dir(&build_dir);
-
-    let cache_dir = args.cache_dir
-        .as_ref()
-        .map(|path| path.to_path_buf())
-        .unwrap_or_else(|| site_dir.join(".hyper8_cache"));
-
-    let cache = Mutex::new(Cache::retrieve(&cache_dir));
-
-    let editor_language = args.editor_language
-        .unwrap_or_else(|| {
-            match &editor_config {
-                Some(editor_config) => editor_config.language_code.clone(),
-                None => get_locale()
-                    .map(|locale| locale.split('-').next().unwrap().to_string())
-                    .unwrap_or_else(|| String::from("en"))
-            }
-        });
-
-    let editor_tree_view_order = match &editor_config {
-        Some(editor_config) => editor_config.tree_view_order,
-        None => TreeViewOrder::Default
-    };
-
-    let context = Context::new(
-        build_dir,
-        cache,
-        cache_dir,
-        &editor_language,
-        editor_config.as_ref().map(|config| config.theme_key.as_str()).unwrap_or("adaptive"),
-        editor_tree_view_order,
-        Arc::new(Site::new()),
-        site_dir.clone()
-    );
-
-    // TODO: Would be great if we could somehow resolve the conundrum that
-    //       context depends on site and site depends on context, which
-    //       forces us to initialize context with a dummy site and replace it here.
-    context.replace_site(Site::read_dir(&context, &site_dir));
-
-    let context = Arc::new(context);
-
-    context.compute_job_queue();
-    jobs::start_workers(args.workers, &context);
-
-    if args.build {
-        if let Err(err) = context.await_job_queue() {
-            eprintln!("{err}");
-            return ExitCode::FAILURE;
-        }
-
-        build::perform_build(&context);
-
-        if args.preview {
-            let site = context.get_site();
-
-            let result = if site.clean_urls {
-                // Here we serve the preview through an actual http server so
-                // that /foo/ gets resolved to /foo/index.html.
-                preview_server::start(&context.build_dir, &args.ip, &args.port)
-            } else {
-                // TODO: Uncomment below code and remove the currently used
-                // line (preview_server::start(...)) below it as soon as we have
-                // switched back to using exclusively non-ESM scripts on the
-                // client-side.
-
-                // // We don't need an actively running server to preview a build
-                // // without clean urls, we can just open everything directly in
-                // // a browser.
-                // let local_file_url = context.build_dir.join("index.html");
-                // if webbrowser::open(&local_file_url.to_string_lossy()).is_err() {
-                //     eprintln!("Could not open browser for previewing the site");
-                //     return ExitCode::FAILURE
-                // }
-
-                preview_server::start(&context.build_dir, &args.ip, &args.port)
-            };
-
-            if result.is_ok() { ExitCode::SUCCESS } else { ExitCode::FAILURE }
-        } else if args.deploy {
-            let site = context.get_site();
-            let language = context.get_editor_language();
-
-            match deploy::perform_deploy_blocking_cli(&context, &site, &language.translations) {
-                Ok(()) => ExitCode::SUCCESS,
-                Err(err) => {
-                    eprintln!("{err}");
-                    ExitCode::FAILURE
-                }
-            }
-        } else {
-            ExitCode::SUCCESS
-        }
-    } else {
-        println!("Using site directory: {}", context.site_dir.display());
-
-        watcher::watch(Arc::clone(&context));
-        let result = editor::server::start(context, &args.ip, &args.port);
-
-        if result.is_ok() { ExitCode::SUCCESS } else { ExitCode::FAILURE }
-    }
-}
diff --git a/translations/Cargo.toml b/translations/Cargo.toml
new file mode 100644
index 0000000..4d825ae
--- /dev/null
+++ b/translations/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+edition.workspace = true
+name = "hyper8-translations"
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+indoc.workspace = true
diff --git a/src/translations/de.rs b/translations/src/de.rs
similarity index 100%
rename from src/translations/de.rs
rename to translations/src/de.rs
diff --git a/src/translations/en.rs b/translations/src/en.rs
similarity index 100%
rename from src/translations/en.rs
rename to translations/src/en.rs
diff --git a/src/translations.rs b/translations/src/lib.rs
similarity index 100%
rename from src/translations.rs
rename to translations/src/lib.rs
diff --git a/version/Cargo.toml b/version/Cargo.toml
new file mode 100644
index 0000000..a5a78f2
--- /dev/null
+++ b/version/Cargo.toml
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2025 Simon Repp
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+[package]
+edition.workspace = true
+name = "hyper8-version"
+rust-version.workspace = true
+version.workspace = true
diff --git a/version/build.rs b/version/build.rs
new file mode 100644
index 0000000..0b11a7a
--- /dev/null
+++ b/version/build.rs
@@ -0,0 +1,67 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::env;
+use std::process::Command;
+
+/// Call git to determine the 7-digit short hash of the current revision.
+/// If git is not available, we fall back to "unknown revision".
+/// The output is stored in HYPER8_REVISION.
+fn compute_revision() {
+    let mut git = Command::new("git");
+
+    git.args(["rev-parse", "--short", "HEAD"]);
+
+    let revision = match git.output() {
+        Ok(output) => String::from_utf8(output.stdout).unwrap(),
+        Err(_) => String::from("unknown revision")
+    };
+
+    println!("cargo:rustc-env=HYPER8_REVISION={revision}");
+}
+
+
+fn main() {
+    compute_revision();
+    compute_version();
+}
+
+/// Provides three variables to the consecutive build step:
+/// - HYPER8_VERSION_ADAPTIVE_PATCH (With patch only if it is a patch release, e.g. "1.2.1")
+/// - HYPER8_VERSION_WITH_PATCH (Always with patch, e.g. "1.2.0")
+/// - HYPER8_VERSION_WITHOUT_PATCH (Always without patch, e.g. "1.2")
+///
+/// If HYPER8_VERSION is used to override the version, all three variables
+/// will contain the full version, e.g. "2.0.0~pre1".
+fn compute_version() {
+    let version_adaptive_patch;
+    let version_with_patch;
+    let version_without_patch;
+    if let Ok(override_version) = env::var("HYPER8_VERSION") {
+        version_adaptive_patch = override_version.clone();
+        version_with_patch = override_version.clone();
+        version_without_patch = override_version;
+    } else {
+        version_adaptive_patch = if env!("CARGO_PKG_VERSION_PATCH") == "0" {
+            concat!(
+                env!("CARGO_PKG_VERSION_MAJOR"),
+                '.',
+                env!("CARGO_PKG_VERSION_MINOR")
+            ).to_string()
+        } else {
+            env!("CARGO_PKG_VERSION").to_string()
+        };
+
+        version_with_patch = env!("CARGO_PKG_VERSION").to_string();
+        version_without_patch = concat!(
+            env!("CARGO_PKG_VERSION_MAJOR"),
+            '.',
+            env!("CARGO_PKG_VERSION_MINOR")
+        ).to_string();
+    }
+
+    println!("cargo:rerun-if-env-changed=HYPER8_VERSION");
+    println!("cargo:rustc-env=HYPER8_VERSION_ADAPTIVE_PATCH={version_adaptive_patch}");
+    println!("cargo:rustc-env=HYPER8_VERSION_WITH_PATCH={version_with_patch}");
+    println!("cargo:rustc-env=HYPER8_VERSION_WITHOUT_PATCH={version_without_patch}");
+}
diff --git a/version/src/lib.rs b/version/src/lib.rs
new file mode 100644
index 0000000..1a59825
--- /dev/null
+++ b/version/src/lib.rs
@@ -0,0 +1,29 @@
+// SPDX-FileCopyrightText: 2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+//! Build any hyper8 target (cli, docs, etc.) with the environment variable
+//! HYPER8_VERSION set to override the version that is displayed and reported
+//! in resulting builds.
+//!
+//! For instance to build the docs for version "2.0.0~pre1":
+//! "HYPER8_VERSION=2.0.0~pre1 cargo run -p hyper8-docs -- [output_path]"
+
+/// 7-digit short commit hash or "unknown revision"
+pub const REVISION: &str = env!("HYPER8_REVISION");
+
+/// Adaptive version, e.g. "0.23" or "0.23.1" (leaves out patch for major/minor releases)
+pub const VERSION_ADAPTIVE_PATCH: &str = env!("HYPER8_VERSION_ADAPTIVE_PATCH");
+
+/// E.g. Full version, "0.23.0" or "1.6.3"
+pub const VERSION_WITH_PATCH: &str = env!("HYPER8_VERSION_WITH_PATCH");
+
+/// E.g. "1.2.3 (0abcdef)"
+pub const VERSION_WITH_PATCH_AND_REVISION: &str = concat!(
+    env!("HYPER8_VERSION_WITH_PATCH"),
+    " (",
+    env!("HYPER8_REVISION"),
+    ")"
+);
+
+/// Only the major and minor version, e.g. "0.23" or "1.6"
+pub const VERSION_WITHOUT_PATCH: &str = env!("HYPER8_VERSION_WITHOUT_PATCH");
diff --git a/web/Cargo.toml b/web/Cargo.toml
new file mode 100644
index 0000000..b2cbe75
--- /dev/null
+++ b/web/Cargo.toml
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2024-2025 Simon Repp
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+[package]
+edition.workspace = true
+name = "hyper8-web"
+rust-version.workspace = true
+version.workspace = true
+
+[dependencies]
+actix-files.workspace = true
+actix-multipart.workspace = true
+actix-session.workspace = true
+actix-web.workspace = true
+base64.workspace = true
+bincode.workspace = true
+chrono.workspace = true
+futures-util.workspace = true
+hyper8-core.path = "../core"
+hyper8-icons.path = "../icons"
+hyper8-translations.path = "../translations"
+hyper8-version.path = "../version"
+indoc.workspace = true
+language-tags.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+slug.workspace = true
+tokio.workspace = true
+url.workspace = true
+urlencoding.workspace = true
+webbrowser.workspace = true
diff --git a/src/editor/actix.rs b/web/src/actix.rs
similarity index 100%
rename from src/editor/actix.rs
rename to web/src/actix.rs
diff --git a/src/editor/assets/editor.css b/web/src/assets/editor.css
similarity index 100%
rename from src/editor/assets/editor.css
rename to web/src/assets/editor.css
diff --git a/src/editor/assets/editor.css.license b/web/src/assets/editor.css.license
similarity index 100%
rename from src/editor/assets/editor.css.license
rename to web/src/assets/editor.css.license
diff --git a/src/editor/assets/editor.js b/web/src/assets/editor.js
similarity index 100%
rename from src/editor/assets/editor.js
rename to web/src/assets/editor.js
diff --git a/src/editor/assets/editor.js.license b/web/src/assets/editor.js.license
similarity index 100%
rename from src/editor/assets/editor.js.license
rename to web/src/assets/editor.js.license
diff --git a/src/editor/assets/favicon.png b/web/src/assets/favicon.png
similarity index 100%
rename from src/editor/assets/favicon.png
rename to web/src/assets/favicon.png
diff --git a/src/editor/assets/favicon.png.license b/web/src/assets/favicon.png.license
similarity index 100%
rename from src/editor/assets/favicon.png.license
rename to web/src/assets/favicon.png.license
diff --git a/src/editor/assets/splash_logo.svg b/web/src/assets/splash_logo.svg
similarity index 100%
rename from src/editor/assets/splash_logo.svg
rename to web/src/assets/splash_logo.svg
diff --git a/src/editor/assets/splash_logo.svg.license b/web/src/assets/splash_logo.svg.license
similarity index 100%
rename from src/editor/assets/splash_logo.svg.license
rename to web/src/assets/splash_logo.svg.license
diff --git a/src/editor/components.rs b/web/src/components.rs
similarity index 100%
rename from src/editor/components.rs
rename to web/src/components.rs
diff --git a/src/editor/components/checkbox.rs b/web/src/components/checkbox.rs
similarity index 100%
rename from src/editor/components/checkbox.rs
rename to web/src/components/checkbox.rs
diff --git a/src/editor/components/input.rs b/web/src/components/input.rs
similarity index 96%
rename from src/editor/components/input.rs
rename to web/src/components/input.rs
index 68dc471..eb63bde 100644
--- a/src/editor/components/input.rs
+++ b/web/src/components/input.rs
@@ -5,14 +5,11 @@ use std::fmt::{Display, Formatter};
 
 use indoc::formatdoc;
 
-use crate::{
-    Field,
-    Site,
-    SitePath,
-    SiteUrl,
-    Translations
-};
-use crate::util::html_escape_inside_attribute;
+use hyper8_core::{Site, SitePath, SiteUrl};
+use hyper8_core::util::html_escape_inside_attribute;
+use hyper8_translations::Translations;
+
+use crate::Field;
 
 pub struct Input<'a> {
     error: String,
diff --git a/src/editor/components/select.rs b/web/src/components/select.rs
similarity index 100%
rename from src/editor/components/select.rs
rename to web/src/components/select.rs
diff --git a/src/editor/components/textarea.rs b/web/src/components/textarea.rs
similarity index 96%
rename from src/editor/components/textarea.rs
rename to web/src/components/textarea.rs
index fb73708..df944d1 100644
--- a/src/editor/components/textarea.rs
+++ b/web/src/components/textarea.rs
@@ -5,9 +5,11 @@ use std::fmt::{Display, Formatter};
 
 use indoc::formatdoc;
 
-use crate::{Field, Translations};
-use crate::manifest::MAX_SYNOPSIS_CHARS;
-use crate::util::html_escape_outside_attribute;
+use hyper8_core::MAX_SYNOPSIS_CHARS;
+use hyper8_core::util::html_escape_outside_attribute;
+use hyper8_translations::Translations;
+
+use crate::Field;
 
 pub struct Textarea<'a> {
     error: String,
diff --git a/web/src/context.rs b/web/src/context.rs
new file mode 100644
index 0000000..0e28dc9
--- /dev/null
+++ b/web/src/context.rs
@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::ops::Deref;
+use std::sync::Arc;
+
+use hyper8_core::Context as CoreContext;
+
+// TODO: Keep around for a while because we might want to reintroduce proper
+// editor-related state (e.g. in interplay with the desktop editor
+// integration), but if we end up never introducing that, remove this abstraction
+// and replace with simply just the core context.
+
+pub struct Context {
+    pub core_context: Arc<CoreContext>
+}
+
+impl Context {
+    pub fn new(
+        core_context: Arc<CoreContext>
+    ) -> Context {
+        Context {
+            core_context
+        }
+    }
+}
+
+impl Deref for Context {
+    type Target = CoreContext;
+
+    fn deref(&self) -> &Self::Target {
+        &self.core_context
+    }
+}
diff --git a/web/src/endpoints.rs b/web/src/endpoints.rs
new file mode 100644
index 0000000..a57523e
--- /dev/null
+++ b/web/src/endpoints.rs
@@ -0,0 +1,75 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use actix_session::Session as ActixSession;
+use actix_web::HttpResponse;
+use actix_web::web::{Form, Redirect};
+use serde_derive::Deserialize;
+
+pub mod collection;
+pub mod convert;
+mod build;
+pub mod deploy;
+mod deployment;
+pub mod index;
+mod jobs;
+pub mod playlist;
+mod processing;
+pub mod site;
+mod scripts;
+mod styles;
+pub mod video;
+
+pub use build::build;
+pub use deployment::deployment;
+pub use jobs::jobs;
+pub use processing::processing;
+pub use scripts::scripts;
+pub use styles::styles;
+
+use crate::Session;
+
+#[derive(Deserialize)]
+pub struct LanguageAndThemeForm {
+    language_code: String,
+    redirect: String,
+    theme_key: String
+}
+
+#[derive(Deserialize)]
+pub struct TreeViewOrderForm {
+    redirect: String
+}
+
+pub async fn change_language_and_theme(
+    form: Form<LanguageAndThemeForm>,
+    session: ActixSession
+) -> Redirect {
+    let _ = session.insert("language_code", &form.language_code);
+    let _ = session.insert("theme_key", &form.theme_key);
+
+    Redirect::to(form.redirect.clone()).see_other()
+}
+
+pub async fn change_tree_view_order(
+    form: Form<TreeViewOrderForm>,
+    session: ActixSession
+) -> Redirect {
+    let tree_view_order = Session::tree_view_order(&session);
+
+    let _ = session.insert("tree_view_order_key", tree_view_order.cycle().key());
+
+    Redirect::to(form.redirect.clone()).see_other()
+}
+
+pub async fn favicon() -> HttpResponse {
+    HttpResponse::Ok()
+        .content_type("image/png")
+        .body(include_bytes!("assets/favicon.png").as_slice())
+}
+
+pub async fn splash_logo() -> HttpResponse {
+    HttpResponse::Ok()
+        .content_type("image/svg+xml")
+        .body(include_bytes!("assets/splash_logo.svg").as_slice())
+}
diff --git a/src/editor/endpoints/build.rs b/web/src/endpoints/build.rs
similarity index 58%
rename from src/editor/endpoints/build.rs
rename to web/src/endpoints/build.rs
index 4dd6a23..60d5679 100644
--- a/src/editor/endpoints/build.rs
+++ b/web/src/endpoints/build.rs
@@ -3,23 +3,27 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Either, Path as ActixPath, Redirect};
 
-use crate::{Context, SitePath};
-use crate::build::perform_build;
-use crate::editor::widgets::error_page;
+use hyper8_core::SitePath;
+use hyper8_core::perform_build;
+
+use crate::{Context, Session};
+use crate::widgets::error_page;
 
 pub async fn build(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let pending_deployment = context.deploying.lock().unwrap().active();
 
     if pending_deployment {
-        let language = context.get_editor_language();
-        let message = language.translations.preview_is_only_available_again_after_the_current_deployment_is_finished;
-        return Either::Right(error_page(&context, &language, message));
+        let session = Session::new(&session);
+        let message = session.language.translations.preview_is_only_available_again_after_the_current_deployment_is_finished;
+        return Either::Right(error_page(&context, message, &session));
     }
 
     perform_build(&context);
diff --git a/src/editor/endpoints/collection.rs b/web/src/endpoints/collection.rs
similarity index 100%
rename from src/editor/endpoints/collection.rs
rename to web/src/endpoints/collection.rs
diff --git a/src/editor/endpoints/collection/add_link.rs b/web/src/endpoints/collection/add_link.rs
similarity index 76%
rename from src/editor/endpoints/collection/add_link.rs
rename to web/src/endpoints/collection/add_link.rs
index cee8615..4f1c771 100644
--- a/src/editor/endpoints/collection/add_link.rs
+++ b/web/src/endpoints/collection/add_link.rs
@@ -3,20 +3,22 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use url::Url;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
     Link,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -30,6 +32,7 @@ pub struct AddLinkForm {
 pub async fn add_link(
     context: Data<Arc<Context>>,
     form: Form<AddLinkForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let (hidden, rel_me) = match form.verification.as_str() {
@@ -45,10 +48,10 @@ pub async fn add_link(
     let url = match Url::parse(&form.url) {
         Ok(_) => form.url.clone(),
         Err(err) => {
-            let language = context.get_editor_language();
-            let t_invalid_url = language.translations.invalid_url;
+            let session = Session::new(&session);
+            let t_invalid_url = session.language.translations.invalid_url;
             let message = format!("{t_invalid_url} ({err})");
-            return Either::Right(error_page(&context, &language, &message))
+            return Either::Right(error_page(&context, &message, &session))
         }
     };
 
@@ -60,12 +63,12 @@ pub async fn add_link(
 
     match context.update_collection(mutation, &site_path) {
         CollectionUpdate::InvalidManifest { collection } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&collection, &context, &language))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&collection, &context, &session))
         }
         CollectionUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         CollectionUpdate::Updated { collection_updated, .. } => {
             let redirect_url = routes::collection_links(&collection_updated);
diff --git a/src/editor/endpoints/collection/banner.rs b/web/src/endpoints/collection/banner.rs
similarity index 88%
rename from src/editor/endpoints/collection/banner.rs
rename to web/src/endpoints/collection/banner.rs
index 089f8ec..c9e71ac 100644
--- a/src/editor/endpoints/collection/banner.rs
+++ b/web/src/endpoints/collection/banner.rs
@@ -3,20 +3,22 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Collection, SitePath};
+
 use crate::{
-    Collection,
     Context,
-    Language,
-    SitePath
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::actix::html_response;
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{
+use crate::actix::html_response;
+use crate::routes;
+use crate::widgets::{
     layout,
     not_found,
     upload_widget
@@ -24,23 +26,24 @@ use crate::editor::widgets::{
 
 pub async fn banner(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_collection(&site_path) {
-        Some(collection) => edit_banner_page(&collection, &context, &language),
-        None => not_found(&context, &language, &site_path)
+        Some(collection) => edit_banner_page(&collection, &context, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_banner_page(
     collection: &Collection,
     context: &Context,
-    language: &Language
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let t_upload_banner = translations.upload_banner;
     let banner_upload_button = upload_widget(&routes::collection_upload_banner(collection), t_upload_banner);
@@ -105,8 +108,8 @@ pub fn edit_banner_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::poster(&collection.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/collection/create_playlist.rs b/web/src/endpoints/collection/create_playlist.rs
similarity index 83%
rename from src/editor/endpoints/collection/create_playlist.rs
rename to web/src/endpoints/collection/create_playlist.rs
index e38c6f2..17fed20 100644
--- a/src/editor/endpoints/collection/create_playlist.rs
+++ b/web/src/endpoints/collection/create_playlist.rs
@@ -4,22 +4,23 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use slug::slugify;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
-    Field,
     Playlist,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::CollectionFormFeedback;
@@ -35,9 +36,10 @@ pub struct CreatePlaylistForm {
 pub async fn create_playlist(
     context: Data<Arc<Context>>,
     form: Form<CreatePlaylistForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
     let title_trimmed = form.title.trim();
@@ -45,7 +47,7 @@ pub async fn create_playlist(
     let error = |slug_error, title_error| -> _ {
         let collection = match context.get_collection(&site_path) {
             Some(collection) => collection,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = CollectionFormFeedback::CreatePlaylist {
@@ -53,11 +55,11 @@ pub async fn create_playlist(
             title: Field::validated(title_trimmed, title_error)
         };
 
-        Either::Right(edit_page(&collection, &context, form_feedback, &language))
+        Either::Right(edit_page(&collection, &context, form_feedback, &session))
     };
 
     if slug_trimmed.is_empty() && title_trimmed.is_empty() {
-        let t_title_or_permalink_needs_to_be_provided = language.translations.title_or_permalink_needs_to_be_provided;
+        let t_title_or_permalink_needs_to_be_provided = session.language.translations.title_or_permalink_needs_to_be_provided;
 
         return error(
             Some(t_title_or_permalink_needs_to_be_provided),
@@ -81,10 +83,10 @@ pub async fn create_playlist(
 
         match context.update_collection(mutation, &site_path) {
             CollectionUpdate::InvalidManifest { collection } => {
-                Either::Right(pending_manifest_errors(&collection, &context, &language))
+                Either::Right(pending_manifest_errors(&collection, &context, &session))
             }
             CollectionUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             CollectionUpdate::Updated { optional_return_value: playlist, .. } => {
                 playlist.write_manifest(&context);
@@ -114,7 +116,7 @@ pub async fn create_playlist(
         let playlist_site_path = site_path.join(slug_trimmed);
 
         if context.site_dir.join(playlist_site_path.filesystem_relative()).exists() {
-            let message = language.translations.permalink_already_used_by_another_collection_playlist_or_video;
+            let message = session.language.translations.permalink_already_used_by_another_collection_playlist_or_video;
             error(Some(message), None)
         } else {
             let title = if title_trimmed.is_empty() { None } else { Some(title_trimmed) };
diff --git a/src/editor/endpoints/collection/create_subcollection.rs b/web/src/endpoints/collection/create_subcollection.rs
similarity index 84%
rename from src/editor/endpoints/collection/create_subcollection.rs
rename to web/src/endpoints/collection/create_subcollection.rs
index c7563e2..0238fcd 100644
--- a/src/editor/endpoints/collection/create_subcollection.rs
+++ b/web/src/endpoints/collection/create_subcollection.rs
@@ -4,21 +4,22 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use slug::slugify;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
-    Field,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::CollectionFormFeedback;
@@ -34,9 +35,10 @@ pub struct CreateSubcollectionForm {
 pub async fn create_subcollection(
     context: Data<Arc<Context>>,
     form: Form<CreateSubcollectionForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
     let title_trimmed = form.title.trim();
@@ -44,7 +46,7 @@ pub async fn create_subcollection(
     let error = |slug_error, title_error| -> _ {
         let collection = match context.get_collection(&site_path) {
             Some(collection) => collection,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = CollectionFormFeedback::CreateSubcollection {
@@ -52,11 +54,11 @@ pub async fn create_subcollection(
             title: Field::validated(title_trimmed, title_error)
         };
 
-        Either::Right(edit_page(&collection, &context, form_feedback, &language))
+        Either::Right(edit_page(&collection, &context, form_feedback, &session))
     };
 
     if slug_trimmed.is_empty() && title_trimmed.is_empty() {
-        let t_title_or_permalink_needs_to_be_provided = language.translations.title_or_permalink_needs_to_be_provided;
+        let t_title_or_permalink_needs_to_be_provided = session.language.translations.title_or_permalink_needs_to_be_provided;
 
         return error(
             Some(t_title_or_permalink_needs_to_be_provided),
@@ -80,10 +82,10 @@ pub async fn create_subcollection(
 
         match context.update_collection(mutation, &site_path) {
             CollectionUpdate::InvalidManifest { collection } => {
-                Either::Right(pending_manifest_errors(&collection, &context, &language))
+                Either::Right(pending_manifest_errors(&collection, &context, &session))
             }
             CollectionUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             CollectionUpdate::Updated { optional_return_value: subcollection, .. } => {
                 subcollection.write_manifest(&context);
@@ -113,7 +115,7 @@ pub async fn create_subcollection(
         let subcollection_site_path = site_path.join(slug_trimmed);
 
         if context.site_dir.join(subcollection_site_path.filesystem_relative()).exists() {
-            let message = language.translations.permalink_already_used_by_another_collection_playlist_or_video;
+            let message = session.language.translations.permalink_already_used_by_another_collection_playlist_or_video;
             error(Some(message), None)
         } else {
             let title = if title_trimmed.is_empty() { None } else { Some(title_trimmed) };
diff --git a/src/editor/endpoints/collection/create_video.rs b/web/src/endpoints/collection/create_video.rs
similarity index 83%
rename from src/editor/endpoints/collection/create_video.rs
rename to web/src/endpoints/collection/create_video.rs
index f3ac856..efed452 100644
--- a/src/editor/endpoints/collection/create_video.rs
+++ b/web/src/endpoints/collection/create_video.rs
@@ -4,22 +4,23 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use slug::slugify;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
-    Field,
     SitePath,
     Video
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::CollectionFormFeedback;
@@ -35,9 +36,10 @@ pub struct CreateVideoForm {
 pub async fn create_video(
     context: Data<Arc<Context>>,
     form: Form<CreateVideoForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
     let title_trimmed = form.title.trim();
@@ -45,7 +47,7 @@ pub async fn create_video(
     let error = |slug_error, title_error| -> _ {
         let collection = match context.get_collection(&site_path) {
             Some(collection) => collection,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = CollectionFormFeedback::CreateVideo {
@@ -53,11 +55,11 @@ pub async fn create_video(
             title: Field::validated(title_trimmed, title_error)
         };
 
-        Either::Right(edit_page(&collection, &context, form_feedback, &language))
+        Either::Right(edit_page(&collection, &context, form_feedback, &session))
     };
 
     if slug_trimmed.is_empty() && title_trimmed.is_empty() {
-        let t_title_or_permalink_needs_to_be_provided = language.translations.title_or_permalink_needs_to_be_provided;
+        let t_title_or_permalink_needs_to_be_provided = session.language.translations.title_or_permalink_needs_to_be_provided;
 
         return error(
             Some(t_title_or_permalink_needs_to_be_provided),
@@ -81,10 +83,10 @@ pub async fn create_video(
 
         match context.update_collection(mutation, &site_path) {
             CollectionUpdate::InvalidManifest { collection } => {
-                Either::Right(pending_manifest_errors(&collection, &context, &language))
+                Either::Right(pending_manifest_errors(&collection, &context, &session))
             }
             CollectionUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             CollectionUpdate::Updated { optional_return_value: video, .. } => {
                 video.write_manifest(&context);
@@ -114,7 +116,7 @@ pub async fn create_video(
         let video_site_path = site_path.join(slug_trimmed);
 
         if context.site_dir.join(video_site_path.filesystem_relative()).exists() {
-            let message = language.translations.permalink_already_used_by_another_collection_playlist_or_video;
+            let message = session.language.translations.permalink_already_used_by_another_collection_playlist_or_video;
             error(Some(message), None)
         } else {
             let title = if title_trimmed.is_empty() { None } else { Some(title_trimmed) };
diff --git a/src/editor/endpoints/collection/dangerous_actions.rs b/web/src/endpoints/collection/dangerous_actions.rs
similarity index 92%
rename from src/editor/endpoints/collection/dangerous_actions.rs
rename to web/src/endpoints/collection/dangerous_actions.rs
index 4bc8557..dc1552b 100644
--- a/src/editor/endpoints/collection/dangerous_actions.rs
+++ b/web/src/endpoints/collection/dangerous_actions.rs
@@ -3,21 +3,23 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Collection, SitePath};
+
 use crate::{
-    Collection,
     Context,
     Field,
-    Language,
-    SitePath
+    Input,
+    Location,
+    Session
 };
-use crate::editor::{Input, Location};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found};
+use crate::routes;
+use crate::widgets::{layout, not_found};
 
 pub struct MoveFormFeedback {
     pub slug: Field
@@ -25,9 +27,10 @@ pub struct MoveFormFeedback {
 
 pub async fn dangerous_actions(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_collection(&site_path) {
         Some(collection) => {
@@ -35,10 +38,10 @@ pub async fn dangerous_actions(
                 &collection,
                 &context,
                 None,
-                &language
+                &session
             )
         }
-        None => not_found(&context, &language, &site_path)
+        None => not_found(&context, &session, &site_path)
     }
 }
 
@@ -46,10 +49,10 @@ pub fn dangerous_actions_page(
     collection: &Collection,
     context: &Context,
     form_feedback: Option<MoveFormFeedback>,
-    language: &Language
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_not_saved = translations.not_saved;
 
     let slug_form = if collection.site_path.is_root_path() {
@@ -170,8 +173,8 @@ pub fn dangerous_actions_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::dangerous_actions(&collection.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/collection/delete.rs b/web/src/endpoints/collection/delete.rs
similarity index 69%
rename from src/editor/endpoints/collection/delete.rs
rename to web/src/endpoints/collection/delete.rs
index 10b1149..801eda8 100644
--- a/src/editor/endpoints/collection/delete.rs
+++ b/web/src/endpoints/collection/delete.rs
@@ -3,15 +3,19 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{Context, SitePath};
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+use hyper8_core::SitePath;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 pub async fn delete(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     match context.delete_collection(&site_path) {
@@ -21,8 +25,8 @@ pub async fn delete(
         }
         Ok(None) => Either::Left(Redirect::to(routes::DASHBOARD).see_other()),
         Err(()) => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
     }
 }
diff --git a/src/editor/endpoints/collection/delete_banner.rs b/web/src/endpoints/collection/delete_banner.rs
similarity index 78%
rename from src/editor/endpoints/collection/delete_banner.rs
rename to web/src/endpoints/collection/delete_banner.rs
index be5adbe..ce20dcc 100644
--- a/src/editor/endpoints/collection/delete_banner.rs
+++ b/web/src/endpoints/collection/delete_banner.rs
@@ -4,22 +4,25 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
 pub async fn delete_banner(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |collection_mut: &mut Collection| {
@@ -36,12 +39,12 @@ pub async fn delete_banner(
 
     match context.update_collection(mutation, &site_path) {
         CollectionUpdate::InvalidManifest { collection } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&collection, &context, &language))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&collection, &context, &session))
         }
         CollectionUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         CollectionUpdate::Updated { collection_updated, .. } => {
             let redirect_url = routes::collection_banner(&collection_updated);
diff --git a/src/editor/endpoints/collection/delete_link.rs b/web/src/endpoints/collection/delete_link.rs
similarity index 81%
rename from src/editor/endpoints/collection/delete_link.rs
rename to web/src/endpoints/collection/delete_link.rs
index c774322..0cbe2d1 100644
--- a/src/editor/endpoints/collection/delete_link.rs
+++ b/web/src/endpoints/collection/delete_link.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
@@ -27,6 +29,7 @@ pub struct DeleteLinkForm {
 pub async fn delete_link(
     context: Data<Arc<Context>>,
     form: Form<DeleteLinkForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |collection: &mut Collection| {
@@ -47,12 +50,12 @@ pub async fn delete_link(
 
     match context.update_collection(mutation, &site_path) {
         CollectionUpdate::InvalidManifest { collection } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&collection, &context, &language))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&collection, &context, &session))
         }
         CollectionUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         CollectionUpdate::Updated { collection_updated, .. } => {
             let redirect_url = routes::collection_links(&collection_updated);
diff --git a/src/editor/endpoints/collection/edit.rs b/web/src/endpoints/collection/edit.rs
similarity index 96%
rename from src/editor/endpoints/collection/edit.rs
rename to web/src/endpoints/collection/edit.rs
index 0110c56..5a59db3 100644
--- a/src/editor/endpoints/collection/edit.rs
+++ b/web/src/endpoints/collection/edit.rs
@@ -3,28 +3,35 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
+use hyper8_core::{
     Collection,
-    Context,
-    Field,
-    Language,
     PlatformIntegration,
     SitePath
 };
-use crate::editor::actix::html_response;
-use crate::editor::{Checkbox, Input, Location, Select, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{
+
+use crate::actix::html_response;
+use crate::{
+    Checkbox,
+    Context,
+    Field,
+    Input,
+    Location,
+    Select,
+    Session,
+    Textarea
+};
+use crate::routes;
+use crate::widgets::{
     layout,
     not_found,
     resource_actions,
     upload_widget
 };
-use crate::icons;
 
 pub enum CollectionFormFeedback<'a> {
     CreatePlaylist {
@@ -58,13 +65,21 @@ pub enum CollectionFormFeedback<'a> {
 
 pub async fn edit(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_collection(&site_path) {
-        Some(collection) => edit_page(&collection, &context, CollectionFormFeedback::None, &language),
-        None => not_found(&context, &language, &site_path)
+        Some(collection) => {
+            edit_page(
+                &collection,
+                &context,
+                CollectionFormFeedback::None,
+                &session
+            )
+        }
+        None => not_found(&context, &session, &site_path)
     }
 }
 
@@ -72,10 +87,10 @@ pub fn edit_page(
     collection: &Collection,
     context: &Context,
     form_feedback: CollectionFormFeedback,
-    language: &Language
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_not_saved = translations.not_saved;
 
     let mut errors = String::new();
@@ -162,7 +177,7 @@ pub fn edit_page(
     textarea_description.id("collection_description");
 
     if site.base_url.is_none() {
-        let failure_icon = icons::failure(translations.warning);
+        let failure_icon = hyper8_icons::failure(translations.warning);
         let t_public_address_not_configured_text = translations.public_address_not_configured_text;
         let hint = format!("{failure_icon} {t_public_address_not_configured_text}");
 
@@ -427,7 +442,7 @@ pub fn edit_page(
         translations
     );
 
-    let collection_icon = icons::collection(translations.collection);
+    let collection_icon = hyper8_icons::collection(translations.collection);
     let collection_title = collection.title_or_slug_or_generic_label(translations);
 
     let t_new_video = translations.new_video;
@@ -485,8 +500,8 @@ pub fn edit_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::edit(&collection.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/collection/edit_manifest.rs b/web/src/endpoints/collection/edit_manifest.rs
similarity index 82%
rename from src/editor/endpoints/collection/edit_manifest.rs
rename to web/src/endpoints/collection/edit_manifest.rs
index 6c63eec..5ff42c3 100644
--- a/src/editor/endpoints/collection/edit_manifest.rs
+++ b/web/src/endpoints/collection/edit_manifest.rs
@@ -4,41 +4,44 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Collection, SitePath};
+use hyper8_core::util::string_from_pathbuf;
+
+use crate::actix::html_response;
 use crate::{
-    Collection,
     Context,
-    Language,
-    SitePath
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::actix::html_response;
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found};
-use crate::util::string_from_pathbuf;
+use crate::routes;
+use crate::widgets::{layout, not_found};
 
 pub async fn edit_manifest(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_collection(&site_path) {
-        Some(collection) => edit_manifest_page(&collection, &context, &language),
-        None => not_found(&context, &language, &site_path)
+        Some(collection) => edit_manifest_page(&collection, &context, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_manifest_page(
     collection: &Collection,
     context: &Context,
-    language: &Language
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let manifest_errors = if collection.manifest_errors.is_empty() {
         String::new()
@@ -88,8 +91,8 @@ pub fn edit_manifest_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::manifest(&collection.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/collection/links.rs b/web/src/endpoints/collection/links.rs
similarity index 74%
rename from src/editor/endpoints/collection/links.rs
rename to web/src/endpoints/collection/links.rs
index 99a9a19..b88b544 100644
--- a/src/editor/endpoints/collection/links.rs
+++ b/web/src/endpoints/collection/links.rs
@@ -3,20 +3,17 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
-    Collection,
-    Context,
-    Language,
-    SitePath
-};
-use crate::editor::actix::html_response;
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::{
+use hyper8_core::{Collection, SitePath};
+
+use crate::actix::html_response;
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::{
     add_link_form,
     layout,
     links as links_widget,
@@ -25,23 +22,24 @@ use crate::editor::widgets::{
 
 pub async fn links(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_collection(&site_path) {
-        Some(collection) => edit_links_page(&collection, &context, &language),
-        None => not_found(&context, &language, &site_path)
+        Some(collection) => edit_links_page(&collection, &context, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_links_page(
     collection: &Collection,
     context: &Context,
-    language: &Language
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let create_link_form = add_link_form(&routes::collection_add_link(collection), translations);
     let links_form = links_widget(&collection.links, &routes::collection_delete_link(collection), translations);
@@ -57,8 +55,8 @@ pub fn edit_links_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::links(&collection.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/collection/move.rs b/web/src/endpoints/collection/move.rs
similarity index 83%
rename from src/editor/endpoints/collection/move.rs
rename to web/src/endpoints/collection/move.rs
index c4bc29d..1a5f568 100644
--- a/src/editor/endpoints/collection/move.rs
+++ b/web/src/endpoints/collection/move.rs
@@ -4,20 +4,21 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
-    Field,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::dangerous_actions::dangerous_actions_page;
 use super::dangerous_actions::MoveFormFeedback;
@@ -32,9 +33,10 @@ pub struct MoveForm {
 pub async fn r#move(
     context: Data<Arc<Context>>,
     form: Form<MoveForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
 
@@ -62,10 +64,10 @@ pub async fn r#move(
 
         match context.update_collection(mutation, &site_path) {
             CollectionUpdate::InvalidManifest { collection } => {
-                Either::Right(pending_manifest_errors(&collection, &context, &language))
+                Either::Right(pending_manifest_errors(&collection, &context, &session))
             }
             CollectionUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             CollectionUpdate::Updated { collection_updated, .. } => {
                 let redirect_url = routes::collection_dangerous_actions(&collection_updated);
@@ -75,7 +77,7 @@ pub async fn r#move(
     } else {
         let collection = match context.get_collection(&site_path) {
             Some(collection) => collection,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = MoveFormFeedback {
@@ -83,7 +85,7 @@ pub async fn r#move(
         };
 
         Either::Right(
-            dangerous_actions_page(&collection, &context, Some(form_feedback), &language)
+            dangerous_actions_page(&collection, &context, Some(form_feedback), &session)
         )
     }
 }
diff --git a/src/editor/endpoints/collection/pending_manifest_errors.rs b/web/src/endpoints/collection/pending_manifest_errors.rs
similarity index 86%
rename from src/editor/endpoints/collection/pending_manifest_errors.rs
rename to web/src/endpoints/collection/pending_manifest_errors.rs
index 8c4fcb5..02e9569 100644
--- a/src/editor/endpoints/collection/pending_manifest_errors.rs
+++ b/web/src/endpoints/collection/pending_manifest_errors.rs
@@ -5,18 +5,19 @@ use actix_web::HttpResponse;
 
 use indoc::formatdoc;
 
-use crate::{Collection, Context, Language};
-use crate::editor::actix::html_response;
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::layout;
+use hyper8_core::Collection;
+
+use crate::{Context, Location, Session};
+use crate::actix::html_response;
+use crate::routes;
+use crate::widgets::layout;
 
 pub fn pending_manifest_errors(
     collection: &Collection,
     context: &Context,
-    language: &Language
+    session: &Session
 ) -> HttpResponse {
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_pending_manifest_errors = translations.pending_manifest_errors;
 
     let collection_title = collection.title_or_slug_or_generic_label(translations);
@@ -60,8 +61,8 @@ pub fn pending_manifest_errors(
     let html = layout(
         &body,
         context,
-        language,
         Location::AuxiliaryPage,
+        session,
         site,
         t_pending_manifest_errors
     );
diff --git a/src/editor/endpoints/collection/update.rs b/web/src/endpoints/collection/update.rs
similarity index 92%
rename from src/editor/endpoints/collection/update.rs
rename to web/src/endpoints/collection/update.rs
index f46f957..da265bf 100644
--- a/src/editor/endpoints/collection/update.rs
+++ b/web/src/endpoints/collection/update.rs
@@ -3,22 +3,23 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
     ContainerOrder,
-    Context,
-    Field,
     PlatformIntegration,
     SitePath,
     VideoOrder
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::CollectionFormFeedback;
@@ -44,9 +45,10 @@ pub struct UpdateForm {
 pub async fn update(
     context: Data<Arc<Context>>,
     form: Form<UpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let copy_link = match form.copy_link.as_str() {
         "disabled" => Some(false),
@@ -96,7 +98,7 @@ pub async fn update(
     if sort_number.as_ref().is_some_and(|sort_number| sort_number.is_err()) {
         let collection = match context.get_collection(&site_path) {
             Some(collection) => collection,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = CollectionFormFeedback::Update {
@@ -114,7 +116,7 @@ pub async fn update(
             video_order: &form.video_order
         };
 
-        Either::Right(edit_page(&collection, &context, form_feedback, &language))
+        Either::Right(edit_page(&collection, &context, form_feedback, &session))
     } else {
         let mutation = |collection_mut: &mut Collection| {
             collection_mut.container_order = container_order;
@@ -140,10 +142,10 @@ pub async fn update(
 
         match context.update_collection(mutation, &site_path) {
             CollectionUpdate::InvalidManifest { collection } => {
-                Either::Right(pending_manifest_errors(&collection, &context, &language))
+                Either::Right(pending_manifest_errors(&collection, &context, &session))
             }
             CollectionUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             CollectionUpdate::Updated { collection_updated, .. } => {
                 collection_updated.write_manifest(&context);
diff --git a/src/editor/endpoints/collection/update_banner.rs b/web/src/endpoints/collection/update_banner.rs
similarity index 78%
rename from src/editor/endpoints/collection/update_banner.rs
rename to web/src/endpoints/collection/update_banner.rs
index 4021442..56fa33d 100644
--- a/src/editor/endpoints/collection/update_banner.rs
+++ b/web/src/endpoints/collection/update_banner.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
+use hyper8_core::{
     Collection,
     CollectionUpdate,
-    Context,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
@@ -26,6 +28,7 @@ pub struct BannerUpdateForm {
 pub async fn update_banner(
     context: Data<Arc<Context>>,
     form: Form<BannerUpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |collection_mut: &mut Collection| {
@@ -37,12 +40,12 @@ pub async fn update_banner(
 
     match context.update_collection(mutation, &site_path) {
         CollectionUpdate::InvalidManifest { collection } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&collection, &context, &language))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&collection, &context, &session))
         }
         CollectionUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         CollectionUpdate::Updated { collection_updated, .. } => {
             let redirect_url = routes::collection_banner(&collection_updated);
diff --git a/src/editor/endpoints/collection/update_manifest.rs b/web/src/endpoints/collection/update_manifest.rs
similarity index 78%
rename from src/editor/endpoints/collection/update_manifest.rs
rename to web/src/endpoints/collection/update_manifest.rs
index 551ee60..acd6c0a 100644
--- a/src/editor/endpoints/collection/update_manifest.rs
+++ b/web/src/endpoints/collection/update_manifest.rs
@@ -4,13 +4,16 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath};
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+use hyper8_core::SitePath;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 #[derive(Deserialize)]
 pub struct UpdateForm {
@@ -20,9 +23,10 @@ pub struct UpdateForm {
 pub async fn update_manifest(
     context: Data<Arc<Context>>,
     form: Form<UpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_collection(&site_path) {
         Some(collection) => {
@@ -37,6 +41,6 @@ pub async fn update_manifest(
             let redirect_url = routes::collection_manifest(&collection);
             Either::Left(Redirect::to(redirect_url).see_other())
         }
-        None => Either::Right(not_found(&context, &language, &site_path))
+        None => Either::Right(not_found(&context, &session, &site_path))
     }
 }
diff --git a/src/editor/endpoints/collection/upload_banner.rs b/web/src/endpoints/collection/upload_banner.rs
similarity index 87%
rename from src/editor/endpoints/collection/upload_banner.rs
rename to web/src/endpoints/collection/upload_banner.rs
index 7f92b7c..3940591 100644
--- a/src/editor/endpoints/collection/upload_banner.rs
+++ b/web/src/endpoints/collection/upload_banner.rs
@@ -6,40 +6,44 @@ use std::fs::File;
 use std::io::Write;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_multipart::Multipart;
 use actix_web::{Either, Error, HttpResponse};
 use actix_web::web;
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 use futures_util::TryStreamExt as _;
 
-use crate::{
+use hyper8_core::{
     Banner,
     Collection,
     CollectionUpdate,
-    Context,
     FileMeta,
     JobDesc,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
-use crate::util::{nanoid, supported_image_extension};
+use hyper8_core::util::{nanoid, supported_image_extension};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
 pub async fn upload_banner(
     context: Data<Arc<Context>>,
     mut payload: Multipart,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Result<Either<Redirect, HttpResponse>, Error> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     while let Some(mut field) = payload.try_next().await? {
         if let Some(content_disposition) = field.content_disposition() {
             if let Some(file_name) = content_disposition.get_filename() {
                 if !supported_image_extension(file_name) {
-                    let message = language.translations.unsupported_file_extension_in_xxx(file_name);
-                    return Ok(Either::Right(error_page(&context, &language, &message)))
+                    let message = session.language.translations
+                        .unsupported_file_extension_in_xxx(file_name);
+                    return Ok(Either::Right(error_page(&context, &message, &session)))
                 }
 
                 let original_filename = file_name.to_string();
@@ -73,11 +77,11 @@ pub async fn upload_banner(
 
                 match context.update_collection(mutation, &site_path) {
                     CollectionUpdate::InvalidManifest { collection } => {
-                        return Ok(Either::Right(pending_manifest_errors(&collection, &context, &language)))
+                        return Ok(Either::Right(pending_manifest_errors(&collection, &context, &session)))
                     }
                     CollectionUpdate::NotFound => {
                         let _ = fs::remove_file(&storage_path);
-                        let http_response = not_found(&context, &language, &site_path);
+                        let http_response = not_found(&context, &session, &site_path);
 
                         return Ok(Either::Right(http_response));
                     }
diff --git a/src/editor/endpoints/convert.rs b/web/src/endpoints/convert.rs
similarity index 66%
rename from src/editor/endpoints/convert.rs
rename to web/src/endpoints/convert.rs
index fd0c2e4..203c18d 100644
--- a/src/editor/endpoints/convert.rs
+++ b/web/src/endpoints/convert.rs
@@ -3,60 +3,69 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{Context, SitePath};
-use crate::editor::routes;
-use crate::editor::widgets::error_page;
+use hyper8_core::SitePath;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::error_page;
 
 pub async fn to_collection(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    match context.convert_to_collection(&site_path) {
+    let session = Session::new(&session);
+
+    match context.convert_to_collection(&session.language, &site_path) {
         Ok(collection) => {
             let redirect_url = routes::collection_edit(&collection);
             Either::Left(Redirect::to(redirect_url).see_other())
         }
         Err(err) => {
-            let language = context.get_editor_language();
             // TODO: Return error in context of originating page (playlist/video/empty)
-            Either::Right(error_page(&context, &language, &err))
+            Either::Right(error_page(&context, &err, &session))
         }
     }
 }
 
 pub async fn to_playlist(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    match context.convert_to_playlist(&site_path) {
+    let session = Session::new(&session);
+
+    match context.convert_to_playlist(&session.language, &site_path) {
         Ok(playlist) => {
             let redirect_url = routes::playlist_edit(&playlist);
             Either::Left(Redirect::to(redirect_url).see_other())
         }
         Err(err) => {
-            let language = context.get_editor_language();
             // TODO: Return error in context of originating page (collection/video/empty)
-            Either::Right(error_page(&context, &language, &err))
+            Either::Right(error_page(&context, &err, &session))
         }
     }
 }
 
 pub async fn to_video(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    match context.convert_to_video(&site_path) {
+    let session = Session::new(&session);
+
+    match context.convert_to_video(&session.language, &site_path) {
         Ok(video) => {
             let redirect_url = routes::video_edit(&video);
             Either::Left(Redirect::to(redirect_url).see_other())
         }
         Err(err) => {
-            let language = context.get_editor_language();
             // TODO: Return error in context of originating page (collection/playlist/empty)
-            Either::Right(error_page(&context, &language, &err))
+            Either::Right(error_page(&context, &err, &session))
         }
     }
 }
diff --git a/web/src/endpoints/deploy.rs b/web/src/endpoints/deploy.rs
new file mode 100644
index 0000000..9dc6288
--- /dev/null
+++ b/web/src/endpoints/deploy.rs
@@ -0,0 +1,47 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::sync::Arc;
+
+use actix_session::Session as ActixSession;
+use actix_web::HttpResponse;
+use actix_web::web::{Data, Either, Redirect};
+
+use hyper8_core::{config_probe, perform_build, start_deploy};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::error_page;
+
+pub async fn deploy(
+    context: Data<Arc<Context>>,
+    session: ActixSession
+) -> Either<Redirect, HttpResponse> {
+    let session = Session::new(&session);
+    let translations = &session.language.translations;
+    let site = context.get_site();
+
+    if site.base_url.is_none() {
+        let site_edit_url = routes::SITE_EDIT;
+        let message = translations.public_address_must_be_configured_for_deployment_text(site_edit_url);
+        return Either::Right(error_page(&context, &message, &session));
+    }
+
+    if !site.complete_deployment_config() {
+        let message = translations.deployment_configuration_is_incomplete_can_not_deploy;
+        return Either::Right(error_page(&context, message, &session));
+    }
+
+    if let Err(err) = config_probe(&context, &site, translations) {
+        let t_deployment_configuration_could_not_be_verified = translations.deployment_configuration_could_not_be_verified;
+        let message = format!("{t_deployment_configuration_could_not_be_verified} {err}");
+        return Either::Right(error_page(&context, &message, &session));
+    }
+
+    perform_build(&context);
+
+    match start_deploy(&context.core_context, &site, translations) {
+        Ok(()) => Either::Left(Redirect::to("/deployment").see_other()),
+        Err(err) => Either::Right(error_page(&context, &err, &session))
+    }
+}
diff --git a/src/editor/endpoints/deployment.rs b/web/src/endpoints/deployment.rs
similarity index 81%
rename from src/editor/endpoints/deployment.rs
rename to web/src/endpoints/deployment.rs
index b1923ec..6825461 100644
--- a/src/editor/endpoints/deployment.rs
+++ b/web/src/endpoints/deployment.rs
@@ -3,22 +3,25 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::Data;
 use indoc::formatdoc;
 
-use crate::Context;
-use crate::editor::Location;
-use crate::editor::widgets::layout;
+use crate::{Context, Location, Session};
+use crate::widgets::layout;
 
 /// Page on which deployment progress is reported (updated in real time via
 /// client scripting)
-pub async fn deployment(context: Data<Arc<Context>>) -> HttpResponse {
-    let language = context.get_editor_language();
+pub async fn deployment(
+    context: Data<Arc<Context>>,
+    session: ActixSession
+) -> HttpResponse {
+    let session = Session::new(&session);
     let site = context.get_site();
 
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let mut body = String::new();
 
@@ -52,8 +55,8 @@ pub async fn deployment(context: Data<Arc<Context>>) -> HttpResponse {
     let html = layout(
         &body,
         &context,
-        &language,
         Location::AuxiliaryPage,
+        &session,
         &site,
         site.title()
     );
diff --git a/src/editor/endpoints/index.rs b/web/src/endpoints/index.rs
similarity index 94%
rename from src/editor/endpoints/index.rs
rename to web/src/endpoints/index.rs
index b4a89a9..0d9a606 100644
--- a/src/editor/endpoints/index.rs
+++ b/web/src/endpoints/index.rs
@@ -3,30 +3,33 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::Data;
 use indoc::formatdoc;
 
-use crate::{
+use hyper8_core::{
     Collection,
-    Context,
     SiteContent,
     SitePath,
-    Translations,
     Video
 };
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::layout;
-use crate::icons;
-use crate::util::{html_escape_outside_attribute, human_size};
+use hyper8_core::util::{html_escape_outside_attribute, human_size};
+use hyper8_translations::Translations;
 
-pub async fn index(context: Data<Arc<Context>>) -> HttpResponse {
-    let language = context.get_editor_language();
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::layout;
+
+pub async fn index(
+    context: Data<Arc<Context>>,
+    session: ActixSession
+) -> HttpResponse {
+    let session = Session::new(&session);
     let site = context.get_site();
 
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let body = match &site.content {
         SiteContent::Collection(collection) => {
@@ -75,8 +78,8 @@ pub async fn index(context: Data<Arc<Context>>) -> HttpResponse {
     let html = layout(
         &body,
         &context,
-        &language,
         Location::AuxiliaryPage,
+        &session,
         &site,
         site.title()
     );
@@ -87,9 +90,9 @@ pub async fn index(context: Data<Arc<Context>>) -> HttpResponse {
 }
 
 fn empty_site_html(translations: &Translations) -> String {
-    let collection_icon = icons::collection(translations.collection);
-    let playlist_icon = icons::playlist(None);
-    let video_icon = icons::video(translations.video);
+    let collection_icon = hyper8_icons::collection(translations.collection);
+    let playlist_icon = hyper8_icons::playlist(None);
+    let video_icon = hyper8_icons::video(translations.video);
 
     let t_a_site_presenting_a_single_playlist_of_videos = translations.a_site_presenting_a_single_playlist_of_videos;
     let t_a_site_presenting_any_number_of_videos_and_playlists = translations.a_site_presenting_any_number_of_videos_and_playlists;
@@ -133,7 +136,7 @@ fn empty_site_html(translations: &Translations) -> String {
 }
 
 fn invalid_site_html(error: &str, translations: &Translations) -> String {
-    let failure_icon = icons::failure(translations.error);
+    let failure_icon = hyper8_icons::failure(translations.error);
     let t_invalid_site_text = translations.invalid_site_text();
 
     formatdoc!(r#"
diff --git a/src/editor/endpoints/jobs.rs b/web/src/endpoints/jobs.rs
similarity index 77%
rename from src/editor/endpoints/jobs.rs
rename to web/src/endpoints/jobs.rs
index f0f1b94..e0767cf 100644
--- a/src/editor/endpoints/jobs.rs
+++ b/web/src/endpoints/jobs.rs
@@ -3,6 +3,7 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::Data;
@@ -10,17 +11,22 @@ use chrono::DateTime;
 use chrono::offset::Local;
 use indoc::formatdoc;
 
-use crate::Context;
-use crate::editor::Location;
-use crate::editor::widgets::layout;
-use crate::util::{
+use hyper8_core::JobDesc;
+use hyper8_core::util::{
     casual_duration,
     html_escape_outside_attribute
 };
 
-pub async fn jobs(context: Data<Arc<Context>>) -> HttpResponse {
-    let language = context.get_editor_language();
-    let translations = &language.translations;
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::layout;
+
+pub async fn jobs(
+    context: Data<Arc<Context>>,
+    session: ActixSession
+) -> HttpResponse {
+    let session = Session::new(&session);
+    let translations = &session.language.translations;
 
     let site = context.get_site();
 
@@ -37,7 +43,7 @@ pub async fn jobs(context: Data<Arc<Context>>) -> HttpResponse {
         let output_label = job.desc.output_label(translations);
         let target_label = job.desc.target_label(translations);
         let target_label_escaped = html_escape_outside_attribute(target_label);
-        let target_edit_url = job.desc.target_edit_url();
+        let target_edit_url = target_edit_url(&job.desc);
         let target_link = format!(r#"<a href="{target_edit_url}">{target_label_escaped}</a>"#);
 
 
@@ -79,7 +85,7 @@ pub async fn jobs(context: Data<Arc<Context>>) -> HttpResponse {
         let output_label = job.desc.output_label(translations);
         let target_label = job.desc.target_label(translations);
         let target_label_escaped = html_escape_outside_attribute(target_label);
-        let target_edit_url = job.desc.target_edit_url();
+        let target_edit_url = target_edit_url(&job.desc);
         let target_link = format!(r#"<a href="{target_edit_url}">{target_label_escaped}</a>"#);
 
         let duration = casual_duration(job.duration().as_secs_f32(), translations);
@@ -128,8 +134,8 @@ pub async fn jobs(context: Data<Arc<Context>>) -> HttpResponse {
     let html = layout(
         &body,
         &context,
-        &language,
         Location::AuxiliaryPage,
+        &session,
         &site,
         site.title()
     );
@@ -138,3 +144,23 @@ pub async fn jobs(context: Data<Arc<Context>>) -> HttpResponse {
         .content_type(ContentType::html())
         .body(html)
 }
+
+/// The url for editing the collection, playlist or video which is part of
+/// this job description in the editor.
+pub fn target_edit_url(job_desc: &JobDesc) -> String {
+    match job_desc {
+        JobDesc::CollectionFastTasks { collection } => {
+            routes::collection_edit(collection)
+        }
+        JobDesc::PlaylistFastTasks { playlist } => {
+            routes::playlist_edit(playlist)
+        }
+        JobDesc::AudioFormat { video, .. } |
+        JobDesc::AudioMeta { video } |
+        JobDesc::VideoFastTasks { video, .. } |
+        JobDesc::VideoFormat { video, .. } |
+        JobDesc::VideoPickPoster { video, .. } => {
+            routes::video_edit(video)
+        }
+    }
+}
diff --git a/src/editor/endpoints/playlist.rs b/web/src/endpoints/playlist.rs
similarity index 100%
rename from src/editor/endpoints/playlist.rs
rename to web/src/endpoints/playlist.rs
diff --git a/src/editor/endpoints/playlist/add_link.rs b/web/src/endpoints/playlist/add_link.rs
similarity index 73%
rename from src/editor/endpoints/playlist/add_link.rs
rename to web/src/endpoints/playlist/add_link.rs
index 4776499..4c0581d 100644
--- a/src/editor/endpoints/playlist/add_link.rs
+++ b/web/src/endpoints/playlist/add_link.rs
@@ -3,20 +3,22 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use url::Url;
 
-use crate::{
-    Context,
+use hyper8_core::{
     Link,
     Playlist,
     PlaylistUpdate,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -30,6 +32,7 @@ pub struct AddLinkForm {
 pub async fn add_link(
     context: Data<Arc<Context>>,
     form: Form<AddLinkForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let (hidden, rel_me) = match form.verification.as_str() {
@@ -45,10 +48,10 @@ pub async fn add_link(
     let url = match Url::parse(&form.url) {
         Ok(_) => form.url.clone(),
         Err(err) => {
-            let language = context.get_editor_language();
-            let t_invalid_url = language.translations.invalid_url;
+            let session = Session::new(&session);
+            let t_invalid_url = session.language.translations.invalid_url;
             let message = format!("{t_invalid_url} ({err})");
-            return Either::Right(error_page(&context, &language, &message))
+            return Either::Right(error_page(&context, &message, &session))
         }
     };
 
@@ -60,12 +63,12 @@ pub async fn add_link(
 
     match context.update_playlist(mutation, &site_path) {
         PlaylistUpdate::InvalidManifest { playlist } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &playlist))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &playlist, &session))
         }
         PlaylistUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         PlaylistUpdate::Updated { playlist_updated, .. } => {
             let redirect_url = routes::playlist_links(&playlist_updated);
diff --git a/src/editor/endpoints/playlist/banner.rs b/web/src/endpoints/playlist/banner.rs
similarity index 87%
rename from src/editor/endpoints/playlist/banner.rs
rename to web/src/endpoints/playlist/banner.rs
index 1ca32b1..afb688b 100644
--- a/src/editor/endpoints/playlist/banner.rs
+++ b/web/src/endpoints/playlist/banner.rs
@@ -3,20 +3,22 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Playlist, SitePath};
+
 use crate::{
     Context,
-    Language,
-    Playlist,
-    SitePath
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::actix::html_response;
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{
+use crate::actix::html_response;
+use crate::routes;
+use crate::widgets::{
     layout,
     not_found,
     upload_widget
@@ -24,23 +26,24 @@ use crate::editor::widgets::{
 
 pub async fn banner(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_playlist(&site_path) {
-        Some(playlist) => edit_banner_page(&context, &language, &playlist),
-        None => not_found(&context, &language, &site_path)
+        Some(playlist) => edit_banner_page(&context, &playlist, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_banner_page(
     context: &Context,
-    language: &Language,
     playlist: &Playlist,
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let t_upload_banner = translations.upload_banner;
     let banner_upload_button = upload_widget(&routes::playlist_upload_banner(playlist), t_upload_banner);
@@ -104,8 +107,8 @@ pub fn edit_banner_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::poster(&playlist.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/playlist/create_video.rs b/web/src/endpoints/playlist/create_video.rs
similarity index 83%
rename from src/editor/endpoints/playlist/create_video.rs
rename to web/src/endpoints/playlist/create_video.rs
index fa5330f..3c3d952 100644
--- a/src/editor/endpoints/playlist/create_video.rs
+++ b/web/src/endpoints/playlist/create_video.rs
@@ -4,22 +4,23 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use slug::slugify;
 
-use crate::{
-    Context,
-    Field,
+use hyper8_core::{
     Playlist,
     PlaylistUpdate,
     SitePath,
     Video
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::PlaylistFormFeedback;
@@ -34,9 +35,10 @@ pub struct CreateVideoForm {
 pub async fn create_video(
     context: Data<Arc<Context>>,
     form: Form<CreateVideoForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
     let title_trimmed = form.title.trim();
@@ -44,7 +46,7 @@ pub async fn create_video(
     let error = |slug_error, title_error| -> _ {
         let playlist = match context.get_playlist(&site_path) {
             Some(playlist) => playlist,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = PlaylistFormFeedback::CreateVideo {
@@ -52,11 +54,11 @@ pub async fn create_video(
             title: Field::validated(title_trimmed, title_error)
         };
 
-        Either::Right(edit_page(&context, Some(form_feedback), &language, &playlist))
+        Either::Right(edit_page(&context, Some(form_feedback), &playlist, &session))
     };
 
     if slug_trimmed.is_empty() && title_trimmed.is_empty() {
-        let t_title_or_permalink_needs_to_be_provided = language.translations.title_or_permalink_needs_to_be_provided;
+        let t_title_or_permalink_needs_to_be_provided = session.language.translations.title_or_permalink_needs_to_be_provided;
 
         return error(
             Some(t_title_or_permalink_needs_to_be_provided),
@@ -80,10 +82,10 @@ pub async fn create_video(
 
         match context.update_playlist(mutation, &site_path) {
             PlaylistUpdate::InvalidManifest { playlist } => {
-                Either::Right(pending_manifest_errors(&context, &language, &playlist))
+                Either::Right(pending_manifest_errors(&context, &playlist, &session))
             }
             PlaylistUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             PlaylistUpdate::Updated { optional_return_value: video, .. } => {
                 video.write_manifest(&context);
@@ -113,7 +115,7 @@ pub async fn create_video(
         let video_site_path = site_path.join(slug_trimmed);
 
         if context.site_dir.join(video_site_path.filesystem_relative()).exists() {
-            let message = language.translations.permalink_already_used_by_another_collection_playlist_or_video;
+            let message = session.language.translations.permalink_already_used_by_another_collection_playlist_or_video;
             error(Some(message), None)
         } else {
             let title = if title_trimmed.is_empty() { None } else { Some(title_trimmed) };
diff --git a/src/editor/endpoints/playlist/dangerous_actions.rs b/web/src/endpoints/playlist/dangerous_actions.rs
similarity index 90%
rename from src/editor/endpoints/playlist/dangerous_actions.rs
rename to web/src/endpoints/playlist/dangerous_actions.rs
index 1f37880..ccc3bbc 100644
--- a/src/editor/endpoints/playlist/dangerous_actions.rs
+++ b/web/src/endpoints/playlist/dangerous_actions.rs
@@ -3,21 +3,23 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Playlist, SitePath};
+
 use crate::{
     Context,
     Field,
-    Language,
-    Playlist,
-    SitePath
+    Input,
+    Location,
+    Session
 };
-use crate::editor::{Input, Location};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found};
+use crate::routes;
+use crate::widgets::{layout, not_found};
 
 pub struct MoveFormFeedback {
     pub slug: Field
@@ -25,31 +27,32 @@ pub struct MoveFormFeedback {
 
 pub async fn dangerous_actions(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_playlist(&site_path) {
         Some(playlist) => {
             dangerous_actions_page(
                 &context,
                 None,
-                &language,
-                &playlist
+                &playlist,
+                &session
             )
         }
-        None => not_found(&context, &language, &site_path)
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn dangerous_actions_page(
     context: &Context,
     form_feedback: Option<MoveFormFeedback>,
-    language: &Language,
-    playlist: &Playlist
+    playlist: &Playlist,
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_not_saved = translations.not_saved;
 
     let slug_form = if playlist.site_path.is_root_path() {
@@ -160,8 +163,8 @@ pub fn dangerous_actions_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::dangerous_actions(&playlist.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/playlist/delete.rs b/web/src/endpoints/playlist/delete.rs
similarity index 69%
rename from src/editor/endpoints/playlist/delete.rs
rename to web/src/endpoints/playlist/delete.rs
index 6b27552..ace7ef9 100644
--- a/src/editor/endpoints/playlist/delete.rs
+++ b/web/src/endpoints/playlist/delete.rs
@@ -3,15 +3,19 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{Context, SitePath};
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+use hyper8_core::SitePath;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 pub async fn delete(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     match context.delete_playlist(&site_path) {
@@ -21,8 +25,8 @@ pub async fn delete(
         }
         Ok(None) => Either::Left(Redirect::to(routes::DASHBOARD).see_other()),
         Err(()) => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
     }
 }
diff --git a/src/editor/endpoints/playlist/delete_banner.rs b/web/src/endpoints/playlist/delete_banner.rs
similarity index 74%
rename from src/editor/endpoints/playlist/delete_banner.rs
rename to web/src/endpoints/playlist/delete_banner.rs
index d092947..7ba7af4 100644
--- a/src/editor/endpoints/playlist/delete_banner.rs
+++ b/web/src/endpoints/playlist/delete_banner.rs
@@ -4,22 +4,25 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{
-    Context,
+use hyper8_core::{
     Playlist,
     PlaylistUpdate,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
 pub async fn delete_banner(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |playlist_mut: &mut Playlist| {
@@ -36,12 +39,12 @@ pub async fn delete_banner(
 
     match context.update_playlist(mutation, &site_path) {
         PlaylistUpdate::InvalidManifest { playlist } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &playlist))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &playlist, &session))
         }
         PlaylistUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         PlaylistUpdate::Updated { playlist_updated, .. } => {
             let redirect_url = routes::playlist_banner(&playlist_updated);
diff --git a/src/editor/endpoints/playlist/delete_link.rs b/web/src/endpoints/playlist/delete_link.rs
similarity index 78%
rename from src/editor/endpoints/playlist/delete_link.rs
rename to web/src/endpoints/playlist/delete_link.rs
index 0813b1f..88fff1d 100644
--- a/src/editor/endpoints/playlist/delete_link.rs
+++ b/web/src/endpoints/playlist/delete_link.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
+use hyper8_core::{
     Playlist,
     PlaylistUpdate,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
@@ -27,6 +29,7 @@ pub struct DeleteLinkForm {
 pub async fn delete_link(
     context: Data<Arc<Context>>,
     form: Form<DeleteLinkForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |playlist_mut: &mut Playlist| {
@@ -47,12 +50,12 @@ pub async fn delete_link(
 
     match context.update_playlist(mutation, &site_path) {
         PlaylistUpdate::InvalidManifest { playlist } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &playlist))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &playlist, &session))
         }
         PlaylistUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         PlaylistUpdate::Updated { playlist_updated, .. } => {
             let redirect_url = routes::playlist_links(&playlist_updated);
diff --git a/src/editor/endpoints/playlist/edit.rs b/web/src/endpoints/playlist/edit.rs
similarity index 95%
rename from src/editor/endpoints/playlist/edit.rs
rename to web/src/endpoints/playlist/edit.rs
index 9b48208..33e4977 100644
--- a/src/editor/endpoints/playlist/edit.rs
+++ b/web/src/endpoints/playlist/edit.rs
@@ -3,28 +3,35 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
-    Context,
-    Field,
-    Language,
+use hyper8_core::{
     PlatformIntegration,
     Playlist,
     SitePath
 };
-use crate::editor::actix::html_response;
-use crate::editor::{Checkbox, Input, Location, Select, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{
+
+use crate::{
+    Checkbox,
+    Context,
+    Field,
+    Input,
+    Location,
+    Select,
+    Session,
+    Textarea
+};
+use crate::actix::html_response;
+use crate::routes;
+use crate::widgets::{
     layout,
     not_found,
     resource_actions,
     upload_widget
 };
-use crate::icons;
 
 pub enum PlaylistFormFeedback<'a> {
     CreateVideo {
@@ -48,24 +55,25 @@ pub enum PlaylistFormFeedback<'a> {
 
 pub async fn edit(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_playlist(&site_path) {
-        Some(playlist) => edit_page(&context, None, &language, &playlist),
-        None => not_found(&context, &language, &site_path)
+        Some(playlist) => edit_page(&context, None, &playlist, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_page(
     context: &Context,
     form_feedback: Option<PlaylistFormFeedback>,
-    language: &Language,
-    playlist: &Playlist
+    playlist: &Playlist,
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let t_not_saved = translations.not_saved;
 
@@ -137,7 +145,7 @@ pub fn edit_page(
     textarea_description.id("playlist_description");
 
     if site.base_url.is_none() {
-        let failure_icon = icons::failure(translations.warning);
+        let failure_icon = hyper8_icons::failure(translations.warning);
         let t_public_address_not_configured_text = translations.public_address_not_configured_text;
         let hint = format!("{failure_icon} {t_public_address_not_configured_text}");
 
@@ -312,7 +320,7 @@ pub fn edit_page(
         translations
     );
 
-    let playlist_icon = icons::playlist(Some(translations.playlist));
+    let playlist_icon = hyper8_icons::playlist(Some(translations.playlist));
     let playlist_title = playlist.title_or_slug_or_generic_label(translations);
 
     let t_new_video = translations.new_video;
@@ -366,8 +374,8 @@ pub fn edit_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::edit(&playlist.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/playlist/edit_manifest.rs b/web/src/endpoints/playlist/edit_manifest.rs
similarity index 80%
rename from src/editor/endpoints/playlist/edit_manifest.rs
rename to web/src/endpoints/playlist/edit_manifest.rs
index c5c42f8..865a56e 100644
--- a/src/editor/endpoints/playlist/edit_manifest.rs
+++ b/web/src/endpoints/playlist/edit_manifest.rs
@@ -4,41 +4,44 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Playlist, SitePath};
+use hyper8_core::util::string_from_pathbuf;
+
 use crate::{
     Context,
-    Language,
-    Playlist,
-    SitePath
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found};
-use crate::util::string_from_pathbuf;
+use crate::routes;
+use crate::widgets::{layout, not_found};
 
 pub async fn edit_manifest(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_playlist(&site_path) {
-        Some(playlist) => edit_manifest_page(&context, &language, &playlist),
-        None => not_found(&context, &language, &site_path)
+        Some(playlist) => edit_manifest_page(&context, &playlist, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_manifest_page(
     context: &Context,
-    language: &Language,
-    playlist: &Playlist
+    playlist: &Playlist,
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let manifest_errors = if playlist.manifest_errors.is_empty() {
         String::new()
@@ -88,8 +91,8 @@ pub fn edit_manifest_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::manifest(&playlist.site_path),
+        session,
         &site,
         playlist.title_or_slug_or_generic_label(translations)
     );
diff --git a/src/editor/endpoints/playlist/links.rs b/web/src/endpoints/playlist/links.rs
similarity index 72%
rename from src/editor/endpoints/playlist/links.rs
rename to web/src/endpoints/playlist/links.rs
index d54ac7f..1f088bd 100644
--- a/src/editor/endpoints/playlist/links.rs
+++ b/web/src/endpoints/playlist/links.rs
@@ -3,20 +3,17 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
-    Context,
-    Language,
-    Playlist,
-    SitePath
-};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::{
+use hyper8_core::{Playlist, SitePath};
+
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::{
     add_link_form,
     layout,
     links as links_widget,
@@ -25,23 +22,24 @@ use crate::editor::widgets::{
 
 pub async fn links(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_playlist(&site_path) {
-        Some(playlist) => edit_links_page(&context, &language, &playlist),
-        None => not_found(&context, &language, &site_path)
+        Some(playlist) => edit_links_page(&context, &playlist, &session),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_links_page(
     context: &Context,
-    language: &Language,
-    playlist: &Playlist
+    playlist: &Playlist,
+    session: &Session
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let create_link_form = add_link_form(&routes::playlist_add_link(playlist), translations);
     let links_form = links_widget(&playlist.links, &routes::playlist_delete_link(playlist), translations);
@@ -57,8 +55,8 @@ pub fn edit_links_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::links(&playlist.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/playlist/move.rs b/web/src/endpoints/playlist/move.rs
similarity index 85%
rename from src/editor/endpoints/playlist/move.rs
rename to web/src/endpoints/playlist/move.rs
index f09fc02..aa09c7d 100644
--- a/src/editor/endpoints/playlist/move.rs
+++ b/web/src/endpoints/playlist/move.rs
@@ -4,20 +4,21 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
-    Field,
+use hyper8_core::{
     Playlist,
     PlaylistUpdate,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::dangerous_actions::dangerous_actions_page;
 use super::dangerous_actions::MoveFormFeedback;
@@ -31,9 +32,10 @@ pub struct PlaylistMoveForm {
 pub async fn r#move(
     context: Data<Arc<Context>>,
     form: Form<PlaylistMoveForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
 
@@ -65,10 +67,10 @@ pub async fn r#move(
 
         match context.update_playlist(mutation, &site_path) {
             PlaylistUpdate::InvalidManifest { playlist } => {
-                Either::Right(pending_manifest_errors(&context, &language, &playlist))
+                Either::Right(pending_manifest_errors(&context, &playlist, &session))
             }
             PlaylistUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             PlaylistUpdate::Updated { playlist_updated, .. } => {
                 let redirect_url = routes::playlist_dangerous_actions(&playlist_updated);
@@ -78,7 +80,7 @@ pub async fn r#move(
     } else {
         let playlist = match context.get_playlist(&site_path) {
             Some(playlist) => playlist,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = MoveFormFeedback {
@@ -86,7 +88,7 @@ pub async fn r#move(
         };
 
         Either::Right(
-            dangerous_actions_page(&context, Some(form_feedback), &language, &playlist)
+            dangerous_actions_page(&context, Some(form_feedback), &playlist, &session)
         )
     }
 }
diff --git a/src/editor/endpoints/playlist/pending_manifest_errors.rs b/web/src/endpoints/playlist/pending_manifest_errors.rs
similarity index 87%
rename from src/editor/endpoints/playlist/pending_manifest_errors.rs
rename to web/src/endpoints/playlist/pending_manifest_errors.rs
index f2ddc45..a26aeff 100644
--- a/src/editor/endpoints/playlist/pending_manifest_errors.rs
+++ b/web/src/endpoints/playlist/pending_manifest_errors.rs
@@ -5,17 +5,18 @@ use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use indoc::formatdoc;
 
-use crate::{Context, Language, Playlist};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::layout;
+use hyper8_core::Playlist;
+
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::layout;
 
 pub fn pending_manifest_errors(
     context: &Context,
-    language: &Language,
-    playlist: &Playlist
+    playlist: &Playlist,
+    session: &Session
 ) -> HttpResponse {
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_pending_manifest_errors = translations.pending_manifest_errors;
 
     let playlist_title = playlist.title_or_slug_or_generic_label(translations);
@@ -59,8 +60,8 @@ pub fn pending_manifest_errors(
     let html = layout(
         &body,
         context,
-        language,
         Location::AuxiliaryPage,
+        session,
         site,
         t_pending_manifest_errors
     );
diff --git a/src/editor/endpoints/playlist/update.rs b/web/src/endpoints/playlist/update.rs
similarity index 90%
rename from src/editor/endpoints/playlist/update.rs
rename to web/src/endpoints/playlist/update.rs
index 5ecaf45..e0a725f 100644
--- a/src/editor/endpoints/playlist/update.rs
+++ b/web/src/endpoints/playlist/update.rs
@@ -3,21 +3,22 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
-    Field,
+use hyper8_core::{
     PlatformIntegration,
     Playlist,
     PlaylistUpdate,
     SitePath,
     VideoOrder
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::PlaylistFormFeedback;
@@ -41,9 +42,10 @@ pub struct PlaylistUpdateForm {
 pub async fn update(
     context: Data<Arc<Context>>,
     form: Form<PlaylistUpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let description_trimmed = form.description.trim();
 
@@ -93,7 +95,7 @@ pub async fn update(
     if sort_number.as_ref().is_some_and(|sort_number| sort_number.is_err()) {
         let playlist = match context.get_playlist(&site_path) {
             Some(playlist) => playlist,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = PlaylistFormFeedback::Update {
@@ -111,7 +113,7 @@ pub async fn update(
         };
 
         Either::Right(
-            edit_page(&context, Some(form_feedback), &language, &playlist)
+            edit_page(&context, Some(form_feedback), &playlist, &session)
         )
     } else {
         let mutation = |playlist_mut: &mut Playlist| {
@@ -137,10 +139,10 @@ pub async fn update(
 
         match context.update_playlist(mutation, &site_path) {
             PlaylistUpdate::InvalidManifest { playlist } => {
-                Either::Right(pending_manifest_errors(&context, &language, &playlist))
+                Either::Right(pending_manifest_errors(&context, &playlist, &session))
             }
             PlaylistUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             PlaylistUpdate::Updated { playlist_updated, .. } => {
                 playlist_updated.write_manifest(&context);
diff --git a/src/editor/endpoints/playlist/update_banner.rs b/web/src/endpoints/playlist/update_banner.rs
similarity index 74%
rename from src/editor/endpoints/playlist/update_banner.rs
rename to web/src/endpoints/playlist/update_banner.rs
index 38f3335..c3682b6 100644
--- a/src/editor/endpoints/playlist/update_banner.rs
+++ b/web/src/endpoints/playlist/update_banner.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
+use hyper8_core::{
     Playlist,
     PlaylistUpdate,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
@@ -26,6 +28,7 @@ pub struct BannerUpdateForm {
 pub async fn update_banner(
     context: Data<Arc<Context>>,
     form: Form<BannerUpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |playlist_mut: &mut Playlist| {
@@ -37,12 +40,12 @@ pub async fn update_banner(
 
     match context.update_playlist(mutation, &site_path) {
         PlaylistUpdate::InvalidManifest { playlist } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &playlist))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &playlist, &session))
         }
         PlaylistUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         PlaylistUpdate::Updated { playlist_updated, .. } => {
             let redirect_url = routes::playlist_banner(&playlist_updated);
diff --git a/src/editor/endpoints/playlist/update_manifest.rs b/web/src/endpoints/playlist/update_manifest.rs
similarity index 78%
rename from src/editor/endpoints/playlist/update_manifest.rs
rename to web/src/endpoints/playlist/update_manifest.rs
index 0bfde5e..11d3f83 100644
--- a/src/editor/endpoints/playlist/update_manifest.rs
+++ b/web/src/endpoints/playlist/update_manifest.rs
@@ -4,13 +4,16 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath};
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+use hyper8_core::SitePath;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 #[derive(Deserialize)]
 pub struct UpdateForm {
@@ -20,9 +23,10 @@ pub struct UpdateForm {
 pub async fn update_manifest(
     context: Data<Arc<Context>>,
     form: Form<UpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_playlist(&site_path) {
         Some(playlist) => {
@@ -37,6 +41,6 @@ pub async fn update_manifest(
             let redirect_url = routes::playlist_manifest(&playlist);
             Either::Left(Redirect::to(redirect_url).see_other())
         }
-        None => Either::Right(not_found(&context, &language, &site_path))
+        None => Either::Right(not_found(&context, &session, &site_path))
     }
 }
diff --git a/src/editor/endpoints/playlist/upload_banner.rs b/web/src/endpoints/playlist/upload_banner.rs
similarity index 87%
rename from src/editor/endpoints/playlist/upload_banner.rs
rename to web/src/endpoints/playlist/upload_banner.rs
index a1ddbcd..64628ca 100644
--- a/src/editor/endpoints/playlist/upload_banner.rs
+++ b/web/src/endpoints/playlist/upload_banner.rs
@@ -6,40 +6,44 @@ use std::fs::File;
 use std::io::Write;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_multipart::Multipart;
 use actix_web::{Either, Error, HttpResponse};
 use actix_web::web;
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 use futures_util::TryStreamExt as _;
 
-use crate::{
+use hyper8_core::{
     Banner,
-    Context,
     FileMeta,
     JobDesc,
     Playlist,
     PlaylistUpdate,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
-use crate::util::{nanoid, supported_image_extension};
+use hyper8_core::util::{nanoid, supported_image_extension};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
 pub async fn upload_banner(
     context: Data<Arc<Context>>,
     mut payload: Multipart,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Result<Either<Redirect, HttpResponse>, Error> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     while let Some(mut field) = payload.try_next().await? {
         if let Some(content_disposition) = field.content_disposition() {
             if let Some(file_name) = content_disposition.get_filename() {
                 if !supported_image_extension(file_name) {
-                    let message = language.translations.unsupported_file_extension_in_xxx(file_name);
-                    return Ok(Either::Right(error_page(&context, &language, &message)))
+                    let message = session.language.translations
+                        .unsupported_file_extension_in_xxx(file_name);
+                    return Ok(Either::Right(error_page(&context, &message, &session)))
                 }
 
                 let original_filename = file_name.to_string();
@@ -73,11 +77,11 @@ pub async fn upload_banner(
 
                 match context.update_playlist(mutation, &site_path) {
                     PlaylistUpdate::InvalidManifest { playlist } => {
-                        return Ok(Either::Right(pending_manifest_errors(&context, &language, &playlist)));
+                        return Ok(Either::Right(pending_manifest_errors(&context, &playlist, &session)));
                     }
                     PlaylistUpdate::NotFound => {
                         let _ = fs::remove_file(&storage_path);
-                        let http_response = not_found(&context, &language, &site_path);
+                        let http_response = not_found(&context, &session, &site_path);
 
                         return Ok(Either::Right(http_response));
                     }
diff --git a/src/editor/endpoints/processing.rs b/web/src/endpoints/processing.rs
similarity index 96%
rename from src/editor/endpoints/processing.rs
rename to web/src/endpoints/processing.rs
index 99c748d..de699f4 100644
--- a/src/editor/endpoints/processing.rs
+++ b/web/src/endpoints/processing.rs
@@ -6,14 +6,16 @@ use std::sync::Arc;
 use actix_web::web::{Data, Json};
 use serde_derive::Serialize;
 
-use crate::{Context, DeploymentState, JobProgress};
+use hyper8_core::{DeploymentState, JobProgress};
+
+use crate::Context;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DeploymentInfo {
     configured: bool,
     /// Duration of ongoing deployment in seconds
-    deploying_since: Option<f32>, 
+    deploying_since: Option<f32>,
     feedback: String
 }
 
diff --git a/src/editor/endpoints/scripts.rs b/web/src/endpoints/scripts.rs
similarity index 80%
rename from src/editor/endpoints/scripts.rs
rename to web/src/endpoints/scripts.rs
index b87f32a..3711c12 100644
--- a/src/editor/endpoints/scripts.rs
+++ b/web/src/endpoints/scripts.rs
@@ -1,18 +1,17 @@
 // SPDX-FileCopyrightText: 2024-2025 Simon Repp
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use std::sync::Arc;
-
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
-use actix_web::web::Data;
 use indoc::formatdoc;
 
-use crate::Context;
+use crate::Session;
 
-pub async fn scripts(context: Data<Arc<Context>>) -> HttpResponse {
+pub async fn scripts(session: ActixSession) -> HttpResponse {
     let static_js = include_str!("../assets/editor.js");
 
-    let translations = context.get_editor_language().translations;
+    let session_language = Session::language(&session);
+    let translations = session_language.translations;
 
     // We selectively provide only those translations to the runtime js code
     // that are absolutely required, handpicking them here.
diff --git a/src/editor/endpoints/site.rs b/web/src/endpoints/site.rs
similarity index 100%
rename from src/editor/endpoints/site.rs
rename to web/src/endpoints/site.rs
diff --git a/src/editor/endpoints/site/edit.rs b/web/src/endpoints/site/edit.rs
similarity index 94%
rename from src/editor/endpoints/site/edit.rs
rename to web/src/endpoints/site/edit.rs
index b8f25f3..2320d41 100644
--- a/src/editor/endpoints/site/edit.rs
+++ b/web/src/endpoints/site/edit.rs
@@ -3,23 +3,30 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::Data;
 use indoc::formatdoc;
 
-use crate::{
+use hyper8_core::{
     AspectRatio,
-    Context,
-    Field,
-    Language,
     Site,
     SitePath,
     Theme
 };
-use crate::editor::{Checkbox, Input, Location, Select};
-use crate::editor::routes;
-use crate::editor::widgets::layout;
+
+use crate::{
+    Checkbox,
+    Context,
+    Field,
+    Input,
+    Location,
+    Select,
+    Session
+};
+use crate::routes;
+use crate::widgets::layout;
 
 pub struct UpdateFormFeedback {
     pub base_url: Field,
@@ -38,20 +45,23 @@ pub struct UpdateFormFeedback {
     pub theme: Theme
 }
 
-pub async fn edit(context: Data<Arc<Context>>) -> HttpResponse {
-    let language = context.get_editor_language();
+pub async fn edit(
+    context: Data<Arc<Context>>,
+    session: ActixSession
+) -> HttpResponse {
+    let session = Session::new(&session);
 
     let site = context.get_site();
-    edit_page(&context, None, &language, &site)
+    edit_page(&context, None, &session, &site)
 }
 
 pub fn edit_page(
     context: &Context,
     form_feedback: Option<UpdateFormFeedback>,
-    language: &Language,
+    session: &Session,
     site: &Site
 ) -> HttpResponse {
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let manifest_errors = if site.manifest_errors.is_empty() {
         String::new()
@@ -181,8 +191,8 @@ pub fn edit_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::site(&SitePath::root_path()),
+        session,
         site,
         t_site_settings
     );
diff --git a/src/editor/endpoints/site/edit_manifest.rs b/web/src/endpoints/site/edit_manifest.rs
similarity index 77%
rename from src/editor/endpoints/site/edit_manifest.rs
rename to web/src/endpoints/site/edit_manifest.rs
index 9117d9d..1235e16 100644
--- a/src/editor/endpoints/site/edit_manifest.rs
+++ b/web/src/endpoints/site/edit_manifest.rs
@@ -4,29 +4,38 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::Data;
 use indoc::formatdoc;
 
+use hyper8_core::SitePath;
+use hyper8_core::util::string_from_pathbuf;
+
 use crate::{
     Context,
-    Language,
-    SitePath
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::layout;
-use crate::util::string_from_pathbuf;
+use crate::routes;
+use crate::widgets::layout;
 
-pub async fn edit_manifest(context: Data<Arc<Context>>) -> HttpResponse {
-    let language = context.get_editor_language();
-    edit_manifest_page(&context, &language)
+pub async fn edit_manifest(
+    context: Data<Arc<Context>>,
+    session: ActixSession
+) -> HttpResponse {
+    let session = Session::new(&session);
+    edit_manifest_page(&context, &session)
 }
 
-pub fn edit_manifest_page(context: &Context, language: &Language) -> HttpResponse {
+pub fn edit_manifest_page(
+    context: &Context,
+    session: &Session
+) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let manifest_errors = if site.manifest_errors.is_empty() {
         String::new()
@@ -74,8 +83,8 @@ pub fn edit_manifest_page(context: &Context, language: &Language) -> HttpRespons
     let html = layout(
         &body,
         context,
-        language,
         Location::site_manifest(&SitePath::root_path()),
+        session,
         &site,
         site.title()
     );
diff --git a/src/editor/endpoints/site/pending_manifest_errors.rs b/web/src/endpoints/site/pending_manifest_errors.rs
similarity index 84%
rename from src/editor/endpoints/site/pending_manifest_errors.rs
rename to web/src/endpoints/site/pending_manifest_errors.rs
index 567902a..d9288e9 100644
--- a/src/editor/endpoints/site/pending_manifest_errors.rs
+++ b/web/src/endpoints/site/pending_manifest_errors.rs
@@ -4,18 +4,19 @@
 use actix_web::HttpResponse;
 use indoc::formatdoc;
 
-use crate::{Context, Language, Site};
-use crate::editor::actix::html_response;
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::layout;
+use hyper8_core::Site;
+
+use crate::{Context, Location, Session};
+use crate::actix::html_response;
+use crate::routes;
+use crate::widgets::layout;
 
 pub fn pending_manifest_errors(
     context: &Context,
-    language: &Language,
+    session: &Session,
     site: &Site
 ) -> HttpResponse {
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_pending_manifest_errors = translations.pending_manifest_errors;
 
     let manifest_path = context.site_dir
@@ -55,8 +56,8 @@ pub fn pending_manifest_errors(
     let html = layout(
         &body,
         context,
-        language,
         Location::AuxiliaryPage,
+        session,
         site,
         t_pending_manifest_errors
     );
diff --git a/src/editor/endpoints/site/update.rs b/web/src/endpoints/site/update.rs
similarity index 94%
rename from src/editor/endpoints/site/update.rs
rename to web/src/endpoints/site/update.rs
index 6d0f36e..0bf8373 100644
--- a/src/editor/endpoints/site/update.rs
+++ b/web/src/endpoints/site/update.rs
@@ -3,21 +3,22 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::web::{Data, Either, Form, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
+use hyper8_core::{
     AspectRatio,
-    Context,
-    Field,
     Language,
     Site,
     SiteUpdate,
     SiteUrl,
     Theme
 };
-use crate::editor::routes;
+
+use crate::{Context, Field, Session};
+use crate::routes;
 
 use super::edit::edit_page;
 use super::edit::UpdateFormFeedback;
@@ -43,7 +44,8 @@ pub struct UpdateForm {
 
 pub async fn update(
     context: Data<Arc<Context>>,
-    form: Form<UpdateForm>
+    form: Form<UpdateForm>,
+    session: ActixSession
 ) -> Either<Redirect, HttpResponse> {
     let base_url_trimmed = form.base_url.trim();
     let clean_urls = form.clean_urls.is_some();
@@ -106,8 +108,8 @@ pub async fn update(
             theme
         };
 
-        let editor_language = context.get_editor_language();
-        Either::Right(edit_page(&context, Some(form_feedback), &editor_language, &site))
+        let session = Session::new(&session);
+        Either::Right(edit_page(&context, Some(form_feedback), &session, &site))
     } else {
         fn to_option(trimmed: &str) -> Option<String> {
             match trimmed.is_empty() {
@@ -141,8 +143,8 @@ pub async fn update(
 
         match context.update_site(mutation) {
             SiteUpdate::InvalidManifest { site } => {
-                let editor_language = context.get_editor_language();
-                Either::Right(pending_manifest_errors(&context, &editor_language, &site))
+                let session = Session::new(&session);
+                Either::Right(pending_manifest_errors(&context, &session, &site))
             }
             SiteUpdate::Success { site_updated } => {
                 site_updated.write_manifest(&context).unwrap();
diff --git a/src/editor/endpoints/site/update_manifest.rs b/web/src/endpoints/site/update_manifest.rs
similarity index 96%
rename from src/editor/endpoints/site/update_manifest.rs
rename to web/src/endpoints/site/update_manifest.rs
index 354debc..7ae9209 100644
--- a/src/editor/endpoints/site/update_manifest.rs
+++ b/web/src/endpoints/site/update_manifest.rs
@@ -9,7 +9,7 @@ use actix_web::web::{Data, Form, Redirect};
 use serde_derive::Deserialize;
 
 use crate::Context;
-use crate::editor::routes;
+use crate::routes;
 
 #[derive(Deserialize)]
 pub struct UpdateForm {
diff --git a/src/editor/endpoints/styles.rs b/web/src/endpoints/styles.rs
similarity index 91%
rename from src/editor/endpoints/styles.rs
rename to web/src/endpoints/styles.rs
index 29f8455..2fd6fc6 100644
--- a/src/editor/endpoints/styles.rs
+++ b/web/src/endpoints/styles.rs
@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: 2024-2025 Simon Repp
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use std::sync::Arc;
-
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
-use actix_web::web::Data;
 use indoc::formatdoc;
 
-use crate::{Context, Font, ThemeKind};
+use hyper8_core::{Font, ThemeKind};
+
+use crate::Session;
 
 const FONT_ELEMENTS_SELECTOR: &str = "body, button, input, select, textarea";
 
-pub async fn styles(context: Data<Arc<Context>>) -> HttpResponse {
-    let theme = context.get_editor_theme();
+pub async fn styles(session: ActixSession) -> HttpResponse {
+    let theme = Session::theme(&session);
 
     let default_family = Font::Default.family();
     let fonts_css = formatdoc!(r#"
diff --git a/src/editor/endpoints/video.rs b/web/src/endpoints/video.rs
similarity index 100%
rename from src/editor/endpoints/video.rs
rename to web/src/endpoints/video.rs
diff --git a/src/editor/endpoints/video/add_link.rs b/web/src/endpoints/video/add_link.rs
similarity index 72%
rename from src/editor/endpoints/video/add_link.rs
rename to web/src/endpoints/video/add_link.rs
index a1d50e4..a63ec2b 100644
--- a/src/editor/endpoints/video/add_link.rs
+++ b/web/src/endpoints/video/add_link.rs
@@ -3,21 +3,23 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 use url::Url;
 
-use crate::{
-    Context,
+use hyper8_core::{
     Link,
     SitePath,
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
-use crate::infallible_mutation;
+use hyper8_core::infallible_mutation;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -31,6 +33,7 @@ pub struct AddLinkForm {
 pub async fn add_link(
     context: Data<Arc<Context>>,
     form: Form<AddLinkForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let (hidden, rel_me) = match form.verification.as_str() {
@@ -46,10 +49,10 @@ pub async fn add_link(
     let url = match Url::parse(&form.url) {
         Ok(_) => form.url.clone(),
         Err(err) => {
-            let language = context.get_editor_language();
-            let t_invalid_url = language.translations.invalid_url;
+            let session = Session::new(&session);
+            let t_invalid_url = session.language.translations.invalid_url;
             let message = format!("{t_invalid_url} ({err})");
-            return Either::Right(error_page(&context, &language, &message))
+            return Either::Right(error_page(&context, &message, &session))
         }
     };
 
@@ -64,12 +67,12 @@ pub async fn add_link(
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(_) => infallible_mutation!(),
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_links(&video_updated);
diff --git a/src/editor/endpoints/video/dangerous_actions.rs b/web/src/endpoints/video/dangerous_actions.rs
similarity index 91%
rename from src/editor/endpoints/video/dangerous_actions.rs
rename to web/src/endpoints/video/dangerous_actions.rs
index 29ba19d..1c2ac76 100644
--- a/src/editor/endpoints/video/dangerous_actions.rs
+++ b/web/src/endpoints/video/dangerous_actions.rs
@@ -3,21 +3,23 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{SitePath, Video};
+
 use crate::{
     Context,
     Field,
-    Language,
-    SitePath,
-    Video
+    Input,
+    Location,
+    Session
 };
-use crate::editor::{Input, Location};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found};
+use crate::routes;
+use crate::widgets::{layout, not_found};
 
 pub struct MoveFormFeedback {
     pub slug: Field
@@ -25,31 +27,32 @@ pub struct MoveFormFeedback {
 
 pub async fn dangerous_actions(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
         Some(video) => {
             dangerous_actions_page(
                 &context,
                 None,
-                &language,
+                &session,
                 &video
             )
         }
-        None => not_found(&context, &language, &site_path)
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn dangerous_actions_page(
     context: &Context,
     form_feedback: Option<MoveFormFeedback>,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_not_saved = translations.not_saved;
 
     let slug_form = if video.site_path.is_root_path() {
@@ -155,8 +158,8 @@ pub fn dangerous_actions_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::dangerous_actions(&video.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/video/delete.rs b/web/src/endpoints/video/delete.rs
similarity index 72%
rename from src/editor/endpoints/video/delete.rs
rename to web/src/endpoints/video/delete.rs
index 6fa3bd1..75b390d 100644
--- a/src/editor/endpoints/video/delete.rs
+++ b/web/src/endpoints/video/delete.rs
@@ -3,16 +3,19 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{Context, SitePath};
-use crate::context::VideoParent;
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+use hyper8_core::{SitePath, VideoParent};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 pub async fn delete(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     match context.delete_video(&site_path) {
@@ -25,8 +28,8 @@ pub async fn delete(
         }
         Ok(None) => Either::Left(Redirect::to(routes::DASHBOARD).see_other()),
         Err(()) => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
     }
 }
diff --git a/src/editor/endpoints/video/delete_audio_file.rs b/web/src/endpoints/video/delete_audio_file.rs
similarity index 67%
rename from src/editor/endpoints/video/delete_audio_file.rs
rename to web/src/endpoints/video/delete_audio_file.rs
index 54058be..6c96066 100644
--- a/src/editor/endpoints/video/delete_audio_file.rs
+++ b/web/src/endpoints/video/delete_audio_file.rs
@@ -4,13 +4,16 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath, Video, VideoUpdate};
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+use hyper8_core::{SitePath, Video, VideoUpdate};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -22,6 +25,7 @@ pub struct DeleteAudioFileForm {
 pub async fn delete_audio_file(
     context: Data<Arc<Context>>,
     form: Form<DeleteAudioFileForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |video_mut: &mut Video| {
@@ -38,23 +42,23 @@ pub async fn delete_audio_file(
 
             Ok(())
         } else {
-            let language = context.get_editor_language();
-            Err(language.translations.the_file_requested_for_deletion_was_not_found.to_string())
+            let session_language = Session::language(&session);
+            Err(session_language.translations.the_file_requested_for_deletion_was_not_found.to_string())
         }
     };
 
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(err) => {
-            let language = context.get_editor_language();
-            Either::Right(error_page(&context, &language, &err))
+            let session = Session::new(&session);
+            Either::Right(error_page(&context, &err, &session))
         }
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_media(&video_updated);
diff --git a/src/editor/endpoints/video/delete_link.rs b/web/src/endpoints/video/delete_link.rs
similarity index 67%
rename from src/editor/endpoints/video/delete_link.rs
rename to web/src/endpoints/video/delete_link.rs
index 8685bd6..c43b077 100644
--- a/src/editor/endpoints/video/delete_link.rs
+++ b/web/src/endpoints/video/delete_link.rs
@@ -3,13 +3,16 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath, Video, VideoUpdate};
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+use hyper8_core::{SitePath, Video, VideoUpdate};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -22,6 +25,7 @@ pub struct DeleteLinkForm {
 pub async fn delete_link(
     context: Data<Arc<Context>>,
     form: Form<DeleteLinkForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |video_mut: &mut Video| {
@@ -40,23 +44,23 @@ pub async fn delete_link(
 
             Ok(())
         } else {
-            let language = context.get_editor_language();
-            Err(language.translations.the_link_requested_for_deletion_was_not_found.to_string())
+            let session_language = Session::language(&session);
+            Err(session_language.translations.the_link_requested_for_deletion_was_not_found.to_string())
         }
     };
 
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(err) => {
-            let language = context.get_editor_language();
-            Either::Right(error_page(&context, &language, &err))
+            let session = Session::new(&session);
+            Either::Right(error_page(&context, &err, &session))
         }
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_links(&video_updated);
diff --git a/src/editor/endpoints/video/delete_poster.rs b/web/src/endpoints/video/delete_poster.rs
similarity index 71%
rename from src/editor/endpoints/video/delete_poster.rs
rename to web/src/endpoints/video/delete_poster.rs
index bf0be36..6cd4ff4 100644
--- a/src/editor/endpoints/video/delete_poster.rs
+++ b/web/src/endpoints/video/delete_poster.rs
@@ -4,18 +4,22 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 
-use crate::{Context, SitePath, Video, VideoUpdate};
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::infallible_mutation;
+use hyper8_core::{SitePath, Video, VideoUpdate};
+use hyper8_core::infallible_mutation;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::pending_manifest_errors;
 
 pub async fn delete_poster(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |video_mut: &mut Video| {
@@ -35,12 +39,12 @@ pub async fn delete_poster(
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(_) => infallible_mutation!(),
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_poster(&video_updated);
diff --git a/src/editor/endpoints/video/delete_subtitles.rs b/web/src/endpoints/video/delete_subtitles.rs
similarity index 67%
rename from src/editor/endpoints/video/delete_subtitles.rs
rename to web/src/endpoints/video/delete_subtitles.rs
index 7f3c1f9..53fe9b9 100644
--- a/src/editor/endpoints/video/delete_subtitles.rs
+++ b/web/src/endpoints/video/delete_subtitles.rs
@@ -4,13 +4,16 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath, Video, VideoUpdate};
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+use hyper8_core::{SitePath, Video, VideoUpdate};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -22,6 +25,7 @@ pub struct DeleteSubtitlesForm {
 pub async fn delete_subtitles(
     context: Data<Arc<Context>>,
     form: Form<DeleteSubtitlesForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |video_mut: &mut Video| {
@@ -38,23 +42,23 @@ pub async fn delete_subtitles(
 
             Ok(())
         } else {
-            let language = context.get_editor_language();
-            Err(language.translations.the_subtitle_requested_for_deletion_was_not_found.to_string())
+            let session_language = Session::language(&session);
+            Err(session_language.translations.the_subtitle_requested_for_deletion_was_not_found.to_string())
         }
     };
 
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(err) => {
-            let language = context.get_editor_language();
-            Either::Right(error_page(&context, &language, &err))
+            let session = Session::new(&session);
+            Either::Right(error_page(&context, &err, &session))
         }
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_subtitles(&video_updated);
diff --git a/src/editor/endpoints/video/delete_video_file.rs b/web/src/endpoints/video/delete_video_file.rs
similarity index 67%
rename from src/editor/endpoints/video/delete_video_file.rs
rename to web/src/endpoints/video/delete_video_file.rs
index 2fdb1c2..3c1a951 100644
--- a/src/editor/endpoints/video/delete_video_file.rs
+++ b/web/src/endpoints/video/delete_video_file.rs
@@ -4,13 +4,16 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath, Video, VideoUpdate};
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+use hyper8_core::{SitePath, Video, VideoUpdate};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -22,6 +25,7 @@ pub struct DeleteVideoFileForm {
 pub async fn delete_video_file(
     context: Data<Arc<Context>>,
     form: Form<DeleteVideoFileForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |video_mut: &mut Video| {
@@ -38,23 +42,23 @@ pub async fn delete_video_file(
 
             Ok(())
         } else {
-            let language = context.get_editor_language();
-            Err(language.translations.the_file_requested_for_deletion_was_not_found.to_string())
+            let session_language = Session::language(&session);
+            Err(session_language.translations.the_file_requested_for_deletion_was_not_found.to_string())
         }
     };
 
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(err) => {
-            let language = context.get_editor_language();
-            Either::Right(error_page(&context, &language, &err))
+            let session = Session::new(&session);
+            Either::Right(error_page(&context, &err, &session))
         }
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_media(&video_updated);
diff --git a/src/editor/endpoints/video/edit.rs b/web/src/endpoints/video/edit.rs
similarity index 94%
rename from src/editor/endpoints/video/edit.rs
rename to web/src/endpoints/video/edit.rs
index d8068cf..17c932e 100644
--- a/src/editor/endpoints/video/edit.rs
+++ b/web/src/endpoints/video/edit.rs
@@ -3,27 +3,34 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
-    Context,
-    Field,
-    Language,
+use hyper8_core::{
     PlatformIntegration,
     SitePath,
     Video
 };
-use crate::editor::{Checkbox, Input, Location, Select, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{
+
+use crate::{
+    Checkbox,
+    Context,
+    Field,
+    Input,
+    Location,
+    Select,
+    Session,
+    Textarea
+};
+use crate::routes;
+use crate::widgets::{
     layout,
     not_found,
     resource_actions
 };
-use crate::icons;
 
 pub struct UpdateFormFeedback<'a> {
     pub copy_link: Option<bool>,
@@ -41,24 +48,25 @@ pub struct UpdateFormFeedback<'a> {
 
 pub async fn edit(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
-        Some(video) => edit_page(&context, None, &language, &video),
-        None => not_found(&context, &language, &site_path)
+        Some(video) => edit_page(&context, None, &session, &video),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_page(
     context: &Context,
     form_feedback: Option<UpdateFormFeedback>,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_not_saved = translations.not_saved;
 
     let mut errors = String::new();
@@ -116,7 +124,7 @@ pub fn edit_page(
     textarea_description.id("video_description");
 
     if site.base_url.is_none() {
-        let failure_icon = icons::failure(translations.warning);
+        let failure_icon = hyper8_icons::failure(translations.warning);
         let t_public_address_not_configured_text = translations.public_address_not_configured_text;
         let hint = format!("{failure_icon} {t_public_address_not_configured_text}");
 
@@ -231,7 +239,7 @@ pub fn edit_page(
         translations
     );
 
-    let video_icon = icons::video(translations.video);
+    let video_icon = hyper8_icons::video(translations.video);
     let video_title = video.title_or_slug_or_generic_label(translations);
 
     let t_update_video = translations.update_video;
@@ -281,8 +289,8 @@ pub fn edit_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::edit(&video.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/video/edit_manifest.rs b/web/src/endpoints/video/edit_manifest.rs
similarity index 81%
rename from src/editor/endpoints/video/edit_manifest.rs
rename to web/src/endpoints/video/edit_manifest.rs
index 4a5174a..cd1c662 100644
--- a/src/editor/endpoints/video/edit_manifest.rs
+++ b/web/src/endpoints/video/edit_manifest.rs
@@ -4,41 +4,44 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{Video, SitePath};
+use hyper8_core::util::string_from_pathbuf;
+
 use crate::{
     Context,
-    Language,
-    Video,
-    SitePath
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found};
-use crate::util::string_from_pathbuf;
+use crate::routes;
+use crate::widgets::{layout, not_found};
 
 pub async fn edit_manifest(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
-        Some(video) => edit_manifest_page(&context, &language, &video),
-        None => not_found(&context, &language, &site_path)
+        Some(video) => edit_manifest_page(&context, &session, &video),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_manifest_page(
     context: &Context,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let manifest_errors = if video.manifest_errors.is_empty() {
         String::new()
@@ -88,8 +91,8 @@ pub fn edit_manifest_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::manifest(&video.site_path),
+        session,
         &site,
         video.title_or_slug_or_generic_label(translations)
     );
diff --git a/src/editor/endpoints/video/edit_poster.rs b/web/src/endpoints/video/edit_poster.rs
similarity index 95%
rename from src/editor/endpoints/video/edit_poster.rs
rename to web/src/endpoints/video/edit_poster.rs
index 8c340c4..6b336a4 100644
--- a/src/editor/endpoints/video/edit_poster.rs
+++ b/web/src/endpoints/video/edit_poster.rs
@@ -3,21 +3,26 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
+use hyper8_core::{
     AspectRatio,
-    Context,
-    Language,
     SitePath,
     Video
 };
-use crate::editor::{Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found, upload_widget};
+
+use crate::{
+    Context,
+    Location,
+    Session,
+    Textarea
+};
+use crate::routes;
+use crate::widgets::{layout, not_found, upload_widget};
 
 pub struct UploadPosterFormFeedback {
     pub error: String
@@ -25,31 +30,32 @@ pub struct UploadPosterFormFeedback {
 
 pub async fn edit_poster(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
         Some(video) => {
             edit_poster_page(
                 &context,
                 None,
-                &language,
+                &session,
                 &video
             )
         }
-        None => not_found(&context, &language, &site_path)
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_poster_page(
     context: &Context,
     form_feedback: Option<UploadPosterFormFeedback>,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let pick_poster_action = routes::video_pick_poster(video);
 
@@ -233,8 +239,8 @@ pub fn edit_poster_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::poster(&video.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/video/edit_subtitles.rs b/web/src/endpoints/video/edit_subtitles.rs
similarity index 85%
rename from src/editor/endpoints/video/edit_subtitles.rs
rename to web/src/endpoints/video/edit_subtitles.rs
index 81817a0..e91b7d2 100644
--- a/src/editor/endpoints/video/edit_subtitles.rs
+++ b/web/src/endpoints/video/edit_subtitles.rs
@@ -4,21 +4,24 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
+use hyper8_core::{SitePath, Video};
+
 use crate::{
     Context,
     Field,
-    Language,
-    SitePath,
-    Video
+    Input,
+    Location,
+    Session,
+    Textarea
 };
-use crate::editor::{Input, Location, Textarea};
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, layout, not_found};
+use crate::routes;
+use crate::widgets::{error_page, layout, not_found};
 
 pub struct UpdateFormFeedback<'a> {
     pub content: &'a str,
@@ -28,16 +31,17 @@ pub struct UpdateFormFeedback<'a> {
 
 pub async fn edit_subtitles(
     context: Data<Arc<Context>>,
-    path: ActixPath<(String, String)>
+    path: ActixPath<(String, String)>,
+    session: ActixSession
 ) -> HttpResponse {
     let (file_name, site_path_str) = path.into_inner();
     let site_path = SitePath::new(site_path_str);
 
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
-        Some(video) => edit_subtitles_page(&context, &file_name, None, &language, &video),
-        None => not_found(&context, &language, &site_path)
+        Some(video) => edit_subtitles_page(&context, &file_name, None, &session, &video),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
@@ -45,11 +49,11 @@ pub fn edit_subtitles_page(
     context: &Context,
     file_name: &str,
     form_feedback: Option<UpdateFormFeedback>,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_not_saved = translations.not_saved;
 
     let subtitles = match video.subtitles
@@ -58,7 +62,7 @@ pub fn edit_subtitles_page(
         Some(subtitle_file) => subtitle_file,
         None => {
             let err = format!("The subtitle file '{file_name}' was not found.");
-            return error_page(context, language, &err)
+            return error_page(context, &err, session)
         }
     };
 
@@ -114,8 +118,8 @@ pub fn edit_subtitles_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::subtitles(&video.site_path),
+        session,
         &site,
         head_title
     );
diff --git a/src/editor/endpoints/video/encode_audio.rs b/web/src/endpoints/video/encode_audio.rs
similarity index 79%
rename from src/editor/endpoints/video/encode_audio.rs
rename to web/src/endpoints/video/encode_audio.rs
index 363971d..ae982de 100644
--- a/src/editor/endpoints/video/encode_audio.rs
+++ b/web/src/endpoints/video/encode_audio.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
+use hyper8_core::{
     AudioFormat,
-    Context,
     JobDesc,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 #[derive(Deserialize)]
 pub struct EncodeAudioForm {
@@ -25,6 +27,7 @@ pub struct EncodeAudioForm {
 pub async fn encode_audio(
     context: Data<Arc<Context>>,
     form: Form<EncodeAudioForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     match context.get_video(&site_path) {
@@ -41,8 +44,8 @@ pub async fn encode_audio(
             Either::Left(Redirect::to(redirect_url).see_other())
         }
         None => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
     }
 }
diff --git a/src/editor/endpoints/video/encode_video.rs b/web/src/endpoints/video/encode_video.rs
similarity index 84%
rename from src/editor/endpoints/video/encode_video.rs
rename to web/src/endpoints/video/encode_video.rs
index 00fab9d..631f233 100644
--- a/src/editor/endpoints/video/encode_video.rs
+++ b/web/src/endpoints/video/encode_video.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
+use hyper8_core::{
     JobDesc,
     SitePath,
     VideoFormat
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 #[derive(Deserialize)]
 pub struct EncodeVideoForm {
@@ -29,6 +31,7 @@ pub struct EncodeVideoForm {
 pub async fn encode_video(
     context: Data<Arc<Context>>,
     form: Form<EncodeVideoForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     match context.get_video(&site_path) {
@@ -59,8 +62,8 @@ pub async fn encode_video(
             Either::Left(Redirect::to(redirect_url).see_other())
         }
         None => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
     }
 }
diff --git a/src/editor/endpoints/video/links.rs b/web/src/endpoints/video/links.rs
similarity index 73%
rename from src/editor/endpoints/video/links.rs
rename to web/src/endpoints/video/links.rs
index a040544..9fc3bd1 100644
--- a/src/editor/endpoints/video/links.rs
+++ b/web/src/endpoints/video/links.rs
@@ -3,20 +3,17 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
-    Context,
-    Language,
-    SitePath,
-    Video
-};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::{
+use hyper8_core::{SitePath, Video};
+
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::{
     add_link_form,
     layout,
     links as links_widget,
@@ -25,23 +22,24 @@ use crate::editor::widgets::{
 
 pub async fn links(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
-        Some(video) => edit_links_page(&context, &language, &video),
-        None => not_found(&context, &language, &site_path)
+        Some(video) => edit_links_page(&context, &session, &video),
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn edit_links_page(
     context: &Context,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let create_link_form = add_link_form(&routes::video_add_link(video), translations);
     let links_form = links_widget(&video.links, &routes::video_delete_link(video), translations);
@@ -57,8 +55,8 @@ pub fn edit_links_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::links(&video.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/video/media.rs b/web/src/endpoints/video/media.rs
similarity index 93%
rename from src/editor/endpoints/video/media.rs
rename to web/src/endpoints/video/media.rs
index d69099a..d9c66bd 100644
--- a/src/editor/endpoints/video/media.rs
+++ b/web/src/endpoints/video/media.rs
@@ -3,25 +3,29 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{
-    Context,
+use hyper8_core::{
     Desc,
-    Language,
     SitePath,
-    Translations,
     Video
 };
-use crate::browser_support;
-use crate::editor::{Location, Select};
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found, upload_widget};
-use crate::icons;
-use crate::util::{precise_duration, human_size};
+use hyper8_core::browser_support;
+use hyper8_core::util::{precise_duration, human_size};
+use hyper8_translations::Translations;
+
+use crate::{
+    Context,
+    Location,
+    Select,
+    Session
+};
+use crate::routes;
+use crate::widgets::{layout, not_found, upload_widget};
 
 fn additional_formats_form(translations: &Translations, video: &Video) -> String {
     let video_meta = if let Some(video_file) = video.highest_quality_video_file() {
@@ -154,29 +158,30 @@ fn additional_formats_form(translations: &Translations, video: &Video) -> String
 
 pub async fn media(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
         Some(video) => {
             media_page(
                 &context,
-                &language,
+                &session,
                 &video
             )
         }
-        None => not_found(&context, &language, &site_path)
+        None => not_found(&context, &session, &site_path)
     }
 }
 
 pub fn media_page(
     context: &Context,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
     let site = context.get_site();
-    let translations = &language.translations;
+    let translations = &session.language.translations;
 
     let audio_files = if video.audio_files.is_empty() {
         String::new()
@@ -213,7 +218,7 @@ pub fn media_page(
 
                 let t_not_ok = translations.not_ok;
                 let t_length_diverges_between_different_formats = translations.length_diverges_between_different_formats;
-                let failure_icon = icons::failure(t_not_ok);
+                let failure_icon = hyper8_icons::failure(t_not_ok);
                 format!(r#"<div class="error">{failure_icon} {t_length_diverges_between_different_formats} ({shortest} - {longest})</div>"#)
             }
         } else {
@@ -232,7 +237,11 @@ pub fn media_page(
                     Some(audio_meta) => {
                         let duration = precise_duration(audio_meta.duration);
 
-                        let (browser_support, reasons) = match browser_support::audio_analysis(audio_meta, &audio_file.file_name, language) {
+                        let (browser_support, reasons) = match browser_support::audio_analysis(
+                            audio_meta,
+                            &audio_file.file_name,
+                            &session.language
+                        ) {
                             Some(Ok(message)) => (
                                 translations.good_browser_support,
                                 message
@@ -260,7 +269,7 @@ pub fn media_page(
 
                 let t_delete = translations.delete;
                 let t_really_delete = translations.really_delete;
-                let delete_icon = icons::failure(t_delete);
+                let delete_icon = hyper8_icons::failure(t_delete);
                 let delete_audio_file_action = routes::video_delete_audio_file(video);
                 let delete_form = formatdoc!(r#"
                     <form
@@ -337,7 +346,7 @@ pub fn media_page(
 
                 let t_not_ok = translations.not_ok;
                 let t_length_diverges_between_different_formats = translations.length_diverges_between_different_formats;
-                let failure_icon = icons::failure(t_not_ok);
+                let failure_icon = hyper8_icons::failure(t_not_ok);
                 format!(r#"<div class="error">{failure_icon} {t_length_diverges_between_different_formats} ({shortest} - {longest})</div>"#)
             }
         } else {
@@ -355,7 +364,11 @@ pub fn media_page(
                         let size = human_size(video_file.file_meta.size);
                         let width = video_meta.width;
 
-                        let (browser_support, reasons) = match browser_support::video_analysis(&video_file.file_name, language, video_meta) {
+                        let (browser_support, reasons) = match browser_support::video_analysis(
+                            &video_file.file_name,
+                            &session.language,
+                            video_meta
+                        ) {
                             Some(Ok(message)) => (
                                 translations.good_browser_support,
                                 message
@@ -387,7 +400,7 @@ pub fn media_page(
 
                 let t_delete = translations.delete;
                 let t_really_delete = translations.really_delete;
-                let delete_icon = icons::failure(t_delete);
+                let delete_icon = hyper8_icons::failure(t_delete);
                 let delete_video_file_action = routes::video_delete_video_file(video);
                 let delete_form = formatdoc!(r#"
                     <form
@@ -454,8 +467,8 @@ pub fn media_page(
     let html = layout(
         &body,
         context,
-        language,
         Location::media(&video.site_path),
+        session,
         &site,
         &head_title
     );
diff --git a/src/editor/endpoints/video/move.rs b/web/src/endpoints/video/move.rs
similarity index 82%
rename from src/editor/endpoints/video/move.rs
rename to web/src/endpoints/video/move.rs
index 709e905..1d6354a 100644
--- a/src/editor/endpoints/video/move.rs
+++ b/web/src/endpoints/video/move.rs
@@ -4,20 +4,21 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
-    Field,
+use hyper8_core::{
     SitePath,
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
-use crate::util::validate_slug;
+use hyper8_core::util::validate_slug;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::dangerous_actions::dangerous_actions_page;
 use super::dangerous_actions::MoveFormFeedback;
@@ -32,9 +33,10 @@ pub struct VideoMoveForm {
 pub async fn r#move(
     context: Data<Arc<Context>>,
     form: Form<VideoMoveForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let slug_trimmed = form.slug.trim();
 
@@ -66,14 +68,13 @@ pub async fn r#move(
 
         match context.update_video(mutation, &site_path) {
             VideoUpdate::Error(err) => {
-                let language = context.get_editor_language();
-                Either::Right(error_page(&context, &language, &err))
+                Either::Right(error_page(&context, &err, &session))
             }
             VideoUpdate::InvalidManifest { video } => {
-                Either::Right(pending_manifest_errors(&context, &language, &video))
+                Either::Right(pending_manifest_errors(&context, &session, &video))
             }
             VideoUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             VideoUpdate::Success { video_updated, .. } => {
                 let redirect_url = routes::video_dangerous_actions(&video_updated);
@@ -83,7 +84,7 @@ pub async fn r#move(
     } else {
         let video = match context.get_video(&site_path) {
             Some(video) => video,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = MoveFormFeedback {
@@ -91,7 +92,7 @@ pub async fn r#move(
         };
 
         Either::Right(
-            dangerous_actions_page(&context, Some(form_feedback), &language, &video)
+            dangerous_actions_page(&context, Some(form_feedback), &session, &video)
         )
     }
 }
diff --git a/src/editor/endpoints/video/pending_manifest_errors.rs b/web/src/endpoints/video/pending_manifest_errors.rs
similarity index 88%
rename from src/editor/endpoints/video/pending_manifest_errors.rs
rename to web/src/endpoints/video/pending_manifest_errors.rs
index 78fa788..b14ab8a 100644
--- a/src/editor/endpoints/video/pending_manifest_errors.rs
+++ b/web/src/endpoints/video/pending_manifest_errors.rs
@@ -5,17 +5,18 @@ use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use indoc::formatdoc;
 
-use crate::{Context, Language, Video};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::layout;
+use hyper8_core::Video;
+
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::layout;
 
 pub fn pending_manifest_errors(
     context: &Context,
-    language: &Language,
+    session: &Session,
     video: &Video
 ) -> HttpResponse {
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let t_pending_manifest_errors = translations.pending_manifest_errors;
 
     let video_title = video.title_or_slug_or_generic_label(translations);
@@ -59,8 +60,8 @@ pub fn pending_manifest_errors(
     let html = layout(
         &body,
         context,
-        language,
         Location::AuxiliaryPage,
+        session,
         site,
         t_pending_manifest_errors
     );
diff --git a/src/editor/endpoints/video/pick_poster.rs b/web/src/endpoints/video/pick_poster.rs
similarity index 79%
rename from src/editor/endpoints/video/pick_poster.rs
rename to web/src/endpoints/video/pick_poster.rs
index 711d62d..5a2019e 100644
--- a/src/editor/endpoints/video/pick_poster.rs
+++ b/web/src/endpoints/video/pick_poster.rs
@@ -3,17 +3,19 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
+use hyper8_core::{
     JobDesc,
     SitePath
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 #[derive(Deserialize)]
 pub struct PickPosterForm {
@@ -23,6 +25,7 @@ pub struct PickPosterForm {
 pub async fn pick_poster(
     context: Data<Arc<Context>>,
     form: Form<PickPosterForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     match context.get_video(&site_path) {
@@ -44,8 +47,8 @@ pub async fn pick_poster(
             Either::Left(Redirect::to(redirect_url).see_other())
         }
         None => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
     }
 }
diff --git a/src/editor/endpoints/video/poster.rs b/web/src/endpoints/video/poster.rs
similarity index 97%
rename from src/editor/endpoints/video/poster.rs
rename to web/src/endpoints/video/poster.rs
index 9eeff53..88f02bf 100644
--- a/src/editor/endpoints/video/poster.rs
+++ b/web/src/endpoints/video/poster.rs
@@ -8,7 +8,9 @@ use actix_web::HttpResponse;
 use actix_web::web;
 use actix_web::web::{Data, Path as ActixPath};
 
-use crate::{Context, SitePath};
+use hyper8_core::SitePath;
+
+use crate::Context;
 
 // TODO: We currently go through the video endpoint for poster for all posters
 //       (also playlist e.g.), this is unclean, make generic or change otherwise
diff --git a/src/editor/endpoints/video/stream.rs b/web/src/endpoints/video/stream.rs
similarity index 97%
rename from src/editor/endpoints/video/stream.rs
rename to web/src/endpoints/video/stream.rs
index 28ac013..244c9dc 100644
--- a/src/editor/endpoints/video/stream.rs
+++ b/web/src/endpoints/video/stream.rs
@@ -8,7 +8,9 @@ use actix_web::HttpResponse;
 use actix_web::web;
 use actix_web::web::{Data, Path as ActixPath};
 
-use crate::{Context, SitePath};
+use hyper8_core::SitePath;
+
+use crate::Context;
 
 // TODO: We should make this a little more secure (catch the worst path
 // injection attack stuff) because someone is going to leave this open
diff --git a/src/editor/endpoints/video/subtitles.rs b/web/src/endpoints/video/subtitles.rs
similarity index 84%
rename from src/editor/endpoints/video/subtitles.rs
rename to web/src/endpoints/video/subtitles.rs
index 1668fb4..7c39f45 100644
--- a/src/editor/endpoints/video/subtitles.rs
+++ b/web/src/endpoints/video/subtitles.rs
@@ -3,28 +3,30 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use actix_web::web::{Data, Path as ActixPath};
 use indoc::formatdoc;
 
-use crate::{Context, SitePath};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::editor::widgets::{layout, not_found, upload_widget};
-use crate::icons;
-use crate::util::html_escape_outside_attribute;
+use hyper8_core::SitePath;
+use hyper8_core::util::html_escape_outside_attribute;
+
+use crate::{Context, Location, Session};
+use crate::routes;
+use crate::widgets::{layout, not_found, upload_widget};
 
 pub async fn subtitles(
     context: Data<Arc<Context>>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> HttpResponse {
-    let language = context.get_editor_language();
-    let translations = &language.translations;
+    let session = Session::new(&session);
+    let translations = &session.language.translations;
 
     let video = match context.get_video(&site_path) {
         Some(video) => video,
-        None => return not_found(&context, &language, &site_path)
+        None => return not_found(&context, &session, &site_path)
     };
 
     let site = context.get_site();
@@ -49,7 +51,7 @@ pub async fn subtitles(
 
             let t_delete = translations.delete;
             let t_really_delete = translations.really_delete;
-            let delete_icon = icons::failure(t_delete);
+            let delete_icon = hyper8_icons::failure(t_delete);
             let delete_version_action = routes::video_delete_subtitles(&video);
             let delete_form = formatdoc!(r#"
                 <form
@@ -90,8 +92,8 @@ pub async fn subtitles(
     let html = layout(
         &body,
         &context,
-        &language,
         Location::subtitles(&video.site_path),
+        &session,
         &site,
         head_title
     );
diff --git a/src/editor/endpoints/video/update.rs b/web/src/endpoints/video/update.rs
similarity index 88%
rename from src/editor/endpoints/video/update.rs
rename to web/src/endpoints/video/update.rs
index cd79e3d..39233c1 100644
--- a/src/editor/endpoints/video/update.rs
+++ b/web/src/endpoints/video/update.rs
@@ -3,23 +3,24 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use chrono::NaiveDate;
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
-    Field,
+use hyper8_core::{
     PlatformIntegration,
     SitePath,
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::infallible_mutation;
-use crate::manifest::MAX_SYNOPSIS_CHARS;
+use hyper8_core::infallible_mutation;
+use hyper8_core::MAX_SYNOPSIS_CHARS;
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit::edit_page;
 use super::edit::UpdateFormFeedback;
@@ -43,9 +44,10 @@ pub struct VideoUpdateForm {
 pub async fn update(
     context: Data<Arc<Context>>,
     form: Form<VideoUpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let description_trimmed = form.description.trim();
 
@@ -99,7 +101,7 @@ pub async fn update(
     } else if synopsis_trimmed.chars().count() <= MAX_SYNOPSIS_CHARS {
         Some(Ok(synopsis_trimmed.to_string()))
     } else {
-        Some(Err(language.translations.xxx_characters_maximum(MAX_SYNOPSIS_CHARS)))
+        Some(Err(session.language.translations.xxx_characters_maximum(MAX_SYNOPSIS_CHARS)))
     };
 
     let title_trimmed = form.title.trim();
@@ -111,7 +113,7 @@ pub async fn update(
         synopsis.as_ref().is_some_and(|synopsis| synopsis.is_err()) {
         let video = match context.get_video(&site_path) {
             Some(video) => video,
-            None => return Either::Right(not_found(&context, &language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = UpdateFormFeedback {
@@ -129,7 +131,7 @@ pub async fn update(
         };
 
         Either::Right(
-            edit_page(&context, Some(form_feedback), &language, &video)
+            edit_page(&context, Some(form_feedback), &session, &video)
         )
     } else {
         let mutation = |video_mut: &mut Video| {
@@ -152,10 +154,10 @@ pub async fn update(
         match context.update_video(mutation, &site_path) {
             VideoUpdate::Error(_) => infallible_mutation!(),
             VideoUpdate::InvalidManifest { video } => {
-                Either::Right(pending_manifest_errors(&context, &language, &video))
+                Either::Right(pending_manifest_errors(&context, &session, &video))
             }
             VideoUpdate::NotFound => {
-                Either::Right(not_found(&context, &language, &site_path))
+                Either::Right(not_found(&context, &session, &site_path))
             }
             VideoUpdate::Success { video_updated, .. } => {
                 let redirect_url = routes::video_edit(&video_updated);
diff --git a/src/editor/endpoints/video/update_manifest.rs b/web/src/endpoints/video/update_manifest.rs
similarity index 77%
rename from src/editor/endpoints/video/update_manifest.rs
rename to web/src/endpoints/video/update_manifest.rs
index b4f66a6..bb9e313 100644
--- a/src/editor/endpoints/video/update_manifest.rs
+++ b/web/src/endpoints/video/update_manifest.rs
@@ -4,13 +4,16 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{Context, SitePath};
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
+use hyper8_core::SitePath;
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 #[derive(Deserialize)]
 pub struct UpdateForm {
@@ -20,9 +23,10 @@ pub struct UpdateForm {
 pub async fn update_manifest(
     context: Data<Arc<Context>>,
     form: Form<UpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     match context.get_video(&site_path) {
         Some(video) => {
@@ -37,6 +41,6 @@ pub async fn update_manifest(
             let redirect_url = routes::video_manifest(&video);
             Either::Left(Redirect::to(redirect_url).see_other())
         }
-        None => Either::Right(not_found(&context, &language, &site_path))
+        None => Either::Right(not_found(&context, &session, &site_path))
     }
 }
diff --git a/src/editor/endpoints/video/update_poster.rs b/web/src/endpoints/video/update_poster.rs
similarity index 63%
rename from src/editor/endpoints/video/update_poster.rs
rename to web/src/endpoints/video/update_poster.rs
index e89858d..e9ad604 100644
--- a/src/editor/endpoints/video/update_poster.rs
+++ b/web/src/endpoints/video/update_poster.rs
@@ -3,18 +3,20 @@
 
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
+use hyper8_core::{
     SitePath,
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
@@ -26,6 +28,7 @@ pub struct PosterUpdateForm {
 pub async fn update_poster(
     context: Data<Arc<Context>>,
     form: Form<PosterUpdateForm>,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Either<Redirect, HttpResponse> {
     let mutation = |video: &mut Video| {
@@ -35,23 +38,23 @@ pub async fn update_poster(
 
             Ok(())
         } else {
-            let language = context.get_editor_language();
-            Err(language.translations.the_poster_to_be_updated_was_not_found.to_string())
+            let session_language = Session::language(&session);
+            Err(session_language.translations.the_poster_to_be_updated_was_not_found.to_string())
         }
     };
 
     match context.update_video(mutation, &site_path) {
         VideoUpdate::Error(err) => {
-            let language = context.get_editor_language();
-            Either::Right(error_page(&context, &language, &err))
+            let session = Session::new(&session);
+            Either::Right(error_page(&context, &err, &session))
         }
         VideoUpdate::InvalidManifest { video } => {
-            let language = context.get_editor_language();
-            Either::Right(pending_manifest_errors(&context, &language, &video))
+            let session = Session::new(&session);
+            Either::Right(pending_manifest_errors(&context, &session, &video))
         }
         VideoUpdate::NotFound => {
-            let language = context.get_editor_language();
-            Either::Right(not_found(&context, &language, &site_path))
+            let session = Session::new(&session);
+            Either::Right(not_found(&context, &session, &site_path))
         }
         VideoUpdate::Success { video_updated, .. } => {
             let redirect_url = routes::video_poster(&video_updated);
diff --git a/src/editor/endpoints/video/update_subtitles.rs b/web/src/endpoints/video/update_subtitles.rs
similarity index 76%
rename from src/editor/endpoints/video/update_subtitles.rs
rename to web/src/endpoints/video/update_subtitles.rs
index 7925853..9ad6abb 100644
--- a/src/editor/endpoints/video/update_subtitles.rs
+++ b/web/src/endpoints/video/update_subtitles.rs
@@ -4,20 +4,21 @@
 use std::fs;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_web::{Either, HttpResponse};
 use actix_web::web::{Data, Form, Path as ActixPath, Redirect};
 use language_tags::LanguageTag;
 use serde_derive::Deserialize;
 
-use crate::{
-    Context,
-    Field,
+use hyper8_core::{
     SitePath,
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
+
+use crate::{Context, Field, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::edit_subtitles::edit_subtitles_page;
 use super::edit_subtitles::UpdateFormFeedback;
@@ -34,7 +35,8 @@ pub struct SubtitlesUpdateForm {
 pub async fn update_subtitles(
     context: Data<Arc<Context>>,
     form: Form<SubtitlesUpdateForm>,
-    path: ActixPath<(String, String)>
+    path: ActixPath<(String, String)>,
+    session: ActixSession
 ) -> Either<Redirect, HttpResponse> {
     let (file_name, site_path_str) = path.into_inner();
     let site_path = SitePath::new(site_path_str);
@@ -45,8 +47,8 @@ pub async fn update_subtitles(
 
     let label_error = match label_trimmed.is_empty() {
         true => {
-            let editor_language = context.get_editor_language();
-            Some(editor_language.translations.label_can_not_be_empty)
+            let session_language = Session::language(&session);
+            Some(session_language.translations.label_can_not_be_empty)
         }
         false => None
     };
@@ -65,11 +67,11 @@ pub async fn update_subtitles(
     };
 
     if label_error.is_some() || language.is_err() {
-        let editor_language = context.get_editor_language();
+        let session = Session::new(&session);
 
         let video = match context.get_video(&site_path) {
             Some(video) => video,
-            None => return Either::Right(not_found(&context, &editor_language, &site_path))
+            None => return Either::Right(not_found(&context, &session, &site_path))
         };
 
         let form_feedback = UpdateFormFeedback {
@@ -79,7 +81,7 @@ pub async fn update_subtitles(
         };
 
         Either::Right(
-            edit_subtitles_page(&context, &file_name, Some(form_feedback), &editor_language, &video)
+            edit_subtitles_page(&context, &file_name, Some(form_feedback), &session, &video)
         )
     } else {
         let mutation = |video_mut: &mut Video| {
@@ -102,24 +104,24 @@ pub async fn update_subtitles(
                     Ok(())
                 }
                 None => {
-                    let editor_language = context.get_editor_language();
-                    Err(editor_language.translations.the_subtitles_to_be_updated_were_not_found.to_string())
+                    let session_language = Session::language(&session);
+                    Err(session_language.translations.the_subtitles_to_be_updated_were_not_found.to_string())
                 }
             }
         };
 
         match context.update_video(mutation, &site_path) {
             VideoUpdate::Error(err) => {
-                let editor_language = context.get_editor_language();
-                Either::Right(error_page(&context, &editor_language, &err))
+                let session = Session::new(&session);
+                Either::Right(error_page(&context, &err, &session))
             }
             VideoUpdate::InvalidManifest { video } => {
-                let editor_language = context.get_editor_language();
-                Either::Right(pending_manifest_errors(&context, &editor_language, &video))
+                let session = Session::new(&session);
+                Either::Right(pending_manifest_errors(&context, &session, &video))
             }
             VideoUpdate::NotFound => {
-                let editor_language = context.get_editor_language();
-                Either::Right(not_found(&context, &editor_language, &site_path))
+                let session = Session::new(&session);
+                Either::Right(not_found(&context, &session, &site_path))
             }
             VideoUpdate::Success { video_updated, .. } => {
                 let redirect_url = routes::video_subtitles(&video_updated);
diff --git a/src/editor/endpoints/video/upload_audio_video.rs b/web/src/endpoints/video/upload_audio_video.rs
similarity index 90%
rename from src/editor/endpoints/video/upload_audio_video.rs
rename to web/src/endpoints/video/upload_audio_video.rs
index 492d7f5..87c2daf 100644
--- a/src/editor/endpoints/video/upload_audio_video.rs
+++ b/web/src/endpoints/video/upload_audio_video.rs
@@ -7,6 +7,7 @@ use std::io::Write;
 use std::path::Path;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_multipart::Multipart;
 use actix_web::{Either, Error, HttpResponse};
 use actix_web::web;
@@ -14,11 +15,10 @@ use actix_web::web::{Data, Path as ActixPath, Redirect};
 use futures_util::TryStreamExt as _;
 use slug::slugify;
 
-use crate::{
+use hyper8_core::{
     AudioFile,
     Collection,
     CollectionUpdate,
-    Context,
     FileMeta,
     GetAnyResult,
     HyperDir,
@@ -30,31 +30,34 @@ use crate::{
     VideoFile,
     VideoUpdate
 };
-use crate::editor::endpoints::collection::pending_manifest_errors as pending_collection_manifest_errors;
-use crate::editor::endpoints::playlist::pending_manifest_errors as pending_playlist_manifest_errors;
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
-use crate::infallible_mutation;
-use crate::util::{
+use hyper8_core::infallible_mutation;
+use hyper8_core::util::{
     deduplicate_filename,
     deduplicate_filestem,
     supported_audio_extension,
     supported_video_extension
 };
 
+use crate::{Context, Session};
+use crate::endpoints::collection::pending_manifest_errors as pending_collection_manifest_errors;
+use crate::endpoints::playlist::pending_manifest_errors as pending_playlist_manifest_errors;
+use crate::routes;
+use crate::widgets::{error_page, not_found};
+
 use super::pending_manifest_errors as pending_video_manifest_errors;
 
 pub async fn upload_audio_video(
     context: Data<Arc<Context>>,
     mut payload: Multipart,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Result<Either<Redirect, HttpResponse>, Error> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let container = context.get_any(&site_path);
 
     if let GetAnyResult::None = container {
-        let http_response = not_found(&context, &language, &site_path);
+        let http_response = not_found(&context, &session, &site_path);
         return Ok(Either::Right(http_response));
     }
 
@@ -147,11 +150,11 @@ pub async fn upload_audio_video(
 
                             match context.update_collection(mutation, &site_path) {
                                 CollectionUpdate::InvalidManifest { collection } => {
-                                    return Ok(Either::Right(pending_collection_manifest_errors(&collection, &context, &language)))
+                                    return Ok(Either::Right(pending_collection_manifest_errors(&collection, &context, &session)))
                                 }
                                 CollectionUpdate::NotFound => {
                                     // TODO: Can only happen in weird time of check vs. time of use edge cases
-                                    return Ok(Either::Right(not_found(&context, &language, &site_path)));
+                                    return Ok(Either::Right(not_found(&context, &session, &site_path)));
                                 }
                                 CollectionUpdate::Updated { optional_return_value: video, .. } => video
                             }
@@ -167,11 +170,11 @@ pub async fn upload_audio_video(
 
                             match context.update_playlist(mutation, &site_path) {
                                 PlaylistUpdate::InvalidManifest { playlist } => {
-                                    return Ok(Either::Right(pending_playlist_manifest_errors(&context, &language, &playlist)))
+                                    return Ok(Either::Right(pending_playlist_manifest_errors(&context, &playlist, &session)))
                                 }
                                 PlaylistUpdate::NotFound => {
                                     // TODO: Can only happen in weird time of check vs. time of use edge cases
-                                    return Ok(Either::Right(not_found(&context, &language, &site_path)));
+                                    return Ok(Either::Right(not_found(&context, &session, &site_path)));
                                 }
                                 PlaylistUpdate::Updated { optional_return_value: video, .. } => video
                             }
@@ -193,11 +196,11 @@ pub async fn upload_audio_video(
                             match context.update_video(mutation, &site_path) {
                                 VideoUpdate::Error(_) => infallible_mutation!(),
                                 VideoUpdate::InvalidManifest { video } => {
-                                    return Ok(Either::Right(pending_video_manifest_errors(&context, &language, &video)))
+                                    return Ok(Either::Right(pending_video_manifest_errors(&context, &session, &video)))
                                 }
                                 // TODO: Can only happen in weird time of check vs. time of use edge cases
                                 VideoUpdate::NotFound => {
-                                    return Ok(Either::Right(not_found(&context, &language, &site_path)));
+                                    return Ok(Either::Right(not_found(&context, &session, &site_path)));
                                 }
                                 VideoUpdate::Success { video_updated, .. } => video_updated
                             }
@@ -221,8 +224,9 @@ pub async fn upload_audio_video(
                     let redirect_url = routes::video_edit(&video);
                     return Ok(Either::Left(Redirect::to(redirect_url).see_other()))
                 } else {
-                    let message = language.translations.unsupported_file_extension_in_xxx(filename);
-                    return Ok(Either::Right(error_page(&context, &language, &message)));
+                    let message = session.language.translations
+                        .unsupported_file_extension_in_xxx(filename);
+                    return Ok(Either::Right(error_page(&context, &message, &session)));
                 }
             }
         }
diff --git a/src/editor/endpoints/video/upload_poster.rs b/web/src/endpoints/video/upload_poster.rs
similarity index 90%
rename from src/editor/endpoints/video/upload_poster.rs
rename to web/src/endpoints/video/upload_poster.rs
index 00817b5..448d618 100644
--- a/src/editor/endpoints/video/upload_poster.rs
+++ b/web/src/endpoints/video/upload_poster.rs
@@ -6,14 +6,14 @@ use std::fs::File;
 use std::io::Write;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_multipart::Multipart;
 use actix_web::{Either, Error, HttpResponse};
 use actix_web::web;
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 use futures_util::TryStreamExt as _;
 
-use crate::{
-    Context,
+use hyper8_core::{
     FileMeta,
     JobDesc,
     PosterFile,
@@ -21,10 +21,12 @@ use crate::{
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::not_found;
-use crate::infallible_mutation;
-use crate::util::{nanoid, supported_image_extension};
+use hyper8_core::infallible_mutation;
+use hyper8_core::util::{nanoid, supported_image_extension};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::not_found;
 
 use super::edit_poster::edit_poster_page;
 use super::edit_poster::UploadPosterFormFeedback;
@@ -34,9 +36,10 @@ use super::pending_manifest_errors;
 pub async fn upload_poster(
     context: Data<Arc<Context>>,
     mut payload: Multipart,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Result<Either<Redirect, HttpResponse>, Error> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     while let Some(mut field) = payload.try_next().await? {
         if let Some(content_disposition) = field.content_disposition() {
@@ -46,11 +49,11 @@ pub async fn upload_poster(
                         Some(video) => {
                             let error = format!("Unsupported file extension in {filename}");
                             let form_feedback = UploadPosterFormFeedback { error };
-                            let http_response = edit_poster_page(&context, Some(form_feedback), &language, &video);
+                            let http_response = edit_poster_page(&context, Some(form_feedback), &session, &video);
                             return Ok(Either::Right(http_response))
                         }
                         None => {
-                            let http_response = not_found(&context, &language, &site_path);
+                            let http_response = not_found(&context, &session, &site_path);
                             return Ok(Either::Right(http_response));
                         }
                     }
@@ -101,11 +104,11 @@ pub async fn upload_poster(
                 match context.update_video(mutation, &site_path) {
                     VideoUpdate::Error(_) => infallible_mutation!(),
                     VideoUpdate::InvalidManifest { video } => {
-                        return Ok(Either::Right(pending_manifest_errors(&context, &language, &video)))
+                        return Ok(Either::Right(pending_manifest_errors(&context, &session, &video)))
                     }
                     VideoUpdate::NotFound => {
                         let _ = fs::remove_file(&storage_path);
-                        let http_response = not_found(&context, &language, &site_path);
+                        let http_response = not_found(&context, &session, &site_path);
                         return Ok(Either::Right(http_response));
                     }
                     VideoUpdate::Success { video_updated, .. } => {
diff --git a/src/editor/endpoints/video/upload_subtitles.rs b/web/src/endpoints/video/upload_subtitles.rs
similarity index 83%
rename from src/editor/endpoints/video/upload_subtitles.rs
rename to web/src/endpoints/video/upload_subtitles.rs
index ec18b13..9eaa42d 100644
--- a/src/editor/endpoints/video/upload_subtitles.rs
+++ b/web/src/endpoints/video/upload_subtitles.rs
@@ -5,37 +5,40 @@ use std::fs::File;
 use std::io::Write;
 use std::sync::Arc;
 
+use actix_session::Session as ActixSession;
 use actix_multipart::Multipart;
 use actix_web::{Either, Error, HttpResponse};
 use actix_web::web;
 use actix_web::web::{Data, Path as ActixPath, Redirect};
 use futures_util::TryStreamExt as _;
 
-use crate::{
-    Context,
+use hyper8_core::{
     SitePath,
     SubtitleFile,
     Video,
     VideoUpdate
 };
-use crate::editor::routes;
-use crate::editor::widgets::{error_page, not_found};
-use crate::infallible_mutation;
-use crate::util::{deduplicate_filename, supported_subtitles_extension};
+use hyper8_core::infallible_mutation;
+use hyper8_core::util::{deduplicate_filename, supported_subtitles_extension};
+
+use crate::{Context, Session};
+use crate::routes;
+use crate::widgets::{error_page, not_found};
 
 use super::pending_manifest_errors;
 
 pub async fn upload_subtitles(
     context: Data<Arc<Context>>,
     mut payload: Multipart,
+    session: ActixSession,
     site_path: ActixPath<SitePath>
 ) -> Result<Either<Redirect, HttpResponse>, Error> {
-    let language = context.get_editor_language();
+    let session = Session::new(&session);
 
     let video = match context.get_video(&site_path) {
         Some(video) => video,
         None => {
-            let http_response = not_found(&context, &language, &site_path);
+            let http_response = not_found(&context, &session, &site_path);
             return Ok(Either::Right(http_response));
         }
     };
@@ -74,11 +77,11 @@ pub async fn upload_subtitles(
                     match context.update_video(mutation, &site_path) {
                         VideoUpdate::Error(_) => infallible_mutation!(),
                         VideoUpdate::InvalidManifest { video } => {
-                            return Ok(Either::Right(pending_manifest_errors(&context, &language, &video)))
+                            return Ok(Either::Right(pending_manifest_errors(&context, &session, &video)))
                         }
                         // TODO: Can only happen in weird time of check vs. time of use edge cases
                         VideoUpdate::NotFound => {
-                            return Ok(Either::Right(not_found(&context, &language, &site_path)))
+                            return Ok(Either::Right(not_found(&context, &session, &site_path)))
                         }
                         VideoUpdate::Success { video_updated, .. } => {
                             let redirect_url = routes::video_subtitles(&video_updated);
@@ -86,8 +89,9 @@ pub async fn upload_subtitles(
                         }
                     }
                 } else {
-                    let message = language.translations.the_subtitle_extension_of_xxx_is_not_supported_please_upload_only_srt_or_vtt_files(filename);
-                    return Ok(Either::Right(error_page(&context, &language, &message)))
+                    let message = session.language.translations
+                        .the_subtitle_extension_of_xxx_is_not_supported_please_upload_only_srt_or_vtt_files(filename);
+                    return Ok(Either::Right(error_page(&context, &message, &session)))
                 }
             }
         }
diff --git a/web/src/field.rs b/web/src/field.rs
new file mode 100644
index 0000000..ec3f142
--- /dev/null
+++ b/web/src/field.rs
@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+pub struct Field {
+    pub error: Option<String>,
+    pub value: String
+}
+
+impl Field {
+    pub fn valid(value: impl Into<String>) -> Field {
+        Field {
+            error: None,
+            value: value.into()
+        }
+    }
+
+    pub fn validated(
+        value: impl Into<String>,
+        error: Option<impl Into<String>>
+    ) -> Field {
+        Field {
+            error: error.map(|message| message.into()),
+            value: value.into()
+        }
+    }
+}
diff --git a/web/src/lib.rs b/web/src/lib.rs
new file mode 100644
index 0000000..84a6400
--- /dev/null
+++ b/web/src/lib.rs
@@ -0,0 +1,27 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+mod actix;
+mod components;
+mod context;
+mod endpoints;
+mod field;
+mod location;
+mod routes;
+mod server;
+mod session;
+mod tree_view_order;
+mod widgets;
+
+
+use components::Checkbox;
+use components::Input;
+use components::Select;
+use components::Textarea;
+use context::Context;
+use field::Field;
+use location::{Location, Subpage};
+use session::Session;
+use tree_view_order::TreeViewOrder;
+
+pub use server::start as start_server;
diff --git a/src/editor.rs b/web/src/location.rs
similarity index 76%
rename from src/editor.rs
rename to web/src/location.rs
index fe28020..c604984 100644
--- a/src/editor.rs
+++ b/web/src/location.rs
@@ -1,24 +1,7 @@
 // SPDX-FileCopyrightText: 2024-2025 Simon Repp
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use serde_derive::{Deserialize, Serialize};
-
-use crate::{SitePath, Translations};
-
-mod actix;
-mod components;
-mod config;
-mod endpoints;
-pub mod routes;
-pub mod server;
-mod widgets;
-
-pub use config::EditorConfig;
-
-use components::Checkbox;
-use components::Input;
-use components::Select;
-use components::Textarea;
+use hyper8_core::SitePath;
 
 /// Represents the page we are currently viewing, i.e. some element in the
 /// site tree or an auxiliary page like the jobs overview.
@@ -43,14 +26,6 @@ pub enum Subpage {
     Subtitles
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-pub enum TreeViewOrder {
-    Default,
-    SiteOrder,
-    TitleAsc,
-    TitleDesc
-}
-
 impl<'a> Location<'a> {
     pub fn active_subpage(&self, site_path: &SitePath) -> Option<&Subpage> {
         match self {
@@ -136,14 +111,3 @@ impl<'a> Location<'a> {
         }
     }
 }
-
-impl TreeViewOrder {
-    pub fn key(&self, translations: &Translations) -> String {
-        match self {
-            TreeViewOrder::Default |
-            TreeViewOrder::SiteOrder => translations.site_order.to_string(),
-            TreeViewOrder::TitleAsc => format!("{} A-Z", translations.title),
-            TreeViewOrder::TitleDesc => format!("{} Z-A", translations.title)
-        }
-    }
-}
diff --git a/src/editor/routes.rs b/web/src/routes.rs
similarity index 99%
rename from src/editor/routes.rs
rename to web/src/routes.rs
index 4021c09..346e2a7 100644
--- a/src/editor/routes.rs
+++ b/web/src/routes.rs
@@ -4,7 +4,7 @@
 //! Routes in this file must be kept up to date with the mapping we keep in
 //! `server.rs`!
 
-use crate::{
+use hyper8_core::{
     Collection,
     Playlist,
     SitePath,
diff --git a/src/editor/server.rs b/web/src/server.rs
similarity index 89%
rename from src/editor/server.rs
rename to web/src/server.rs
index a7a577b..57e0c05 100644
--- a/src/editor/server.rs
+++ b/web/src/server.rs
@@ -5,13 +5,19 @@ use std::net::{IpAddr, Ipv4Addr};
 use std::sync::Arc;
 
 use actix_files::Files;
+use actix_session::SessionMiddleware;
+use actix_session::storage::CookieSessionStore;
 use actix_web::{App, HttpServer};
+use actix_web::cookie::Key;
 use actix_web::web::{Data, get, post, resource};
 
+use hyper8_core::Context as CoreContext;
+use hyper8_core::util::ensure_dir;
+
 use crate::Context;
-use crate::editor::endpoints::{
+use crate::endpoints::{
     build,
-    change_editor_config,
+    change_language_and_theme,
     change_tree_view_order,
     collection,
     convert,
@@ -40,20 +46,31 @@ const MAX_PORT_ATTEMPTS: u16 = 10;
 
 #[actix_web::main]
 pub async fn start(
-    context: Arc<Context>,
-    ip_requested: &Option<IpAddr>,
-    port_requested: &Option<u16>
+    core_context: Arc<CoreContext>,
+    ip_requested: Option<&IpAddr>,
+    port_requested: Option<&u16>,
 ) -> Result<(), ()> {
+    // We ensure (and if present beforehand, wipe) the build directory on
+    // build anyway, but as actix-files does not successfully register
+    // the /preview/ static file hosting route if the directory does not
+    // exist on startup, we create it here already.
+    ensure_dir(&core_context.build_dir);
+
     let bind_server = |data_moving: Data<Arc<Context>>, ip: IpAddr, port: u16| {
         HttpServer::new(move || {
             App::new()
+                .wrap(
+                    SessionMiddleware::builder(CookieSessionStore::default(), Key::from(&[0; 64]))
+                        .cookie_secure(false)
+                        .build()
+                )
                 .app_data(data_moving.clone())
                 .route("/", get().to(index::index))
                 .route("/build/{site_path:.*}", post().to(build))
                 .route("/convert-to-collection/{site_path:.*}", post().to(convert::to_collection))
                 .route("/convert-to-playlist/{site_path:.*}", post().to(convert::to_playlist))
                 .route("/convert-to-video/{site_path:.*}", post().to(convert::to_video))
-                .route("/change-editor-config", post().to(change_editor_config))
+                .route("/change-language-and-theme", post().to(change_language_and_theme))
                 .route("/change-tree-view-order", post().to(change_tree_view_order))
                 .route("/collection/add-link/{site_path:.*}", post().to(collection::add_link))
                 .route("/collection/banner/{site_path:.*}", get().to(collection::banner))
@@ -83,9 +100,7 @@ pub async fn start(
                 .route("/editor.css", get().to(styles))
                 .route("/editor.js", get().to(scripts))
                 .route("/favicon.png", get().to(favicon))
-                // .route("/formats", post().to(settings::formats))
                 .route("/jobs", get().to(jobs))
-                // .route("/playlist", post().to(playlist::create))
                 .route("/playlist/add-link/{site_path:.*}", post().to(playlist::add_link))
                 .route("/playlist/banner/{site_path:.*}", get().to(playlist::banner))
                 .route("/playlist/create-video/{site_path:.*}", post().to(playlist::create_video))
@@ -107,8 +122,6 @@ pub async fn start(
                 .route("/playlist/move/{site_path:.*}", post().to(playlist::r#move))
                 .route("/playlist/update-banner/{site_path:.*}", post().to(playlist::update_banner))
                 .route("/playlist/upload-banner/{site_path:.*}", post().to(playlist::upload_banner))
-                // .route("/playlist/{id}/add", post().to(playlist::add_video))
-                // .route("/playlists", get().to(index::playlists))
                 // TODO: This is strictly speaking not a site_path, but right now it's convenient
                 //       to use that abstraction, because it handles path separator normalization
                 //       across platforms. (also applies to video_stream)
@@ -163,7 +176,6 @@ pub async fn start(
                 .route("/video/poster/{site_path:.*}", get().to(video::edit_poster))
                 .route("/video/stream/{site_path:.*}", get().to(video::stream))
                 .route("/video/subtitles/{site_path:.*}", get().to(video::subtitles))
-                // .route("/videos", get().to(index::videos))
                 .route("/video/update-poster/{site_path:.*}", post().to(video::update_poster))
                 .route("/video/upload-poster/{site_path:.*}", post().to(video::upload_poster))
                 .route("/video/upload-subtitles/{site_path:.*}", post().to(video::upload_subtitles))
@@ -172,12 +184,16 @@ pub async fn start(
         .bind((ip, port))
     };
 
+    let context = Context::new(core_context);
+
+    let context = Arc::new(context);
+
     let data = Data::new(context);
 
-    let ip = ip_requested.unwrap_or(DEFAULT_EDITOR_IP);
+    let ip = ip_requested.unwrap_or(&DEFAULT_EDITOR_IP);
 
     let (server, port_bound) = if let Some(port) = port_requested {
-        match bind_server(data, ip, *port) {
+        match bind_server(data, *ip, *port) {
             Ok(server) => (server, *port),
             Err(err) => {
                 eprintln!("Could not bind editor server to {ip}:{port} ({err})");
@@ -188,7 +204,7 @@ pub async fn start(
         let mut port = DEFAULT_EDITOR_PORT;
 
         loop {
-            match bind_server(data.clone(), ip, port) {
+            match bind_server(data.clone(), *ip, port) {
                 Ok(server) => break (server, port),
                 Err(err) => {
                     if port > DEFAULT_EDITOR_PORT + MAX_PORT_ATTEMPTS {
diff --git a/web/src/session.rs b/web/src/session.rs
new file mode 100644
index 0000000..01070c0
--- /dev/null
+++ b/web/src/session.rs
@@ -0,0 +1,53 @@
+// SPDX-FileCopyrightText: 2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use actix_session::Session as ActixSession;
+
+use hyper8_core::{Language, Theme};
+
+use crate::TreeViewOrder;
+
+pub struct Session {
+    pub language: Language,
+    pub theme: Theme,
+    pub tree_view_order: TreeViewOrder
+}
+
+impl Session {
+    pub fn language(actix_session: &ActixSession) -> Language {
+        match actix_session.get::<String>("language_code") {
+            Ok(Some(code)) => Language::from_code(&code),
+            _ => Language::default()
+        }
+    }
+
+    pub fn new(actix_session: &ActixSession) -> Session {
+        let language = Session::language(actix_session);
+        let theme = Session::theme(actix_session);
+        let tree_view_order = Session::tree_view_order(actix_session);
+
+        Session {
+            language,
+            theme,
+            tree_view_order
+        }
+    }
+
+    pub fn theme(actix_session: &ActixSession) -> Theme {
+        match actix_session.get::<String>("theme_key") {
+            Ok(Some(key)) => {
+                Theme::from_key(&key).unwrap_or(Theme::default())
+            }
+            _ => Theme::default()
+        }
+    }
+
+    pub fn tree_view_order(actix_session: &ActixSession) -> TreeViewOrder {
+        match actix_session.get::<String>("tree_view_order_key") {
+            Ok(Some(key)) => {
+                TreeViewOrder::from_key(&key).unwrap_or(TreeViewOrder::Default)
+            }
+            _ => TreeViewOrder::Default
+        }
+    }
+}
diff --git a/web/src/tree_view_order.rs b/web/src/tree_view_order.rs
new file mode 100644
index 0000000..27cfd8b
--- /dev/null
+++ b/web/src/tree_view_order.rs
@@ -0,0 +1,112 @@
+// SPDX-FileCopyrightText: 2024-2025 Simon Repp
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::sync::Arc;
+
+use hyper8_core::{
+    Asc,
+    Collection,
+    Comparison,
+    Container,
+    Desc,
+    Language,
+    Video,
+    VideoOrder
+};
+use hyper8_translations::Translations;
+
+#[derive(Clone, Copy, Debug)]
+pub enum TreeViewOrder {
+    Default,
+    SiteOrder,
+    TitleAsc,
+    TitleDesc
+}
+
+impl TreeViewOrder {
+    pub fn cycle(&self) -> TreeViewOrder {
+        match self {
+            TreeViewOrder::Default |
+            TreeViewOrder::SiteOrder => TreeViewOrder::TitleAsc,
+            TreeViewOrder::TitleAsc => TreeViewOrder::TitleDesc,
+            TreeViewOrder::TitleDesc => TreeViewOrder::SiteOrder,
+        }
+    }
+
+    pub fn from_key(key: &str) -> Option<TreeViewOrder> {
+        match key {
+            "site_order" => Some(TreeViewOrder::SiteOrder),
+            "title_asc" => Some(TreeViewOrder::TitleAsc),
+            "title_desc" => Some(TreeViewOrder::TitleDesc),
+            _ => None
+        }
+    }
+
+    pub fn key(&self) -> &'static str {
+        match self {
+            TreeViewOrder::Default |
+            TreeViewOrder::SiteOrder => "site_order",
+            TreeViewOrder::TitleAsc => "title_asc",
+            TreeViewOrder::TitleDesc => "title_desc"
+        }
+    }
+
+    pub fn label(&self, translations: &Translations) -> String {
+        match self {
+            TreeViewOrder::Default |
+            TreeViewOrder::SiteOrder => translations.site_order.to_string(),
+            TreeViewOrder::TitleAsc => format!("{} A-Z", translations.title),
+            TreeViewOrder::TitleDesc => format!("{} Z-A", translations.title)
+        }
+    }
+
+    pub fn ordered_containers(
+        &self,
+        collection: &Collection,
+        language: &Language
+    ) -> Vec<Container> {
+        let mut containers = Vec::new();
+
+        for playlist in &collection.playlists {
+            containers.push(Container::Playlist(playlist.clone()));
+        }
+
+        for subcollection in &collection.subcollections {
+            containers.push(Container::Collection(subcollection.clone()));
+        }
+
+        let (comparison, direction) = match self {
+            TreeViewOrder::Default |
+            TreeViewOrder::SiteOrder =>
+                Container::container_order_comparison_and_direction(&collection.container_order),
+            TreeViewOrder::TitleAsc =>
+                (Container::cmp_slug_then_title as Comparison<Container>, Asc),
+            TreeViewOrder::TitleDesc =>
+                (Container::cmp_slug_then_title as Comparison<Container>, Desc)
+        };
+
+        containers.sort_unstable_by(|a, b| comparison(a, b, &language.icu_collator, direction));
+
+        containers
+    }
+
+    pub fn ordered_videos(
+        &self,
+        language: &Language,
+        video_order: &VideoOrder,
+        videos: &[Arc<Video>]
+    ) -> Vec<Arc<Video>> {
+        let mut videos: Vec<Arc<Video>> = videos.to_vec();
+
+        let (comparison, direction) = match self {
+            TreeViewOrder::Default |
+            TreeViewOrder::SiteOrder => Video::video_order_comparison_and_direction(video_order),
+            TreeViewOrder::TitleAsc => (Video::cmp_slug_then_title as Comparison<Video>, Asc),
+            TreeViewOrder::TitleDesc => (Video::cmp_slug_then_title as Comparison<Video>, Desc)
+        };
+
+        videos.sort_unstable_by(|a, b| comparison(a, b, &language.icu_collator, direction));
+
+        videos
+    }
+}
diff --git a/src/editor/widgets.rs b/web/src/widgets.rs
similarity index 82%
rename from src/editor/widgets.rs
rename to web/src/widgets.rs
index 447975f..7dd63b7 100644
--- a/src/editor/widgets.rs
+++ b/web/src/widgets.rs
@@ -7,17 +7,12 @@ use actix_web::HttpResponse;
 use actix_web::http::header::ContentType;
 use indoc::formatdoc;
 
-use crate::{
-    Context,
-    Language,
-    Site,
-    SitePath,
-    Translations
-};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::icons;
-use crate::util::string_from_pathbuf;
+use hyper8_core::{Site,SitePath};
+use hyper8_core::util::string_from_pathbuf;
+use hyper8_translations::Translations;
+
+use crate::{Context, Location, Session};
+use crate::routes;
 
 mod layout;
 mod links;
@@ -31,10 +26,10 @@ use tree_view::tree_view;
 
 pub fn error_page(
     context: &Context,
-    language: &Language,
-    message: &str
+    message: &str,
+    session: &Session
 ) -> HttpResponse {
-    let t_back = language.translations.back;
+    let t_back = session.language.translations.back;
 
     let dashboard_url = routes::DASHBOARD;
     let body = formatdoc!(r#"
@@ -47,12 +42,12 @@ pub fn error_page(
 
     let site = &context.get_site();
 
-    let t_error = language.translations.error;
+    let t_error = session.language.translations.error;
     let html = layout(
         &body,
         context,
-        language,
         Location::AuxiliaryPage,
+        session,
         site,
         t_error
     );
@@ -64,11 +59,13 @@ pub fn error_page(
 
 pub fn not_found(
     context: &Context,
-    language: &Language,
+    session: &Session,
     site_path: &SitePath
 ) -> HttpResponse {
-    let t_back = language.translations.back;
-    let t_message = language.translations.the_resource_xxx_was_not_found_message(site_path.normalized());
+    let translations = &session.language.translations;
+
+    let t_back = translations.back;
+    let t_message = translations.the_resource_xxx_was_not_found_message(site_path.normalized());
 
     let dashboard_url = routes::DASHBOARD;
     let body = formatdoc!(r#"
@@ -81,12 +78,12 @@ pub fn not_found(
 
     let site = &context.get_site();
 
-    let t_resource_not_found = language.translations.resource_not_found;
+    let t_resource_not_found = translations.resource_not_found;
     let html = layout(
         &body,
         context,
-        language,
         Location::AuxiliaryPage,
+        session,
         site,
         t_resource_not_found
     );
@@ -104,7 +101,7 @@ pub fn resource_actions(
     translations: &Translations
 ) -> String {
     let local_path = string_from_pathbuf(context.site_dir.join(site_path.filesystem_relative()));
-    let disk_icon = icons::disk(translations.local_path);
+    let disk_icon = hyper8_icons::disk(translations.local_path);
     let local_path_displayed = if site_path.is_root_path() {
         format!("<span>{disk_icon} <span>{local_path}</span></span>")
     } else {
@@ -115,7 +112,7 @@ pub fn resource_actions(
         format!(r#"<span>{disk_icon} <span>{prefix}{MAIN_SEPARATOR}<span class="path_extension">{slug}</span>{MAIN_SEPARATOR}</span></span>"#)
     };
 
-    let copy_icon = icons::COPY;
+    let copy_icon = hyper8_icons::COPY;
 
     let copy_live_url;
     let live_url_displayed;
@@ -124,7 +121,7 @@ pub fn resource_actions(
             let t_offline = translations.offline;
             let offline_label = if offline { format!(" ({t_offline})") } else { String::new() };
 
-            let link_icon = icons::link(Some(translations.external_link));
+            let link_icon = hyper8_icons::link(Some(translations.external_link));
             let live_url = base_url.join_index(site, site_path);
             if site_path.is_root_path() {
                 live_url_displayed = format!(r#"<a href="{live_url}" target="_blank">{link_icon} {live_url}{offline_label}</a>"#);
@@ -158,9 +155,9 @@ pub fn resource_actions(
 
     let t_copy_path = translations.copy_path;
     let t_preview = translations.preview;
-    let failure_icon = icons::failure(translations.failed);
-    let success_icon = icons::success(translations.copied);
-    let preview_icon = icons::preview(t_preview);
+    let failure_icon = hyper8_icons::failure(translations.failed);
+    let success_icon = hyper8_icons::success(translations.copied);
+    let preview_icon = hyper8_icons::preview(t_preview);
     formatdoc!(r#"
         {live_url_displayed}
         {local_path_displayed}
diff --git a/src/editor/widgets/layout.rs b/web/src/widgets/layout.rs
similarity index 89%
rename from src/editor/widgets/layout.rs
rename to web/src/widgets/layout.rs
index 610cc3b..494bf1b 100644
--- a/src/editor/widgets/layout.rs
+++ b/web/src/widgets/layout.rs
@@ -4,20 +4,17 @@
 
 use indoc::formatdoc;
 
-use crate::{
-    Context,
-    Language,
-    Site,
-    Translations
-};
-use crate::editor::Location;
-use crate::editor::routes;
-use crate::icons;
-use crate::util::{
+use hyper8_core::Site;
+use hyper8_core::util::{
     html_escape_outside_attribute,
     human_size,
     precise_duration
 };
+use hyper8_translations::Translations;
+use hyper8_version::VERSION_WITH_PATCH;
+
+use crate::{Context, Location, Session};
+use crate::routes;
 
 use super::{splash_screen, tree_view};
 
@@ -27,8 +24,8 @@ fn controls(
     translations: &Translations
 ) -> String {
     let t_configure_deployment = translations.configure_deployment;
-    let configure_icon = icons::configure(Some(translations.configure));
-    let deployment_icon = icons::deployment(translations.deployment);
+    let configure_icon = hyper8_icons::configure(Some(translations.configure));
+    let deployment_icon = hyper8_icons::deployment(translations.deployment);
     let deployment_button = match site.complete_deployment_config() {
         true => {
             let deployment = &context.deploying.lock().unwrap();
@@ -73,7 +70,7 @@ fn controls(
     let deployment = format!(r#"<div id="deployment">{deployment_button}</div>"#);
 
     let t_processing = translations.processing;
-    let processing_icon = icons::processing(t_processing);
+    let processing_icon = hyper8_icons::processing(t_processing);
     let processing = {
         let job_queue = &context.job_queue.lock().unwrap();
 
@@ -144,18 +141,18 @@ fn controls(
     };
 
     let t_preview = translations.preview;
-    let preview_icon = icons::preview(t_preview);
+    let preview_icon = hyper8_icons::preview(t_preview);
     let preview = formatdoc!(r#"
         <form action="/build/" method="post" target="_blank">
             <button>{preview_icon} {t_preview}</button>
         </form>
     "#);
 
-    let storage_icon = icons::storage(Some(translations.storage_usage));
+    let storage_icon = hyper8_icons::storage(Some(translations.storage_usage));
     let storage_usage = human_size(site.storage_usage());
     let storage = format!(r#"<a href="/">{storage_icon} {storage_usage}</a>"#);
 
-    let logo_polychrome_icon = icons::logo_polychrome(Some("Hyper 8"));
+    let logo_polychrome_icon = hyper8_icons::logo_polychrome(Some("Hyper 8"));
     let t_about = translations.about;
     let about = format!(r#"<button id="toggle-splash">{logo_polychrome_icon} {t_about}</button>"#);
 
@@ -182,18 +179,17 @@ fn controls(
 pub fn layout(
     body: &str,
     context: &Context,
-    language: &Language,
     location: Location,
+    session: &Session,
     site: &Site,
     title: &str
 ) -> String {
-    let translations = &language.translations;
+    let translations = &session.language.translations;
     let (breadcrumbs, tree) = tree_view(
-        context,
         location,
+        session,
         site,
-        &context.site_dir,
-        translations
+        &context.site_dir
     );
 
     // TODO: Hash scripts/styles
@@ -209,11 +205,12 @@ pub fn layout(
         </head>
     "#);
 
-    let splash_screen_rendered = splash_screen(language, context.get_editor_theme());
+
+    let splash_screen_rendered = splash_screen(session);
 
     let r_controls = controls(context, site, translations);
 
-    let tree_view_order_label = context.get_editor_tree_view_order().key(translations);
+    let tree_view_order_label = session.tree_view_order.label(translations);
 
     // This is used at runtime in client-side js to display the url in a message
     let data_base_url = match &site.base_url {
@@ -224,11 +221,10 @@ pub fn layout(
     // subsequently used at runtime to determine whether we need to display
     // the splash screen (again), if it hasn't yet been displayed for the
     // given version.
-    let version_detailed = env!("HYPER8_VERSION_DETAILED");
     let t_cancel = translations.cancel;
     let t_filter = translations.filter;
     let body = formatdoc!(r#"
-        <body {data_base_url} data-version="{version_detailed}">
+        <body {data_base_url} data-version="{VERSION_WITH_PATCH}">
             <div class="split">
                 <nav>
                     <div class="tree_view_options">
diff --git a/src/editor/widgets/links.rs b/web/src/widgets/links.rs
similarity index 94%
rename from src/editor/widgets/links.rs
rename to web/src/widgets/links.rs
index 5e9d330..7962424 100644
--- a/src/editor/widgets/links.rs
+++ b/web/src/widgets/links.rs
@@ -3,10 +3,11 @@
 
 use indoc::formatdoc;
 
-use crate::{Link, Translations};
-use crate::editor::{Input, Select};
-use crate::icons;
-use crate::util::{html_escape_inside_attribute, html_escape_outside_attribute};
+use hyper8_core::Link;
+use hyper8_core::util::{html_escape_inside_attribute, html_escape_outside_attribute};
+use hyper8_translations::Translations;
+
+use crate::{Input, Select};
 
 /// Generic add link form, submit_url should be something like "/playlist/add-link/[site-path]"
 pub fn add_link_form(submit_url: &str, translations: &Translations) -> String {
@@ -54,7 +55,7 @@ pub fn links(links: &[Link], submit_url: &str, translations: &Translations) -> S
     let t_delete = translations.delete;
     let t_hidden = translations.hidden;
     let t_really_delete = translations.really_delete;
-    let delete_icon = icons::failure(t_delete);
+    let delete_icon = hyper8_icons::failure(t_delete);
     let links_rendered = links
         .iter()
         .map(|link| {
@@ -109,4 +110,4 @@ pub fn links(links: &[Link], submit_url: &str, translations: &Translations) -> S
             {links_rendered}
         </div>
     "#)
-}
\ No newline at end of file
+}
diff --git a/src/editor/widgets/splash_screen.rs b/web/src/widgets/splash_screen.rs
similarity index 83%
rename from src/editor/widgets/splash_screen.rs
rename to web/src/widgets/splash_screen.rs
index 8110219..be32f46 100644
--- a/src/editor/widgets/splash_screen.rs
+++ b/web/src/widgets/splash_screen.rs
@@ -3,28 +3,28 @@
 
 use indoc::formatdoc;
 
-use crate::{Language, Theme};
-use crate::editor::Select;
-use crate::icons;
+use hyper8_core::Theme;
+use hyper8_version::VERSION_ADAPTIVE_PATCH;
 
-pub fn splash_screen(language: &Language, theme: Theme) -> String {
-    let translations = &language.translations;
+use crate::{Select, Session};
+
+pub fn splash_screen(session: &Session) -> String {
+    let translations = &session.language.translations;
 
     let mut select_language = Select::new("language_code", translations.language);
     for (code, label) in [("de", "Deutsch"), ("en", "English")] {
         select_language.option(code, label);
     }
-    select_language.selected(&language.code);
+    select_language.selected(&session.language.code);
 
     let mut select_theme = Select::new("theme_key", translations.theme);
 
     for (key, label) in Theme::variants(translations) {
         select_theme.option(key, label);
     }
-    select_theme.selected(theme.key);
+    select_theme.selected(session.theme.key);
 
-    let link_icon = icons::link(Some(translations.external_link));
-    let version_adaptive = env!("HYPER8_VERSION_ADAPTIVE");
+    let link_icon = hyper8_icons::link(Some(translations.external_link));
     let t_documentation = translations.documentation;
     let t_close = translations.close;
     let t_report_a_bug = translations.report_a_bug;
@@ -34,14 +34,14 @@ pub fn splash_screen(language: &Language, theme: Theme) -> String {
         <dialog class="splash_wrapper">
             <div class="splash">
                 <div class="image_wrapper">
-                    <img alt="Hyper 8 Video System" src="/splash_logo.svg?{version_adaptive}">
+                    <img alt="Hyper 8 Video System" src="/splash_logo.svg?{VERSION_ADAPTIVE_PATCH}">
                     <a class="version" href="https://codeberg.org/simonrepp/hyper8/src/branch/main/CHANGELOG.md" target="_blank">
                         {link_icon}
-                        <span>{t_version} {version_adaptive}</span>
+                        <span>{t_version} {VERSION_ADAPTIVE_PATCH}</span>
                     </a>
                 </div>
                 <div class="pad">
-                    <form action="/change-editor-config" method="post">
+                    <form action="/change-language-and-theme" method="post">
                         <input name="redirect" type="hidden">
                         <div class="form_split even">
                             {select_language}
diff --git a/src/editor/widgets/tree_view.rs b/web/src/widgets/tree_view.rs
similarity index 91%
rename from src/editor/widgets/tree_view.rs
rename to web/src/widgets/tree_view.rs
index f84a121..b8a0686 100644
--- a/src/editor/widgets/tree_view.rs
+++ b/web/src/widgets/tree_view.rs
@@ -5,22 +5,25 @@ use std::path::Path;
 
 use indoc::formatdoc;
 
-use crate::{
+use hyper8_core::{
     Collection,
     Container,
-    Context,
     Playlist,
     Site,
     SiteContent,
     SitePath,
-    Translations,
-    TreeViewOrder,
     Video
 };
-use crate::editor::{Location, Subpage};
-use crate::editor::routes;
-use crate::icons;
-use crate::util::html_escape_outside_attribute;
+use hyper8_core::util::html_escape_outside_attribute;
+use hyper8_translations::Translations;
+
+use crate::{
+    Location,
+    Session,
+    Subpage,
+    TreeViewOrder
+};
+use crate::routes;
 
 struct Visibility {
     offline_inherited: bool,
@@ -29,7 +32,6 @@ struct Visibility {
     unlisted_local: bool
 }
 
-
 impl Visibility {
     pub fn from_collection(collection: &Collection) -> Visibility {
         Visibility {
@@ -116,7 +118,7 @@ fn collection_node(
         breadcrumbs.push(format!(r#"<a href="{exposed_edit_url}">{e_breadcrumb_title}</a>"#));
     }
 
-    let collection_icon = icons::collection(translations.collection);
+    let collection_icon = hyper8_icons::collection(translations.collection);
     let collection_visibility = Visibility::from_collection(collection);
 
     let node = tree_node(
@@ -129,7 +131,7 @@ fn collection_node(
         &collection_visibility
     );
 
-    let containers = collection.containers_in_tree_view_order(&site.language, tree_view_order)
+    let containers = tree_view_order.ordered_containers(&collection, &site.language)
         .iter()
         .map(|container| {
             match container {
@@ -164,7 +166,7 @@ fn collection_node(
         .collect::<Vec<String>>()
         .join("");
 
-    let videos = collection.videos_in_tree_view_order(&site.language, tree_view_order)
+    let videos = tree_view_order.ordered_videos(&site.language, &collection.video_order, &collection.videos)
         .iter()
         .map(|video| {
             let node = video_node(
@@ -190,7 +192,7 @@ fn collection_node(
 
         if collection.manifest_errors.is_empty() {
             let collection_settings_active = if *subpage == Subpage::Edit { "active" } else { "" };
-            let collection_settings_icon = icons::EDIT;
+            let collection_settings_icon = hyper8_icons::EDIT;
             let t_collection_settings = translations.collection_settings;
             let collection_settings = formatdoc!(r#"
                 <a class="{collection_settings_active} subpage" href="{collection_settings_url}" style="padding-left: {padding_left};">
@@ -201,7 +203,7 @@ fn collection_node(
         }
 
         if collection.site_path.is_root_path() && site.manifest_errors.is_empty() {
-            let logo_monochrome = icons::logo_monochrome(None);
+            let logo_monochrome = hyper8_icons::logo_monochrome(None);
             let t_site_settings = translations.site_settings;
             let site_settings_url = routes::SITE_EDIT;
             let site_settings_active = if *subpage == Subpage::SiteSettings { "active" } else { "" };
@@ -218,7 +220,7 @@ fn collection_node(
         if collection.manifest_errors.is_empty() {
             let links_active = if *subpage == Subpage::Links { "active" } else { "" };
             let links_count = collection.links.len();
-            let link_icon = icons::link(None);
+            let link_icon = hyper8_icons::link(None);
             let links_url = routes::collection_links(collection);
             let t_links = translations.links;
             let links = formatdoc!(r#"
@@ -229,7 +231,7 @@ fn collection_node(
             subpages.push(links);
 
             let banner_active = if *subpage == Subpage::Poster { "active" } else { "" };
-            let banner_icon = icons::EMBED; // TODO: Custom banner/image icon
+            let banner_icon = hyper8_icons::EMBED; // TODO: Custom banner/image icon
             let banner_url = routes::collection_banner(collection);
             let t_banner_image = translations.banner_image;
             let banner_image = formatdoc!(r#"
@@ -239,7 +241,7 @@ fn collection_node(
             "#);
             subpages.push(banner_image);
 
-            let danger_icon = icons::DANGER;
+            let danger_icon = hyper8_icons::DANGER;
             let dangerous_actions_active = if *subpage == Subpage::DangerousActions { "active" } else { "" };
             let dangerous_actions_url = routes::collection_dangerous_actions(collection);
             let t_dangerous_actions = translations.dangerous_actions;
@@ -253,9 +255,9 @@ fn collection_node(
 
         let collection_manifest_active = if *subpage == Subpage::Manifest { "active" } else { "" };
         let collection_manifest_icon = if collection.manifest_errors.is_empty() {
-            String::from(icons::CODE)
+            String::from(hyper8_icons::CODE)
         } else {
-            icon_with_error(icons::CODE)
+            icon_with_error(hyper8_icons::CODE)
         };
         let t_collection_manifest = translations.collection_manifest;
         let collection_manifest = formatdoc!(r#"
@@ -268,9 +270,9 @@ fn collection_node(
         if collection.site_path.is_root_path() {
             let site_manifest_active = if *subpage == Subpage::SiteManifest { "active" } else { "" };
             let site_manifest_icon = if site.manifest_errors.is_empty() {
-                String::from(icons::CODE)
+                String::from(hyper8_icons::CODE)
             } else {
-                icon_with_error(icons::CODE)
+                icon_with_error(hyper8_icons::CODE)
             };
             let t_site_manifest = translations.site_manifest;
 
@@ -347,7 +349,7 @@ fn playlist_node(
         breadcrumbs.push(format!(r#"<a href="{exposed_edit_url}">{e_breadcrumb_title}</a>"#));
     }
 
-    let playlist_icon = icons::playlist(Some(translations.playlist));
+    let playlist_icon = hyper8_icons::playlist(Some(translations.playlist));
     let playlist_visibility = Visibility::from_playlist(playlist);
 
     let node = tree_node(
@@ -369,7 +371,7 @@ fn playlist_node(
 
         if playlist.manifest_errors.is_empty() {
             let playlist_settings_active = if *subpage == Subpage::Edit { "active" } else { "" };
-            let playlist_settings_icon = icons::EDIT;
+            let playlist_settings_icon = hyper8_icons::EDIT;
             let t_playlist_settings = translations.playlist_settings;
             let playlist_settings = formatdoc!(r#"
                 <a class="{playlist_settings_active} subpage" href="{playlist_settings_url}" style="padding-left: {padding_left};">
@@ -380,7 +382,7 @@ fn playlist_node(
         }
 
         if playlist.site_path.is_root_path() && site.manifest_errors.is_empty() {
-            let logo_monochrome = icons::logo_monochrome(None);
+            let logo_monochrome = hyper8_icons::logo_monochrome(None);
             let t_site_settings = translations.site_settings;
             let site_settings_url = routes::SITE_EDIT;
             let site_settings_active = if *subpage == Subpage::SiteSettings { "active" } else { "" };
@@ -397,7 +399,7 @@ fn playlist_node(
         if playlist.manifest_errors.is_empty() {
             let links_active = if *subpage == Subpage::Links { "active" } else { "" };
             let links_count = playlist.links.len();
-            let link_icon = icons::link(None);
+            let link_icon = hyper8_icons::link(None);
             let links_url = routes::playlist_links(playlist);
             let t_links = translations.links;
             let links = formatdoc!(r#"
@@ -408,7 +410,7 @@ fn playlist_node(
             subpages.push(links);
 
             let banner_active = if *subpage == Subpage::Poster { "active" } else { "" };
-            let banner_icon = icons::EMBED; // TODO: Custom banner/image icon
+            let banner_icon = hyper8_icons::EMBED; // TODO: Custom banner/image icon
             let banner_url = routes::playlist_banner(playlist);
             let t_banner_image = translations.banner_image;
             let banner_image = formatdoc!(r#"
@@ -418,7 +420,7 @@ fn playlist_node(
             "#);
             subpages.push(banner_image);
 
-            let danger_icon = icons::DANGER;
+            let danger_icon = hyper8_icons::DANGER;
             let dangerous_actions_active = if *subpage == Subpage::DangerousActions { "active" } else { "" };
             let dangerous_actions_url = routes::playlist_dangerous_actions(playlist);
             let t_dangerous_actions = translations.dangerous_actions;
@@ -432,9 +434,9 @@ fn playlist_node(
 
         let playlist_manifest_active = if *subpage == Subpage::Manifest { "active" } else { "" };
         let playlist_manifest_icon = if playlist.manifest_errors.is_empty() {
-            String::from(icons::CODE)
+            String::from(hyper8_icons::CODE)
         } else {
-            icon_with_error(icons::CODE)
+            icon_with_error(hyper8_icons::CODE)
         };
         let t_playlist_manifest = translations.playlist_manifest;
         let playlist_manifest = formatdoc!(r#"
@@ -447,9 +449,9 @@ fn playlist_node(
         if playlist.site_path.is_root_path() {
             let site_manifest_active = if *subpage == Subpage::SiteManifest { "active" } else { "" };
             let site_manifest_icon = if site.manifest_errors.is_empty() {
-                String::from(icons::CODE)
+                String::from(hyper8_icons::CODE)
             } else {
-                icon_with_error(icons::CODE)
+                icon_with_error(hyper8_icons::CODE)
             };
             let t_site_manifest = translations.site_manifest;
 
@@ -479,7 +481,7 @@ fn playlist_node(
     if playlist.videos.is_empty() {
         node_with_subpages
     } else {
-        let li_items = playlist.videos_in_tree_view_order(&site.language, tree_view_order)
+        let li_items = tree_view_order.ordered_videos(&site.language, &playlist.order, &playlist.videos)
             .iter()
             .map(|video| {
                 let node = video_node(
@@ -504,12 +506,14 @@ fn playlist_node(
 }
 
 pub fn tree_view(
-    context: &Context,
     location: Location,
+    session: &Session,
     site: &Site,
-    site_dir: &Path,
-    translations: &Translations
+    site_dir: &Path
 ) -> (String, String) {
+    let tree_view_order = session.tree_view_order;
+    let translations = &session.language.translations;
+
     let mut breadcrumbs = Vec::new();
 
     let root_dir = site_dir.file_name().unwrap().to_string_lossy();
@@ -517,7 +521,6 @@ pub fn tree_view(
 
     let site_content = match &site.content {
         SiteContent::Collection(collection) => {
-            let tree_view_order = context.get_editor_tree_view_order();
             collection_node(
                 &mut breadcrumbs,
                 collection,
@@ -532,7 +535,7 @@ pub fn tree_view(
             let dashboard_url = routes::DASHBOARD;
 
             let t_empty_site = translations.empty_site;
-            let collection_icon = icons::disk(t_empty_site);
+            let collection_icon = hyper8_icons::disk(t_empty_site);
 
             let active = location.active_subpage(&SitePath::root_path()).is_some();
 
@@ -554,7 +557,7 @@ pub fn tree_view(
             let dashboard_url = routes::DASHBOARD;
 
             let t_invalid_site = translations.invalid_site;
-            let collection_icon = icons::configure(Some(t_invalid_site));
+            let collection_icon = hyper8_icons::configure(Some(t_invalid_site));
 
             let active = location.active_subpage(&SitePath::root_path()).is_some();
 
@@ -573,7 +576,6 @@ pub fn tree_view(
             )
         }
         SiteContent::Playlist(playlist) => {
-            let tree_view_order = context.get_editor_tree_view_order();
             playlist_node(
                 &mut breadcrumbs,
                 &location,
@@ -636,14 +638,14 @@ fn tree_node(
 
     if visibility.offline() {
         let inherited = if visibility.offline_inherited_only() { "inherited" } else { "" };
-        let offline_icon = icons::offline(translations.offline);
+        let offline_icon = hyper8_icons::offline(translations.offline);
         let badge = format!(r#"<span class="visibility {inherited}">{offline_icon}</span>"#);
         badges.push(badge);
     }
 
     if visibility.unlisted() {
         let inherited = if visibility.unlisted_inherited_only() { "inherited" } else { "" };
-        let unlisted_icon = icons::unlisted(translations.unlisted);
+        let unlisted_icon = hyper8_icons::unlisted(translations.unlisted);
         let badge = format!(r#"<span class="visibility {inherited}">{unlisted_icon}</span>"#);
         badges.push(badge);
     }
@@ -702,7 +704,7 @@ fn video_node(
         breadcrumbs.push(format!(r#"<a href="{exposed_edit_url}">{e_breadcrumb_title}</a>"#));
     }
 
-    let video_icon = icons::video(translations.video);
+    let video_icon = hyper8_icons::video(translations.video);
     let visibility = Visibility::from_video(video);
 
     let node = tree_node(
@@ -724,7 +726,7 @@ fn video_node(
 
         if video.manifest_errors.is_empty() {
             let video_settings_active = if *subpage == Subpage::Edit { "active" } else { "" };
-            let video_settings_icon = icons::EDIT;
+            let video_settings_icon = hyper8_icons::EDIT;
             let t_video_settings = translations.video_settings;
             let video_settings = formatdoc!(r#"
                 <a class="{video_settings_active} subpage" href="{video_settings_url}" style="padding-left: {padding_left};">
@@ -735,7 +737,7 @@ fn video_node(
         }
 
         if video.site_path.is_root_path() && site.manifest_errors.is_empty() {
-            let logo_monochrome = icons::logo_monochrome(None);
+            let logo_monochrome = hyper8_icons::logo_monochrome(None);
             let t_site_settings = translations.site_settings;
             let site_settings_url = routes::SITE_EDIT;
             let site_settings_active = if *subpage == Subpage::SiteSettings { "active" } else { "" };
@@ -752,7 +754,7 @@ fn video_node(
         if video.manifest_errors.is_empty() {
             let media_active = if *subpage == Subpage::Media { "active" } else { "" };
             let media_url = routes::video_media(video);
-            let storage_icon = icons::storage(None);
+            let storage_icon = hyper8_icons::storage(None);
             let video_audio_files_count = video.video_files.len() + video.audio_files.len();
             let t_video_audio_files = translations.video_audio_files;
             let video_audio_files = formatdoc!(r#"
@@ -764,7 +766,7 @@ fn video_node(
 
             let subtitles_active = if *subpage == Subpage::Subtitles { "active" } else { "" };
             let subtitles_count = video.subtitles.len();
-            let subtitles_icon = icons::subtitles(None);
+            let subtitles_icon = hyper8_icons::subtitles(None);
             let subtitles_url = routes::video_subtitles(video);
              let t_subtitles = translations.subtitles;
             let subtitles = formatdoc!(r#"
@@ -776,7 +778,7 @@ fn video_node(
 
             let links_active = if *subpage == Subpage::Links { "active" } else { "" };
             let links_count = video.links.len();
-            let link_icon = icons::link(None);
+            let link_icon = hyper8_icons::link(None);
             let links_url = routes::video_links(video);
             let t_links = translations.links;
             let links = formatdoc!(r#"
@@ -788,7 +790,7 @@ fn video_node(
 
             // TODO: Indicate missing image description for poster image on the subpage link itself
             let poster_active = if *subpage == Subpage::Poster { "active" } else { "" };
-            let poster_icon = icons::EMBED; // TODO: Custom poster icon
+            let poster_icon = hyper8_icons::EMBED; // TODO: Custom poster icon
             let poster_url = routes::video_poster(video);
             let t_poster_image = translations.poster_image;
             let poster_image = formatdoc!(r#"
@@ -798,7 +800,7 @@ fn video_node(
             "#);
             subpages.push(poster_image);
 
-            let danger_icon = icons::DANGER;
+            let danger_icon = hyper8_icons::DANGER;
             let dangerous_actions_active = if *subpage == Subpage::DangerousActions { "active" } else { "" };
             let dangerous_actions_url = routes::video_dangerous_actions(video);
             let t_dangerous_actions = translations.dangerous_actions;
@@ -812,9 +814,9 @@ fn video_node(
 
         let video_manifest_active = if *subpage == Subpage::Manifest { "active" } else { "" };
         let video_manifest_icon = if video.manifest_errors.is_empty() {
-            String::from(icons::CODE)
+            String::from(hyper8_icons::CODE)
         } else {
-            icon_with_error(icons::CODE)
+            icon_with_error(hyper8_icons::CODE)
         };
         let t_video_manifest = translations.video_manifest;
         let video_manifest = formatdoc!(r#"
@@ -827,9 +829,9 @@ fn video_node(
         if video.site_path.is_root_path() {
             let site_manifest_active = if *subpage == Subpage::SiteManifest { "active" } else { "" };
             let site_manifest_icon = if site.manifest_errors.is_empty() {
-                String::from(icons::CODE)
+                String::from(hyper8_icons::CODE)
             } else {
-                icon_with_error(icons::CODE)
+                icon_with_error(hyper8_icons::CODE)
             };
             let t_site_manifest = translations.site_manifest;