diff --git a/.gitignore b/.gitignore
index 1984da0..f2e5c8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@ node_modules
 /build
 /test
 .env
-app/hp_ssh.wasm
-app/wasm_exec.js
-/docs/.vitepress/dist/
-/docs/.vitepress/cache/
+/app/hp_ssh.wasm
+/app/wasm_exec.js
+/.vitepress/dist/
+/.vitepress/cache/
+
+>>>>>>> origin/main
 /.direnv
diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index a1e8ca8..0000000
--- a/.tool-versions
+++ /dev/null
@@ -1,4 +0,0 @@
-# REMEMBER TO UPDATE mise.toml TOO
-pnpm 10.4.0
-node 22.16
-go 1.25.1
diff --git a/docs/.vitepress/config.ts b/.vitepress/config.ts
similarity index 79%
rename from docs/.vitepress/config.ts
rename to .vitepress/config.ts
index 15c7bbe..5af405b 100644
--- a/docs/.vitepress/config.ts
+++ b/.vitepress/config.ts
@@ -5,11 +5,11 @@ export default defineConfig({
 	description: 'The missing dashboard for Headscale',
 	ignoreDeadLinks: ['/docs/Integrated-Mode', '/docs/Simple-Mode'],
 	cleanUrls: true,
+	head: [['link', { rel: 'icon', href: '/favicon.ico' }]],
+	srcDir: 'docs',
 	themeConfig: {
-		nav: [
-			{ text: 'Home', link: '/' },
-			{ text: 'Sponsor Headplane', link: 'https://github.com/sponsors/tale' },
-		],
+		logo: '/logo-dark-bg.svg',
+		nav: [{ text: 'Home', link: '/' }],
 		sidebar: [
 			{
 				text: 'Chapters',
@@ -30,6 +30,8 @@ export default defineConfig({
 
 		socialLinks: [
 			{ icon: 'github', link: 'https://github.com/tale/headplane' },
+			{ icon: 'githubsponsors', link: 'https://github.com/sponsors/tale' },
+			{ icon: 'kofi', link: 'https://ko-fi.com/atale' },
 		],
 
 		lastUpdated: {
diff --git a/.vitepress/theme/custom.css b/.vitepress/theme/custom.css
new file mode 100644
index 0000000..dc66c52
--- /dev/null
+++ b/.vitepress/theme/custom.css
@@ -0,0 +1,7 @@
+html.dark .light-only {
+	display: none !important;
+}
+
+html:not(.dark) .dark-only {
+	display: none !important;
+}
diff --git a/.vitepress/theme/index.ts b/.vitepress/theme/index.ts
new file mode 100644
index 0000000..149273e
--- /dev/null
+++ b/.vitepress/theme/index.ts
@@ -0,0 +1,4 @@
+import DefaultTheme from 'vitepress/theme';
+import './custom.css';
+
+export default DefaultTheme;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 024ebc0..dffe39d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 0.6.1 (Next)
+### 0.6.1 (October 12, 2025)
 - **Headplane now supports connecting to machines via SSH in the web browser.**
 	- This is an experimental feature and requires the `integration.agent` section to be set up in the config file.
 	- This is built on top of a Go binary that runs in WebAssembly, using Xterm.js for the terminal interface.
diff --git a/Dockerfile b/Dockerfile
index 57b28dc..b5b163f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM --platform=$BUILDPLATFORM jdxcode/mise:latest AS mise-context
-COPY mise.toml .tool-versions ./
+COPY mise.toml ./
 RUN --mount=type=secret,id=gh_token,env=MISE_GITHUB_TOKEN mise install
 
 FROM --platform=$BUILDPLATFORM mise-context AS go-build
diff --git a/docs/index.md b/docs/index.md
index 98e8701..bc7dad0 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,20 +3,30 @@
 layout: home
 
 hero:
-  name: "A feature-complete Web UI for Headscale"
-  text: "Documentation"
-  tagline: "A feature-complete Web UI for Headscale"
+  name: "Headplane"
+  tagline: "A full-featured admin interface for Headscale"
+  image:
+    src: "/logo-dark-bg.svg"
+    alt: "Headplane"
   actions:
-    - theme: brand
-      text: Getting Started
-      link: /README
+    - text: "Getting Started"
+      link: "/README"
+    - text: "GitHub"
+      link: "https://github.com/tale/headplane"
+      theme: "alt"
 
 features:
-  - title: Web SSH
-    details: Connect to machines directly from your browser
-  - title: OIDC
-    details: Login through your favourite SSO provider
-  - title: And many more
-    details: Setup ACLs, DNS, pre-auth keys, etc.
+  - title: "Remote web-based SSH"
+    details: "Connect to and manage machines via SSH directly through your web browser"
+    icon: "🌐"
+  - title: "Single-sign-on"
+    details: "Bring your own auth via OpenID Connect, including popular solutions such as Google Workspace, Azure/Entra, Okta, etc."
+    icon: "👥"
+  - title: "Detailed Tailnet Overview"
+    details: "Get access to detailed host and network information from each device residing within your Tailnet"
+    icon: "🔎"
+  - title: "Configure Headscale Settings"
+    details: "Manage settings hidden behind Headscale configuration such as DNS, networking, auth controls, etc."
+    icon: "📝"
 ---
 
diff --git a/mise.toml b/mise.toml
index 5462207..68ed043 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,5 +1,4 @@
 [tools]
-# REMEMBER TO UPDATE .tool-versions TOO
 go = "1.25.1"
 pnpm = "10.4.0"
 node = "22.16"