diff --git a/public/about.php b/public/about.php
index 60f3123..616e41b 100644
--- a/public/about.php
+++ b/public/about.php
@@ -55,7 +55,7 @@
 	};
 
 ?>
-<style><?= VV::css("public/assets/css/pages/about") ?></style>
+<?= VV::css("public/assets/css/pages/about") ?>
 <section class="intro">
 	<h2 aria-hidden="true">Hi, I'm</h2>
 	<h1>Victor Westerlund</h1>
@@ -143,4 +143,4 @@
 	<p>RFC&nbsp;3339</p>
 	<p>digital archiving</p>
 </div>
-<script><?= VV::js("public/assets/js/pages/about") ?></script>
+<?= VV::js("public/assets/js/pages/about") ?>
diff --git a/public/contact.php b/public/contact.php
index b6a1c42..4161af0 100644
--- a/public/contact.php
+++ b/public/contact.php
@@ -37,7 +37,7 @@
 	}
 
 ?>
-<style><?= VV::css("public/assets/css/pages/contact") ?></style>
+<?= VV::css("public/assets/css/pages/contact") ?>
 <section>
 	<h1>Let's chat!</h1>
 	<p>The best way to get in touch is definitely by email, or through the form on this page. The time in Sweden is <i><?= $date->format("h:i a") ?></i> right now, I am currently <?= $date->is_available() ? "available" : "not available" ?> and will hopefully reply in about <?= $date->get_estimated_reply_hours() ?> hours.</p>
@@ -112,4 +112,4 @@
 		</button>
 	</form>
 </section>
-<script ><?= VV::js("public/assets/js/pages/contact") ?></script>
+<?= VV::js("public/assets/js/pages/contact") ?>
diff --git a/public/error.php b/public/error.php
index 36e4c84..7c615ea 100644
--- a/public/error.php
+++ b/public/error.php
@@ -1,6 +1,6 @@
-<style><?= VV::css("public/assets/css/pages/error") ?></style>
+<?= VV::css("public/assets/css/pages/error") ?>
 <canvas></canvas>
 <section class="error">
 	<h1 glitch-text><span>4</span><span>0</span><span>4</span></h1>
 </section>
-<script type="module"><?= VV::js("public/assets/js/pages/error") ?></script>
\ No newline at end of file
+<script type="module"><?= VV::js("public/assets/js/pages/error") ?>
diff --git a/public/index.php b/public/index.php
index 1280b29..d642a0f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -7,7 +7,7 @@
 	}
 
 ?>
-<style><?= VV::css("public/assets/css/pages/index") ?></style>
+<?= VV::css("public/assets/css/pages/index") ?>
 <div class="menu">
 	<?= VV::embed("public/assets/media/line.svg") ?>
 	<menu>
@@ -23,4 +23,4 @@
 </div>
 
 <img src="/assets/media/gazing.jpg" alt="A portrait of Victor with a pair of cartoon glasses drawn in the shape of two V's over his eyes"/>
