diff --git a/key.html b/key.html
deleted file mode 100644
index 10e62ef..0000000
--- a/key.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Inferencium - Website - Key -->
-<!-- Version: 5.2.0-beta.1 -->
-
-<!-- Copyright 2022 Jake Winters -->
-<!-- SPDX-License-Identifier: BSD-3-Clause -->
-
-
-<html lang="en">
-		<head>
-				<meta charset="utf-8"/>
-				<meta name="viewport" content="width=device-width, initial-scale=1"/>
-				<link rel="stylesheet" href="main.css"/>
-				<title>Inferencium - Key</title>
-		</head>
-		<body>
-				<nav class="navbar">
-						<div><a href="index.html"><img src="asset/img/logo-inferencium-no_text.png" width="110px" height="110px"/></a></div>
-						<div><a href="index.html" class="title">Inferencium</a></div>
-						<div><a href="about.html">About</a></div>
-						<div><a href="contact.html">Contact</a></div>
-						<div><a href="blog.html">Blog</a></div>
-						<div><a href="documentation.html">Documentation</a></div>
-						<div><a href="source.html">Source</a></div>
-						<div><a href="key.html">Key</a></div>
-						<div><a href="changelog.html">Changelog</a></div>
-						<div><a href="directory.html">Directory</a></div>
-				</nav>
-				<h1>Key</h1>
-						<nav id="toc">
-								<h2 id="toc"><a href="#toc">Table of Contents<a/></h2>
-										<ul>
-												<li><a href="#notes">Notes</a></li>
-												<li><a href="#e2ee">End-to-end Encrypted Contact Methods</a></li>
-														<ul>
-																<li><a href="#xmpp">XMPP</a></li>
-																		<ul>
-																				<li><a href="#xmpp-inferencium">inference@inferencium.net (Main)</a></li>
-																		</ul>
-														</ul>
-												<li><a href="#file_git_signing">File/Git Signing</a></li>
-														<ul>		
-																<li><a href="#ssh">SSH</a></li>
-														</ul>
-										</ul>
-						</nav>
-						<section id="notes">
-								<h2 id="notes"><a href="#notes">Notes</a></h2>
-										<ul>
-												<li>You can also find my keys on
-												<a href="https://github.com/inferenceus/key">GitHub</a>
-												and
-												<a href="https://codeberg.org/inference/key">Codeberg</a>
-												in order to check for discrepancies between the keys.</li>
-												<li>Verification does not verify a person, only their devices, and can
-												be defeated via coercion or other force.</li>
-										</ul>
-						</section>
-						<section id="e2ee">
-								<h2 id="e2ee"><a href="#e2ee">End-to-end Encrypted Contact Methods</a></h2>
-										<h3 id="xmpp"><a href="#xmpp"><img class="logo-small" src="asset/img/logo-xmpp.png" width="40px" height="40px"/> XMPP</a></h3>
-												<p class="update_date">Updated: 2023-01-13 (UTC+00:00)</p>
-												<br>
-												<p>Whenever possible, open the links to pin the fingerprints directly
-												from this webpage. If that is not possible, manually verify the
-												fingerprints.</p>
-												<br>
-												<h4 id="xmpp-inferencium"><a href="#xmpp-inferencium">inference@inferencium.net (Main)</a></h3>
-														<h5>Key #0</h5>
-																<code>
-																		67ee49da 37bcc392 691d9151 851e4240 6b5e80c2 e7d060b5 78dfdb41 443f9c52
-																</code>
-																<br>
-																<br>
-																<a href="xmpp:inference@inferencium.net?omemo-sid-1641576775=67ee49da37bcc392691d9151851e42406b5e80c2e7d060b578dfdb41443f9c52">xmpp:inference@inferencium.net?omemo-sid-1641576775=67ee49da37bcc392691d9151851e42406b5e80c2e7d060b578dfdb41443f9c52</a>
-														<p>Legacy XMPP keys:</p>
-														<h5>Key #0</h5>
-																<code>
-																		1bd03c6a 5e011655 2fafd697 da4fce70 63de5a83 a264a34a fcce78fe 6b06820c
-																</code>
-																<br>
-																<br>
-																<a href="xmpp:inference@inferencium.net?omemo-sid-1586888206=1bd03c6a5e0116552fafd697da4fce7063de5a83a264a34afcce78fe6b06820c">xmpp:inference@inferencium.net?omemo-sid-1586888206=1bd03c6a5e0116552fafd697da4fce7063de5a83a264a34afcce78fe6b06820c</a>
-						</section>
-						<section id="file_git_signing">
-								<h2 id="file_git_signing"><a href="#file_git_signing">File/Git Signing</a></h2>
-										<h3 id="ssh"><a href="#ssh">SSH</a></h3>
-												<p class="update_date">Updated: 2023-07-27 (UTC+00:00)</p>
-												<p>Each SSH key is signed by the previous key, allowing verification of
-												the chain of keys, and root of trust.</p>
-												<p>Current SSH key:</p>
-												<h5>#1 (Used from 2023-07-27)</h5>
-														<h6>Fingerprint</h6>
-																<code>
-																		SHA256:FtEVfx1CmTKMy40VwZvF4k+3TC+QhCWy+EmPRg50Nnc
-																</code>
-														<h6>Key</h6>
-																<code>
-																		ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHPGnrIg7dI7GUqA+lTztJSrn+7QyRceajqs4iaU8UG
-																</code>
-												<p>Legacy SSH keys:</p>
-												<h5>#0 (Used between 2023-01-01 - 2023-07-27)</h5>
-														<h6>Fingerprint</h6>
-																<code>
-																		SHA256:9Pl0nZ2UJacgm+IeEtLSZ4FOESgP1eKCtRflfPfdX9M
-																</code>
-														<h6>Key</h6>
-																<code>
-																		ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINs8UH2hVmNSg0qKig/9ZQt07IuOHsorRfw1doEgMuJ8
-																</code>
-						</section>
-		</body>
-</html>
diff --git a/key.xhtml b/key.xhtml
new file mode 100644
index 0000000..687caed
--- /dev/null
+++ b/key.xhtml
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+
+<!-- Inferencium - Website - Key -->
+<!-- Version: 6.0.0-beta.1 -->
+
+<!-- Copyright 2022 Jake Winters -->
+<!-- SPDX-License-Identifier: BSD-3-Clause -->
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+		<head>
+				<meta charset="utf-8"/>
+				<meta name="viewport" content="width=device-width, initial-scale=1"/>
+				<link rel="stylesheet" href="main.css"/>
+				<title>Inferencium - Key</title>
+		</head>
+		<body>
+				<nav class="navbar">
+						<div><a href="index.xhtml"><img src="asset/img/logo-inferencium-no_text.png" width="110px" height="110px"/></a></div>
+						<div><a href="index.xhtml" class="title">Inferencium</a></div>
+						<div><a href="about.xhtml">About</a></div>
+						<div><a href="contact.xhtml">Contact</a></div>
+						<div><a href="blog.xhtml">Blog</a></div>
+						<div><a href="documentation.xhtml">Documentation</a></div>
+						<div><a href="source.xhtml">Source</a></div>
+						<div><a href="key.xhtml">Key</a></div>
+						<div><a href="changelog.xhtml">Changelog</a></div>
+						<div><a href="directory.xhtml">Directory</a></div>
+				</nav>
+				<h1>Key</h1>
+						<nav id="toc">
+								<h2 id="toc"><a href="#toc">Table of Contents</a></h2>
+										<ul>
+												<li><a href="#notes">Notes</a></li>
+												<li><a href="#e2ee">End-to-end Encrypted Contact Methods</a></li>
+														<ul>
+																<li><a href="#xmpp">XMPP</a></li>
+																		<ul>
+																				<li><a href="#xmpp-inferencium">inference@inferencium.net (Main)</a></li>
+																						<ul>
+																								<li><a href="#xmpp-inferencium-current">Current</a></li>
+																										<ul>
+																												<li><a href="#xmpp-inferencium-current-1">#1</a></li>
+																										</ul>
+																								<li><a href="#xmpp-inferencium-legacy">Legacy</a></li>
+																										<ul>
+																												<li><a href="#xmpp-inferencium-legacy-0">#0</a></li>
+																										</ul>
+																						</ul>
+																		</ul>
+														</ul>
+												<li><a href="#file_git_signing">File/Git Signing</a></li>
+														<ul>		
+																<li><a href="#ssh">SSH</a></li>
+																		<ul>
+																				<li><a href="#ssh-current">Current</a></li>
+																						<ul>
+																								<li><a href="#ssh-current-1">#1</a></li>
+																						</ul>
+																				<li><a href="#ssh-legacy">Legacy</a></li>
+																						<ul>
+																								<li><a href="#ssh-legacy-0">#0</a></li>
+																						</ul>
+																		</ul>
+														</ul>
+										</ul>
+						</nav>
+						<section id="notes">
+								<h2 id="notes"><a href="#notes">Notes</a></h2>
+										<ul>
+												<li>You can also find my keys on
+												<a href="https://github.com/inferenceus/key">GitHub</a>
+												and
+												<a href="https://codeberg.org/inference/key">Codeberg</a>
+												in order to check for discrepancies between the keys</li>
+												<li>Verification does not verify a person, only their devices, and can
+												be defeated via coercion or other force</li>
+										</ul>
+						</section>
+						<section id="e2ee">
+								<h2 id="e2ee"><a href="#e2ee">End-to-end Encrypted Contact Methods</a></h2>
+										<section id="xmpp">
+												<h3 id="xmpp"><a href="#xmpp"><img class="logo-small" src="asset/img/logo-xmpp.png" width="40px" height="40px"/>XMPP</a></h3>
+														<p class="update_date">Updated: 2023-01-13 (UTC+00:00)</p>
+														<p>Whenever possible, open the links to pin the fingerprints directly
+														from this webpage; if that is not possible, manually verify the
+														fingerprints.</p>
+														<h4 id="xmpp-inferencium"><a href="#xmpp-inferencium">inference@inferencium.net (Main)</a></h4>
+																<h5 id="xmpp-inferencium-current"><a href="#xmpp-inferencium-current">Current</a></h5>
+																		<h6 id="xmpp-inferencium-current-1"><a href="#xmpp-inferencium-current-1">#1</a></h6>
+																				<code>
+																						67ee49da 37bcc392 691d9151 851e4240 6b5e80c2 e7d060b5 78dfdb41 443f9c52
+																				</code>
+																				<p><a href="xmpp:inference@inferencium.net?omemo-sid-1641576775=67ee49da37bcc392691d9151851e42406b5e80c2e7d060b578dfdb41443f9c52">xmpp:inference@inferencium.net?omemo-sid-1641576775=67ee49da37bcc392691d9151851e42406b5e80c2e7d060b578dfdb41443f9c52</a></p>
+																<h5 id="xmpp-inferencium-legacy"><a href="#xmpp-inferencium-legacy">Legacy</a></h5>
+																		<h6 id="xmpp-inferencium-legacy-0"><a href="#xmpp-inferencium-legacy-0">#0</a></h6>
+																				<code>
+																						1bd03c6a 5e011655 2fafd697 da4fce70 63de5a83 a264a34a fcce78fe 6b06820c
+																				</code>
+																				<p><a href="xmpp:inference@inferencium.net?omemo-sid-1586888206=1bd03c6a5e0116552fafd697da4fce7063de5a83a264a34afcce78fe6b06820c">xmpp:inference@inferencium.net?omemo-sid-1586888206=1bd03c6a5e0116552fafd697da4fce7063de5a83a264a34afcce78fe6b06820c</a></p>
+										</section>
+						</section>
+						<section id="file_git_signing">
+								<h2 id="file_git_signing"><a href="#file_git_signing">File/Git Signing</a></h2>
+										<section id="ssh">
+												<h3 id="ssh"><a href="#ssh">SSH</a></h3>
+														<p class="update_date">Updated: 2023-07-27 (UTC+00:00)</p>
+														<p>Each SSH key is signed by the previous key, allowing verification of
+														the chain of keys, and root of trust.</p>
+														<h4 id="ssh-current"><a href="ssh-current">Current</a></h4>
+																<h5 id="ssh-current-1"><a href="#ssh-current-1">#1 (2023-07-27 - present)</a></h5>
+																		<h6 id="ssh-current-1-fingerprint"><a href="#ssh-current-1-fingerprint">Fingerprint</a></h6>
+																				<code>
+																						SHA256:FtEVfx1CmTKMy40VwZvF4k+3TC+QhCWy+EmPRg50Nnc
+																				</code>
+																		<h6 id="ssh-current-1-key"><a href="#ssh-current-1-key">Key</a></h6>
+																				<code>
+																						ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHPGnrIg7dI7GUqA+lTztJSrn+7QyRceajqs4iaU8UG
+																				</code>
+														<h4 id="ssh-legacy"><a href="#ssh-legacy">Legacy</a></h4>
+																<h5 id="ssh-legacy-0"><a href="#ssh-legacy-0">#0 (2023-01-01 - 2023-07-27)</a></h5>
+																		<h6 id="ssh-legacy-0-fingerprint"><a href="#ssh-legacy-0-fingerprint">Fingerprint</a></h6>
+																				<code>
+																						SHA256:9Pl0nZ2UJacgm+IeEtLSZ4FOESgP1eKCtRflfPfdX9M
+																				</code>
+																		<h6 id="ssh-legacy-0-key"><a href="#ssh-legacy-0-key">Key</a></h6>
+																				<code>
+																						ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINs8UH2hVmNSg0qKig/9ZQt07IuOHsorRfw1doEgMuJ8
+																				</code>
+										</section>
+						</section>
+		</body>
+</html>