-<script type="module"><?= VV::js("public/assets/js/pages/index") ?></script>
\ No newline at end of file
+<?= VV::js("public/assets/js/pages/index") ?>
diff --git a/public/search.php b/public/search.php
index fddd9ca..7138dc2 100644
--- a/public/search.php
+++ b/public/search.php
@@ -14,7 +14,7 @@
 	$search = new class extends Search {
 		public readonly string $query;
 		public readonly array $results;
-		
+
 		public function __construct() {
 			$this->query = $_GET[GET_KEY_QUERY] ?? "";
 			$this->results = strlen($this->query) >= MIN_QUERY_LENGTH ? parent::query($this->query, limit: LIMIT_RESULTS) : [];
@@ -22,7 +22,7 @@
 	}
 
 ?>
-<style><?= VV::css("public/assets/css/pages/search") ?></style>
+<?= VV::css("public/assets/css/pages/search") ?>
 <section class="search">
 	<form>
 		<input name="<?= GET_KEY_QUERY ?>" type="search" placeholder="search vlw.se..." value="<?= $search->query ?>">
@@ -42,7 +42,7 @@
 </section>
 
 <?php if (isset($_GET[GET_KEY_QUERY])): ?>
-	
+
 	<?php if ($search->results): ?>
 		<section class="stats">
 			<p><?= count($search->results) ?> result(s)</p>
@@ -96,7 +96,7 @@
 			<?php break; ?>
 
 		<?php endswitch; ?>
-		
+
 	<?php endif; ?>
 
 <?php else: ?>
@@ -105,4 +105,4 @@
 		<p>Start typing to search</p>
 	</section>
 <?php endif; ?>
-<script><?= VV::js("public/assets/js/pages/search") ?></script>
\ No newline at end of file
+<?= VV::js("public/assets/js/pages/search") ?>
diff --git a/public/shell.php b/public/shell.php
index 4b6fd24..9fc4ac5 100644
--- a/public/shell.php
+++ b/public/shell.php
@@ -37,8 +37,8 @@
 		//--><!]]>
 	</script>
 
-	<style><?= VV::css("public/assets/css/fonts") ?></style>
-	<style><?= VV::css("public/assets/css/shell") ?></style>
+	<?= VV::css("public/assets/css/fonts") ?>
+	<?= VV::css("public/assets/css/shell") ?>
 
 	<title>Victor Westerlund</title>
 	<link rel="icon" href="/assets/media/vw.svg"/>
@@ -73,7 +73,7 @@
 		</searchbox>
 	</header>
 
-	<vv-shell></vv-shell>
+	<?= VV::shell() ?>
 
 	<search-results>
 		<div class="info empty">
@@ -82,7 +82,6 @@
 		</div>
 	</search-results>
 
-	<?= VV::init() ?>
-	<script><?= VV::js("public/assets/js/shell") ?></script>
+	<?= VV::js("public/assets/js/shell") ?>
 </body>
 </html>
diff --git a/public/work/archive.php b/public/work/archive.php
index aacafe2..02043bc 100644
--- a/public/work/archive.php
+++ b/public/work/archive.php
@@ -1,4 +1,4 @@
-<style><?= VV::css("public/assets/css/pages/work/archive") ?></style>
+<?= VV::css("public/assets/css/pages/work/archive") ?>
 <section>
 	<h1>This is an archived website!</h1>
 	<p>You're about to view an archived version of this website on my domain. Everything you see, and all features that are available on the archived website have been recreated to simulate the real behavior as closely as possible. Some features can unfortunately not be simulated properly and have been disabled completely. No actions you take on this website have any real effects.</p>
@@ -9,4 +9,4 @@
 		<?= VV::embed("public/assets/media/icons/chevron.svg") ?>
 	</button></a>
 </section>
-<script><?= VV::js("public/assets/js/pages/work/archive") ?></script>
\ No newline at end of file
+<?= VV::js("public/assets/js/pages/work/archive") ?>
diff --git a/public/work/index.php b/public/work/index.php
index 786e347..ce67235 100644
--- a/public/work/index.php
+++ b/public/work/index.php
@@ -5,7 +5,7 @@
 	require_once VV::root("src/Database/Models/Work/Work.php");
 
 ?>
-<style><?= VV::css("public/assets/css/pages/work/index") ?></style>
+<?= VV::css("public/assets/css/pages/work/index") ?>
 <section class="hero">
 	<div class="item vegvisir">
 		<div class="wrapper">
diff --git a/public/work/timeline.php b/public/work/timeline.php
index 7dca319..4f1bbe9 100644
--- a/public/work/timeline.php
+++ b/public/work/timeline.php
@@ -42,7 +42,7 @@
 	}
 
 ?>
-<style><?= VV::css("public/assets/css/pages/work/timeline") ?></style>
+<?= VV::css("public/assets/css/pages/work/timeline") ?>
 <section class="git">
 	<?= VV::embed("public/assets/media/icons/codeberg.svg") ?>
 	<p>This timeline has most but not all of my FOSS software. If you want to see a list of all things I've created for the free software world, check out my repos on Codeberg or Forgejo.</p>
@@ -104,7 +104,7 @@
 												<?php endif; ?>
 
 												<p><?= $work->summary ?></p>
-												
+
 												<?php if ($work->actions()): ?>
 													<div class="actions">
 
@@ -138,8 +138,8 @@
 					</div>
 				<?php endforeach; ?>
 			</div>
-			
+
 		</div>
 	<?php endforeach; ?>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/public/work/wip.php b/public/work/wip.php
index 3bddf13..6ac3f4f 100644
--- a/public/work/wip.php
+++ b/public/work/wip.php
@@ -1,4 +1,4 @@
-<style><?= VV::css("public/assets/css/pages/work/wip") ?></style>
+<?= VV::css("public/assets/css/pages/work/wip") ?>
 <section class="disclaimer">
 	<h1>Soon, very soon!</h1>
 	<p>Bear with me as I cook up some texts about this project! Hopefully with some pictures too.</p>
@@ -8,4 +8,4 @@
 		<p>to featured work</p>
 		<?= VV::embed("public/assets/media/icons/chevron.svg") ?>
 	</button></a>
-</section>
\ No newline at end of file
+</section>
diff --git a/vegvisir b/vegvisir
index da0f564..08758c5 160000
--- a/vegvisir
+++ b/vegvisir
@@ -1 +1 @@
-Subproject commit da0f56400903edaa53829c21e6a9142f5b22c23f
+Subproject commit 08758c560f953bdca0c8b2a4042479d2dc3702c7